From 3d2caa78a0a7db5d6247b1a179a314804725bd8d Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Thu, 31 Jan 2019 02:53:47 +0000
Subject: [PATCH] tramIdToVehicleId translation using vehicles_info variable (again)
---
index.js | 108 ++++++++++++-----------------------------------------
1 files changed, 25 insertions(+), 83 deletions(-)
diff --git a/index.js b/index.js
index 1f9621b..8780766 100644
--- a/index.js
+++ b/index.js
@@ -27,6 +27,7 @@
var route_line = document.getElementById('route-line');
var route_table = document.getElementById('route-table');
var route_vehicle = document.getElementById('route-vehicle');
+var route_vehicle_info;
var refresh_button = document.getElementById('refresh');
var refresh_text = document.getElementById('refresh-text');
@@ -40,77 +41,6 @@
var nav = document.getElementsByTagName('nav')[0];
var vehicle_data = document.getElementById('vehicle-data');
var vehicle_data_style = document.getElementById('vehicle-data-style');
-
-function parseStatus(status) {
- switch(status.status) {
- case 'STOPPING':
- return lang.boarding_sign;
- 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;
-}
-
-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;
-}
function fail(message, more) {
if(times_timer) clearTimeout(times_timer);
@@ -159,7 +89,6 @@
ignore_hashchange = true;
window.location.hash = '#!' + language + stopId;
- ignore_hashchange = false;
refresh_button.removeAttribute('disabled');
loading_start();
@@ -184,7 +113,7 @@
var dir_cell = addCellWithText(tr, data.old[i].direction);
var vehicle = parseVehicle(data.old[i].vehicleId);
dir_cell.appendChild(displayVehicle(vehicle));
- addCellWithText(tr, vehicle.num).className = 'vehicleData';
+ addCellWithText(tr, (vehicle ? vehicle.num : '')).className = 'vehicleData';
var status = parseStatus(data.old[i]);
addCellWithText(tr, status);
addCellWithText(tr, '');
@@ -202,15 +131,17 @@
var dir_cell = addCellWithText(tr, data.actual[i].direction);
var vehicle = parseVehicle(data.actual[i].vehicleId);
dir_cell.appendChild(displayVehicle(vehicle));
- addCellWithText(tr, vehicle.num).className = 'vehicleData';
+ addCellWithText(tr, (vehicle ? vehicle.num : '')).className = 'vehicleData';
var status = parseStatus(data.actual[i]);
var status_cell = addCellWithText(tr, status);
var delay = parseDelay(data.actual[i]);
var delay_cell = addCellWithText(tr, delay);
- if(status == lang.boarding_sign) {
+ if(data.actual[i].status == 'STOPPING') {
tr.className = 'success';
- status_cell.className = 'status-boarding';
+ if (data.actual[i].actualRelativeTime <= 0) {
+ status_cell.className = 'status-boarding';
+ }
} else if(parseInt(delay) > 9) {
tr.className = 'danger';
delay_cell.className = 'status-delayed';
@@ -245,7 +176,7 @@
if(!tripId) tripId = route_id;
if(!tripId) return;
- if(!vehicleInfo) vehicleInfo = route_vehicle_info;
+ if(vehicleInfo === undefined) vehicleInfo = route_vehicle_info;
console.log('loadRoute(' + tripId + ')');
route_id = tripId;
@@ -267,7 +198,9 @@
deleteChildren(route_vehicle);
if(vehicleInfo) {
var span = displayVehicle(vehicleInfo);
- setText(route_vehicle, span.title);
+ if(span) {
+ setText(route_vehicle, span.title);
+ }
route_vehicle.insertBefore(span, route_vehicle.firstChild);
}
@@ -362,8 +295,8 @@
}
function change_language(lang) {
- if(!lang || lang.length != 2) return;
- if(lang == language) return;
+ if(!lang || lang.length != 2) return false;
+ if(lang == language) return false;
lang_select.value = lang;
if(!lang_select.value) {
lang_select.value = language;
@@ -382,18 +315,25 @@
ignore_hashchange = true;
window.location.hash = '#!' + language + stop_id;
- ignore_hashchange = false;
+
+ return true;
}
function hash() {
- if(ignore_hashchange) return;
+ if(ignore_hashchange) {
+ ignore_hashchange = false;
+ return;
+ }
if(window.location.hash.match(/^#![0-9]+$/)) {
loadTimes(parseInt(window.location.hash.substr(2)));
} else if(window.location.hash.match(/^#![a-z]{2}[0-9]*$/)) {
var stop = parseInt(window.location.hash.substr(4));
if(stop) stop_id = stop;
- change_language(window.location.hash.substr(2, 2));
+
+ if(!change_language(window.location.hash.substr(2, 2))) {
+ loadTimes(parseInt(window.location.hash.substr(2)));
+ }
}
}
@@ -462,6 +402,8 @@
setText(vehicle_data_style, '.vehicleData { display: table-cell; }')
});
+ updateVehicleInfo()
+
hash();
window.addEventListener('hashchange', hash);
--
Gitblit v1.9.1