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 | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 1 deletions(-) diff --git a/common.js b/common.js index 4ec77f3..6a18a8c 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; @@ -47,6 +92,8 @@ // Single exception - old id used in one case if(id == 831) { id = 216; + } else if(id == 311) { + id = 899 } if(101 <= id && id <= 174) { @@ -76,7 +123,8 @@ if(id == 313) { type = 'GT8C' low = 1; - } else if(id == 323) { + } else if(id == 323 || id >= 325) { + type = 'GT8N' low = 1; } } else if(401 <= id && id <= 440) { -- Gitblit v1.9.1