From fc8d60517033c7de6115d9d56bb43a8a7b279a3f Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <jkowalsk@student.agh.edu.pl>
Date: Sun, 03 Jun 2018 12:14:34 +0000
Subject: [PATCH] Merge pull request #13 from ravkr/master
---
common.js | 80 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 4 deletions(-)
diff --git a/common.js b/common.js
index 89a8a60..e63a371 100644
--- a/common.js
+++ b/common.js
@@ -31,6 +31,51 @@
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 false;
@@ -73,8 +118,10 @@
type = 'GT8S';
low = 0;
- if(id == 313 || id == 323) {
+ if(id == 313) {
type = 'GT8C'
+ low = 1;
+ } else if(id == 323) {
low = 1;
}
} else if(401 <= id && id <= 440) {
@@ -84,11 +131,10 @@
} else if(451 <= id && id <= 462) {
prefix = 'HK';
type = 'N8S-NF';
- low = 0;
+ low = 1;
- if((451 <= id && id <= 456) || id == 459 || id == 460 || id == 462) {
+ if((451 <= id && id <= 456) || id == 462) {
type = 'N8C-NF';
- low = 1;
}
} else if(601 <= id && id <= 650) {
prefix = 'RP';
@@ -143,6 +189,32 @@
}
}
+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
function deleteChildren(element) {
while(element.lastChild) element.removeChild(element.lastChild);
--
Gitblit v1.9.1