From d87cf076349d354b829bfe896ef11247b1182dd9 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sat, 04 May 2019 12:46:08 +0000
Subject: [PATCH] Use number of matched query chars when ordering stop search results
---
index.js | 304 ++++++++++++++++++++++++--------------------------
1 files changed, 147 insertions(+), 157 deletions(-)
diff --git a/index.js b/index.js
index fd3d883..924e93c 100644
--- a/index.js
+++ b/index.js
@@ -1,14 +1,14 @@
-//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];
var ignore_hashchange = false;
-var language = 'en';
+var language = 'pl';
var lang_select = document.getElementById('lang-select');
-var stop_id;
+var stop_id = '';
var stop_name = document.getElementById('stop-name');
var stop_name_form = stop_name.form;
var stop_name_autocomplete = document.getElementById('stop-name-autocomplete');
@@ -17,6 +17,7 @@
var times_xhr;
var times_timer;
+var times_stop_type = document.getElementById('times-stop-type');
var times_stop_name = document.getElementById('times-stop-name');
var times_alerts = document.getElementById('times-alerts');
var times_table = document.getElementById('times-table');
@@ -26,6 +27,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 +40,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);
@@ -115,15 +49,15 @@
setText(alert_text, message);
alert.style.display = 'block';
- console.log(message + ' More details follow.');
+ console.log(message + (more ? ' More details follow.' : ''));
if(more) console.log(more);
}
function fail_ajax(data) {
// abort() is not a failure
- if(data.readyState == 0 && data.statusText == 'abort') return;
+ if(data.readyState === 0) return;
- if(data.status == 0) {
+ if(data.status === 0) {
fail(lang.error_request_failed_connectivity, data);
} else if (data.statusText) {
fail(lang.error_request_failed_status.replace('$status', data.statusText), data);
@@ -152,56 +86,78 @@
if(times_xhr) times_xhr.abort();
console.log('loadTimes(' + stopId + ')');
+
+ loading_start();
+
+ var prefix = stopId.substr(0, 1);
+ var stop = stopId.substr(1);
+ var url = ttss_urls[prefix];
+
stop_id = stopId;
ignore_hashchange = true;
window.location.hash = '#!' + language + stopId;
- ignore_hashchange = false;
refresh_button.removeAttribute('disabled');
- loading_start();
+ var alternative_stop = null;
+ var candidate;
+ for(var i = 0; i < stop_name_autocomplete.options.length; i++) {
+ candidate = stop_name_autocomplete.options[i].value;
+ if(candidate.substr(0, 1) != prefix && candidate.substr(1) == stop) {
+ alternative_stop = candidate;
+ break;
+ }
+ }
+
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);
- setText(page_title, lang.page_title_stop_name.replace('$stop', data.stopName));
+ setText(times_stop_type, lang.types['s' + prefix]);
+ setText(times_stop_name, normalizeName(data.stopName));
+ setText(page_title, lang.page_title_stop_name.replace('$stop', normalizeName(data.stopName)));
deleteChildren(times_alerts);
deleteChildren(times_table);
//deleteChildren(times_lines);
- for(var i = 0, il = data.generalAlerts.length; i < il; i++) {
+ if(alternative_stop !== null) {
+ var a = addParaWithText(times_alerts, '');
+ a = addElementWithText(a, 'a', (prefix == 'b' ? lang.departures_for_trams : lang.departures_for_buses));
+ a.href = '';
+ a.onclick = function(e) {
+ e.preventDefault();
+ loadTimes(alternative_stop);
+ };
+
+ }
+
+ var i, il;
+ for(i = 0, il = data.generalAlerts.length; i < il; i++) {
addParaWithText(times_alerts, data.generalAlerts[i].title);
}
- for(var i = 0, il = data.old.length; i < il; i++) {
- 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 status = parseStatus(data.old[i]);
- addCellWithText(tr, status);
- addCellWithText(tr, '');
+ var all_departures = data.old.concat(data.actual);
+ var tr, dir_cell, vehicle, status, status_cell, delay, delay_cell;
+ for(i = 0, il = all_departures.length; i < il; i++) {
+ tr = document.createElement('tr');
+ addCellWithText(tr, all_departures[i].patternText);
+ dir_cell = addCellWithText(tr, all_departures[i].direction);
+ vehicle = parseVehicle(prefix + all_departures[i].vehicleId);
+ dir_cell.appendChild(displayVehicle(vehicle));
+ addCellWithText(tr, (vehicle ? vehicle.num : '')).className = 'vehicleData';
+ status = parseStatus(all_departures[i]);
+ status_cell = addCellWithText(tr, status);
+ delay = parseDelay(all_departures[i]);
+ delay_cell = addCellWithText(tr, delay);
- tr.className = 'active';
- tr.addEventListener('click', function(tripId){ return function(){ loadRoute(tripId); } }(data.old[i].tripId) );
- times_table.appendChild(tr);
- }
-
- for(var i = 0, il = data.actual.length; i < il; i++) {
- 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 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(i < data.old.length) {
+ tr.className = 'active';
+ } else if(all_departures[i].status === 'STOPPING') {
tr.className = 'success';
- status_cell.className = 'status-boarding';
+ if (all_departures[i].actualRelativeTime <= 0) {
+ status_cell.className = 'status-boarding';
+ }
} else if(parseInt(delay) > 9) {
tr.className = 'danger';
delay_cell.className = 'status-delayed';
@@ -209,7 +165,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); }
+ }(prefix + all_departures[i].tripId, vehicle));
times_table.appendChild(tr);
}
@@ -228,19 +186,27 @@
times_timer = setTimeout(function(){ loadTimes(); loadRoute(); }, ttss_refresh);
}).fail(fail_ajax).always(loading_end);
+ return times_xhr;
}
-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 + ')');
+
+ var prefix = tripId.substr(0, 1);
+ var trip = tripId.substr(1);
+
route_id = tripId;
+ route_vehicle_info = vehicleInfo;
if(route_xhr) route_xhr.abort();
route_xhr = $.get(
- ttss_base + '/services/tripInfo/tripPassages'
- + '?tripId=' + encodeURIComponent(tripId)
+ ttss_urls[prefix] + '/services/tripInfo/tripPassages'
+ + '?tripId=' + encodeURIComponent(trip)
+ '&mode=departure'
).done(function(data) {
if(!data.routeName || !data.directionText || data.old.length + data.actual.length == 0) {
@@ -249,28 +215,35 @@
}
setText(route_line, data.routeName + ' ' + data.directionText);
- deleteChildren(route_table);
- for(var i = 0, il = data.old.length; i < il; i++) {
- var tr = document.createElement('tr');
- addCellWithText(tr, data.old[i].actualTime || data.old[i].plannedTime);
- addCellWithText(tr, data.old[i].stop_seq_num + '. ' + data.old[i].stop.name);
-
- tr.className = 'active';
- route_table.appendChild(tr);
+ deleteChildren(route_vehicle);
+ if(vehicleInfo) {
+ var span = displayVehicle(vehicleInfo);
+ if(span) {
+ setText(route_vehicle, span.title);
+ }
+ route_vehicle.insertBefore(span, route_vehicle.firstChild);
}
- for(var i = 0, il = data.actual.length; i < il; i++) {
- var tr = document.createElement('tr');
- addCellWithText(tr, data.actual[i].actualTime || data.actual[i].plannedTime);
- addCellWithText(tr, data.actual[i].stop_seq_num + '. ' + data.actual[i].stop.name);
+ deleteChildren(route_table);
+
+ var all_departures = data.old.concat(data.actual);
+ var tr;
+ for(var i = 0, il = all_departures.length; i < il; i++) {
+ tr = document.createElement('tr');
+ addCellWithText(tr, all_departures[i].actualTime || all_departures[i].plannedTime);
+ addCellWithText(tr, all_departures[i].stop_seq_num + '. ' + all_departures[i].stop.name);
- if(data.actual[i].status == 'STOPPING') {
+ if(i < data.old.length) {
+ tr.className = 'active';
+ } else if(all_departures[i].status === 'STOPPING') {
tr.className = 'success';
}
+ tr.addEventListener('click', function(stopId){ return function(){ loadTimes(stopId); } }(prefix + all_departures[i].stop.shortName) );
route_table.appendChild(tr);
}
}).fail(fail_ajax);
+ return route_xhr;
}
function startTimer(date) {
@@ -314,7 +287,7 @@
var text_name;
for(var i = 0; i < elements.length; i++) {
text_name = elements[i].dataset.translate;
- if(lang[text_name] == undefined) {
+ if(typeof lang[text_name] === 'undefined') {
console.log('Missing translation: ' + text_name);
continue;
}
@@ -323,23 +296,23 @@
stop_name.setAttribute('placeholder', lang.stop_name_placeholder);
- if(stop_id) return;
-
- setText(page_title, lang.page_title);
-
if(stop_name_autocomplete.value) {
setText(refresh_text, lang.select_stop_click_go);
} else {
setText(refresh_text, lang.enter_stop_name_to_begin);
}
+ setText(page_title, lang.page_title);
+
+ if(!stop_id) return;
+
loadTimes();
loadRoute();
}
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;
@@ -347,29 +320,47 @@
}
language = lang;
+ var old_script = document.getElementById('lang_script');
+ var old_version = old_script.src.match(/\?v[0-9]+/)[0];
var script = document.createElement('script');
script.type = 'text/javascript';
- script.src = 'lang_' + lang + '.js';
+ script.src = 'lang_' + lang + '.js' + (old_version ? old_version : '');
script.id = 'lang_script';
script.onload = translate;
- document.body.removeChild(document.getElementById('lang_script'));
+ document.body.removeChild(old_script);
document.body.appendChild(script);
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)));
+ 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;
- change_language(window.location.hash.substr(2, 2));
+
+ if(!change_language(window.location.hash.substr(2, 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);
+ }
}
}
@@ -377,33 +368,22 @@
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, decodeEntities(data[i].name));
+ setText(opt, lang.select_stop_type[data[i].id.substr(0,1)].replace('$stop', data[i].name));
stop_name_autocomplete.appendChild(opt);
}
if(!stop_id) setText(refresh_text, lang.select_stop_click_go);
}).fail(fail_ajax);
+ return stop_name_autocomplete_xhr;
}
function init() {
- if(!window.jQuery) {
- fail(lang.jquery_not_loaded);
- return;
- }
-
- $.ajaxSetup({
- dataType: 'json',
- timeout: 10000,
- });
-
lang_select.addEventListener('input', function(e) {
change_language(lang_select.value);
});
@@ -423,18 +403,28 @@
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; }')
+ });
+
+ updateVehicleInfo()
hash();
window.addEventListener('hashchange', hash);
+
+ checkVersionInit();
}
init();
--
Gitblit v1.9.1