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
---
index.js | 142 ++++++++++++++++++-----------------------------
1 files changed, 55 insertions(+), 87 deletions(-)
diff --git a/index.js b/index.js
index 8943dd3..c21eff0 100644
--- a/index.js
+++ b/index.js
@@ -5,7 +5,7 @@
var page_title = document.getElementsByTagName('title')[0];
var ignore_hashchange = false;
-var language = 'en';
+var language = 'pl';
var lang_select = document.getElementById('lang-select');
var stop_id = '';
@@ -26,6 +26,8 @@
var route_xhr;
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');
@@ -37,77 +39,8 @@
var alert_close = document.getElementById('alert-close');
var nav = document.getElementsByTagName('nav')[0];
-
-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;
-}
+var vehicle_data = document.getElementById('vehicle-data');
+var vehicle_data_style = document.getElementById('vehicle-data-style');
function fail(message, more) {
if(times_timer) clearTimeout(times_timer);
@@ -156,7 +89,6 @@
ignore_hashchange = true;
window.location.hash = '#!' + language + stopId;
- ignore_hashchange = false;
refresh_button.removeAttribute('disabled');
loading_start();
@@ -179,13 +111,17 @@
var tr = document.createElement('tr');
addCellWithText(tr, data.old[i].patternText);
var dir_cell = addCellWithText(tr, data.old[i].direction);
- dir_cell.appendChild(displayVehicle(parseVehicle(data.old[i].vehicleId)));
+ var vehicle = parseVehicle(data.old[i].vehicleId);
+ dir_cell.appendChild(displayVehicle(vehicle));
+ addCellWithText(tr, (vehicle ? vehicle.num : '')).className = 'vehicleData';
var status = parseStatus(data.old[i]);
addCellWithText(tr, status);
addCellWithText(tr, '');
tr.className = 'active';
- tr.addEventListener('click', function(tripId){ return function(){ loadRoute(tripId); } }(data.old[i].tripId) );
+ tr.addEventListener('click', function(tripId, vehicleInfo) {
+ return function(){ loadRoute(tripId, vehicleInfo); }
+ }(data.old[i].tripId, vehicle));
times_table.appendChild(tr);
}
@@ -193,15 +129,19 @@
var tr = document.createElement('tr');
addCellWithText(tr, data.actual[i].patternText);
var dir_cell = addCellWithText(tr, data.actual[i].direction);
- dir_cell.appendChild(displayVehicle(parseVehicle(data.actual[i].vehicleId)));
+ var vehicle = parseVehicle(data.actual[i].vehicleId);
+ dir_cell.appendChild(displayVehicle(vehicle));
+ 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';
@@ -209,7 +149,9 @@
tr.className = 'warning';
}
- tr.addEventListener('click', function(tripId){ return function(){ loadRoute(tripId); } }(data.actual[i].tripId) );
+ tr.addEventListener('click', function(tripId, vehicleInfo) {
+ return function(){ loadRoute(tripId, vehicleInfo); }
+ }(data.actual[i].tripId, vehicle));
times_table.appendChild(tr);
}
@@ -230,12 +172,15 @@
}).fail(fail_ajax).always(loading_end);
}
-function loadRoute(tripId) {
+function loadRoute(tripId, vehicleInfo) {
if(!tripId) tripId = route_id;
if(!tripId) return;
+ if(vehicleInfo === undefined) vehicleInfo = route_vehicle_info;
+
console.log('loadRoute(' + tripId + ')');
route_id = tripId;
+ route_vehicle_info = vehicleInfo;
if(route_xhr) route_xhr.abort();
route_xhr = $.get(
@@ -249,6 +194,16 @@
}
setText(route_line, data.routeName + ' ' + data.directionText);
+
+ deleteChildren(route_vehicle);
+ if(vehicleInfo) {
+ var span = displayVehicle(vehicleInfo);
+ if(span) {
+ setText(route_vehicle, span.title);
+ }
+ route_vehicle.insertBefore(span, route_vehicle.firstChild);
+ }
+
deleteChildren(route_table);
for(var i = 0, il = data.old.length; i < il; i++) {
@@ -340,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;
@@ -360,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)));
+ }
}
}
@@ -425,15 +387,21 @@
loadTimes(stop_name_autocomplete.value);
});
- refresh_button.addEventListener('click', function(e) {
+ refresh_button.addEventListener('click', function() {
loadTimes();
loadRoute();
});
- alert_close.addEventListener('click', function(e) {
+ alert_close.addEventListener('click', function() {
alert.style.display = 'none';
});
+ vehicle_data.addEventListener('click', function(e) {
+ e.preventDefault();
+ vehicle_data.style.display = 'none';
+ setText(vehicle_data_style, '.vehicleData { display: table-cell; }')
+ });
+
hash();
window.addEventListener('hashchange', hash);
--
Gitblit v1.9.1