From f7c4c3ce721aaf6dfe4f82c2043156b60ee48e37 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sun, 23 Sep 2018 18:29:29 +0000
Subject: [PATCH] Update stop name: Dworzec Główny -> Teatr Słowackiego
---
common.js | 108 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 92 insertions(+), 16 deletions(-)
diff --git a/common.js b/common.js
index 1f236aa..6a18a8c 100644
--- a/common.js
+++ b/common.js
@@ -31,12 +31,57 @@
setInterval(checkVersion, 3600000);
}
+/* Parsing of received JSON parts */
+function parseStatus(status) {
+ switch(status.status) {
+ case 'STOPPING':
+ case 'PREDICTED':
+ if(status.actualRelativeTime <= 0)
+ return lang.boarding_sign;
+ if(status.actualRelativeTime >= 60)
+ return lang.time_minutes_prefix + Math.floor(status.actualRelativeTime / 60) + lang.time_minutes_suffix;
+ return lang.time_seconds_prefix + status.actualRelativeTime + lang.time_seconds_suffix;
+ case 'DEPARTED':
+ return lang.time_minutes_ago_prefix + Math.floor(-status.actualRelativeTime / 60) + lang.time_minutes_ago_suffix;
+ default:
+ return status.mixedTime;
+ }
+}
+
+function parseTime(date, time) {
+ var result = new Date(date.getFullYear(), date.getMonth(), date.getDay());
+ var time_split = time.split(':');
+ result.setHours(time_split[0]);
+ result.setMinutes(time_split[1]);
+
+ if(result.getTime() - date.getTime() > 72000000) {
+ result.setTime(result.getTime() - 86400000);
+ }
+
+ if(date.getTime() - result.getTime() > 72000000) {
+ result.setTime(result.getTime() + 86400000);
+ }
+
+ return result;
+}
+
+function parseDelay(status) {
+ if(!status.actualTime) return lang.unknown_sign;
+ if(!status.plannedTime) return lang.unknown_sign;
+
+ var now = new Date();
+ var actual = parseTime(now, status.actualTime);
+ var planned = parseTime(now, status.plannedTime);
+
+ return lang.time_minutes_prefix + ((actual.getTime() - planned.getTime()) / 1000 / 60) + lang.time_minutes_suffix;
+}
+
// 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;
@@ -47,14 +92,16 @@
// Single exception - old id used in one case
if(id == 831) {
id = 216;
+ } else if(id == 311) {
+ id = 899
}
- 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) {
@@ -76,6 +123,9 @@
if(id == 313) {
type = 'GT8C'
low = 1;
+ } else if(id == 323 || id >= 325) {
+ type = 'GT8N'
+ low = 1;
}
} else if(401 <= id && id <= 440) {
prefix = 'HL';
@@ -84,11 +134,10 @@
} else if(451 <= id && id <= 462) {
prefix = 'HK';
type = 'N8S-NF';
- low = 0;
+ low = 1;
- if((451 <= id && id <= 453) || id == 462) {
+ if((451 <= id && id <= 456) || id == 462) {
type = 'N8C-NF';
- low = 1;
}
} else if(601 <= id && id <= 650) {
prefix = 'RP';
@@ -117,12 +166,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 {
@@ -133,6 +182,40 @@
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;
+ }
+}
+
+function displayVehicle(vehicleInfo) {
+ if(!vehicleInfo) return document.createTextNode('');
+
+ var span = document.createElement('span');
+ span.className = 'vehicleInfo';
+
+ var floor_type = '';
+ if(vehicleInfo.low == 0) {
+ setText(span, lang.high_floor_sign);
+ floor_type = lang.high_floor;
+ } else if(vehicleInfo.low == 1) {
+ setText(span, lang.partially_low_floor_sign);
+ floor_type = lang.partially_low_floor;
+ } else if(vehicleInfo.low == 2) {
+ setText(span, lang.low_floor_sign);
+ floor_type = lang.low_floor;
+ }
+
+ span.title = lang.tram_type_pattern
+ .replace('$num', vehicleInfo.num)
+ .replace('$type', vehicleInfo.type)
+ .replace('$floor', floor_type);
+
+ return span;
}
// Element mangling
@@ -158,11 +241,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