From ca06643ed5544400aaa59a32309ab0455a25d761 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Tue, 18 Apr 2017 11:15:36 +0000
Subject: [PATCH] Update tram types (HK459-460, HW159, HW164)
---
common.js | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/common.js b/common.js
index bd564a6..89a8a60 100644
--- a/common.js
+++ b/common.js
@@ -4,12 +4,39 @@
'Zajezdnia Podgórze' : 'P',
};
+var script_version;
+var script_version_xhr;
+
+// Check for website updates
+function checkVersion() {
+ if(script_version_xhr) script_version_xhr.abort();
+
+ script_version_xhr = $.get(
+ 'version.php'
+ ).done(function(data) {
+ if(!script_version) {
+ script_version = data;
+ return;
+ }
+
+ if(script_version != data) {
+ fail(lang.error_new_version);
+ location.reload(true);
+ }
+ });
+}
+
+function checkVersionInit() {
+ checkVersion();
+ setInterval(checkVersion, 3600000);
+}
+
// Webservice-related functions
function parseVehicle(vehicleId) {
- if(!vehicleId) return;
+ if(!vehicleId) return false;
if(vehicleId.substr(0, 15) != '635218529567218') {
console.log('Unknown vehicle, vehicleId=' + vehicleId);
- return;
+ return false;
}
var id = parseInt(vehicleId.substr(15)) - 736;
@@ -22,12 +49,12 @@
id = 216;
}
- if(101 <= id && id <= 173) {
+ if(101 <= id && id <= 174) {
prefix = 'HW';
type = 'E1';
low = 0;
- if((108 <= id && id <= 113) || id == 127 || id == 131 || id == 132 || id == 134 || (137 <= id && id <= 139) || (148 <= id && id <= 150) || (153 <= id && id <= 166) || id == 161) {
+ if((108 <= id && id <= 113) || id == 127 || id == 131 || id == 132 || id == 134 || (137 <= id && id <= 139) || (148 <= id && id <= 150) || (153 <= id && id <= 155)) {
prefix = 'RW';
}
} else if(201 <= id && id <= 293) {
@@ -46,7 +73,7 @@
type = 'GT8S';
low = 0;
- if(id == 313) {
+ if(id == 313 || id == 323) {
type = 'GT8C'
low = 1;
}
@@ -59,7 +86,7 @@
type = 'N8S-NF';
low = 0;
- if((451 <= id && id <= 453) || id == 462) {
+ if((451 <= id && id <= 456) || id == 459 || id == 460 || id == 462) {
type = 'N8C-NF';
low = 1;
}
@@ -90,12 +117,12 @@
prefix = 'HG';
}
} else if(id === 999) {
- prefix = 'HX';
+ prefix = 'HG';
type = '405N-Kr';
low = 1;
} else {
console.log('Unknown vehicle, vehicleId=' + vehicleId + ', id=' + id);
- return;
+ return false;
}
return {
@@ -106,6 +133,14 @@
type: type,
low: low
};
+}
+
+function tramIdToVehicleId(tramId) {
+ if(0 <= tramId && tramId <= 999) {
+ var vehicleId = '0000' + (tramId + 736);
+ vehicleId = vehicleId.substr(vehicleId.length - 4)
+ return '635218529567218' + vehicleId;
+ }
}
// Element mangling
@@ -131,11 +166,4 @@
function setText(element, text) {
deleteChildren(element);
element.appendChild(document.createTextNode(text));
-}
-
-// Other functions
-var decodeEntitiesTextArea = document.createElement('textarea');
-function decodeEntities(text) {
- decodeEntitiesTextArea.innerHTML = text;
- return decodeEntitiesTextArea.value;
}
--
Gitblit v1.9.1