From 88a24c17fd2af2eb44aca15cc3b4072e0d0154aa Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Wed, 13 Mar 2019 00:01:33 +0000
Subject: [PATCH] Unify stops layers and sources to simplify code
---
index.js | 147 ++++++++++++++++++-------------------------------
1 files changed, 54 insertions(+), 93 deletions(-)
diff --git a/index.js b/index.js
index 551d035..3d5d73c 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,5 @@
-//var ttss_base = 'http://www.ttss.krakow.pl/internetservice';
-var ttss_base = '/proxy.php';
+"use strict";
+
var ttss_refresh = 20000; // 20 seconds
var page_title = document.getElementsByTagName('title')[0];
@@ -41,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);
@@ -156,16 +85,27 @@
if(times_xhr) times_xhr.abort();
console.log('loadTimes(' + stopId + ')');
+
+ loading_start();
+
+ var url = ttss_trams_base;
+ var stop = stopId.substr(1);
+ var prefix = 't';
+ if(stopId.startsWith('b')) {
+ url = ttss_buses_base;
+ stop = stopId.substr(1);
+ prefix = 'b';
+ }
+
stop_id = stopId;
ignore_hashchange = true;
window.location.hash = '#!' + language + stopId;
refresh_button.removeAttribute('disabled');
- loading_start();
times_xhr = $.get(
- ttss_base + '/services/passageInfo/stopPassages/stop'
- + '?stop=' + encodeURIComponent(stopId)
+ url + '/services/passageInfo/stopPassages/stop'
+ + '?stop=' + encodeURIComponent(stop)
+ '&mode=departure'
).done(function(data) {
setText(times_stop_name, data.stopName);
@@ -182,7 +122,7 @@
var tr = document.createElement('tr');
addCellWithText(tr, data.old[i].patternText);
var dir_cell = addCellWithText(tr, data.old[i].direction);
- var vehicle = parseVehicle(data.old[i].vehicleId);
+ var vehicle = parseVehicle(prefix + data.old[i].vehicleId);
dir_cell.appendChild(displayVehicle(vehicle));
addCellWithText(tr, (vehicle ? vehicle.num : '')).className = 'vehicleData';
var status = parseStatus(data.old[i]);
@@ -192,7 +132,7 @@
tr.className = 'active';
tr.addEventListener('click', function(tripId, vehicleInfo) {
return function(){ loadRoute(tripId, vehicleInfo); }
- }(data.old[i].tripId, vehicle));
+ }(prefix + data.old[i].tripId, vehicle));
times_table.appendChild(tr);
}
@@ -200,7 +140,7 @@
var tr = document.createElement('tr');
addCellWithText(tr, data.actual[i].patternText);
var dir_cell = addCellWithText(tr, data.actual[i].direction);
- var vehicle = parseVehicle(data.actual[i].vehicleId);
+ var vehicle = parseVehicle(prefix + data.actual[i].vehicleId);
dir_cell.appendChild(displayVehicle(vehicle));
addCellWithText(tr, (vehicle ? vehicle.num : '')).className = 'vehicleData';
var status = parseStatus(data.actual[i]);
@@ -208,9 +148,11 @@
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';
@@ -220,7 +162,7 @@
tr.addEventListener('click', function(tripId, vehicleInfo) {
return function(){ loadRoute(tripId, vehicleInfo); }
- }(data.actual[i].tripId, vehicle));
+ }(prefix + data.actual[i].tripId, vehicle));
times_table.appendChild(tr);
}
@@ -248,13 +190,23 @@
if(vehicleInfo === undefined) vehicleInfo = route_vehicle_info;
console.log('loadRoute(' + tripId + ')');
+
+ var url = ttss_trams_base;
+ var trip = tripId.substr(1);
+ var prefix = 't';
+ if(tripId.startsWith('b')) {
+ url = ttss_buses_base;
+ trip = tripId.substr(1);
+ prefix = 'b';
+ }
+
route_id = tripId;
route_vehicle_info = vehicleInfo;
if(route_xhr) route_xhr.abort();
route_xhr = $.get(
- ttss_base + '/services/tripInfo/tripPassages'
- + '?tripId=' + encodeURIComponent(tripId)
+ url + '/services/tripInfo/tripPassages'
+ + '?tripId=' + encodeURIComponent(trip)
+ '&mode=departure'
).done(function(data) {
if(!data.routeName || !data.directionText || data.old.length + data.actual.length == 0) {
@@ -281,7 +233,7 @@
addCellWithText(tr, data.old[i].stop_seq_num + '. ' + data.old[i].stop.name);
tr.className = 'active';
- tr.addEventListener('click', function(stopId){ return function(){ loadTimes(stopId); } }(data.old[i].stop.shortName) );
+ tr.addEventListener('click', function(stopId){ return function(){ loadTimes(stopId); } }(prefix + data.old[i].stop.shortName) );
route_table.appendChild(tr);
}
@@ -293,7 +245,7 @@
if(data.actual[i].status == 'STOPPING') {
tr.className = 'success';
}
- tr.addEventListener('click', function(stopId){ return function(){ loadTimes(stopId); } }(data.actual[i].stop.shortName) );
+ tr.addEventListener('click', function(stopId){ return function(){ loadTimes(stopId); } }(prefix + data.actual[i].stop.shortName) );
route_table.appendChild(tr);
}
}).fail(fail_ajax);
@@ -395,13 +347,22 @@
}
if(window.location.hash.match(/^#![0-9]+$/)) {
- loadTimes(parseInt(window.location.hash.substr(2)));
+ loadTimes('t' + window.location.hash.substr(2));
+ } else if(window.location.hash.match(/^#![bt][0-9]+$/)) {
+ loadTimes(window.location.hash.substr(2));
} else if(window.location.hash.match(/^#![a-z]{2}[0-9]*$/)) {
- var stop = parseInt(window.location.hash.substr(4));
+ var stop = 't' + window.location.hash.substr(4);
if(stop) stop_id = stop;
if(!change_language(window.location.hash.substr(2, 2))) {
- loadTimes(parseInt(window.location.hash.substr(2)));
+ loadTimes(stop);
+ }
+ } else if(window.location.hash.match(/^#![a-z]{2}[bt][0-9]*$/)) {
+ var stop = window.location.hash.substr(4);
+ if(stop) stop_id = stop;
+
+ if(!change_language(window.location.hash.substr(2, 2))) {
+ loadTimes(stop);
}
}
}
@@ -410,15 +371,13 @@
if(stop_name_autocomplete_xhr) stop_name_autocomplete_xhr.abort();
stop_name_autocomplete_xhr = $.get(
- 'stops.php?query=' + encodeURIComponent(stop_name.value)
+ 'stops/?query=' + encodeURIComponent(stop_name.value)
).done(function(data) {
deleteChildren(stop_name_autocomplete);
for(var i = 0, il = data.length; i < il; i++) {
- if(data[i].type != 'stop') continue;
- if(data[i].id > 6000) continue;
var opt = document.createElement('option');
opt.value = data[i].id;
- setText(opt, data[i].name);
+ setText(opt, data[i].id.substr(0,1) == 'b' ? lang.select_stop_bus.replace('$stop', data[i].name) : lang.select_stop_tram.replace('$stop', data[i].name));
stop_name_autocomplete.appendChild(opt);
}
@@ -471,6 +430,8 @@
setText(vehicle_data_style, '.vehicleData { display: table-cell; }')
});
+ updateVehicleInfo()
+
hash();
window.addEventListener('hashchange', hash);
--
Gitblit v1.9.1