From 4b0eda2a43298f2a3ac6c21b8d5eabe2a1590acc Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Mon, 17 Apr 2017 15:36:32 +0000
Subject: [PATCH] Add separate column for vehicle number (hidden by default)
---
index.js | 57 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/index.js b/index.js
index a5aba2b..acdfb24 100644
--- a/index.js
+++ b/index.js
@@ -3,11 +3,12 @@
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');
@@ -36,6 +37,8 @@
var alert_close = document.getElementById('alert-close');
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) {
@@ -114,7 +117,7 @@
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);
}
@@ -151,8 +154,11 @@
if(times_xhr) times_xhr.abort();
console.log('loadTimes(' + stopId + ')');
+ stop_id = stopId;
- window.location.hash = '#!' + language + stop_id;
+ ignore_hashchange = true;
+ window.location.hash = '#!' + language + stopId;
+ ignore_hashchange = false;
refresh_button.removeAttribute('disabled');
loading_start();
@@ -175,7 +181,9 @@
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.actual[i].vehicleId);
+ dir_cell.appendChild(displayVehicle(vehicle));
+ addCellWithText(tr, vehicle.num).className = 'vehicleData';
var status = parseStatus(data.old[i]);
addCellWithText(tr, status);
addCellWithText(tr, '');
@@ -189,7 +197,9 @@
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.num).className = 'vehicleData';
var status = parseStatus(data.actual[i]);
var status_cell = addCellWithText(tr, status);
var delay = parseDelay(data.actual[i]);
@@ -253,6 +263,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) );
route_table.appendChild(tr);
}
@@ -264,6 +275,7 @@
if(data.actual[i].status == 'STOPPING') {
tr.className = 'success';
}
+ tr.addEventListener('click', function(stopId){ return function(){ loadTimes(stopId); } }(data.actual[i].stop.shortName) );
route_table.appendChild(tr);
}
}).fail(fail_ajax);
@@ -319,15 +331,18 @@
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) {
@@ -349,17 +364,20 @@
document.body.removeChild(document.getElementById('lang_script'));
document.body.appendChild(script);
+ ignore_hashchange = true;
window.location.hash = '#!' + language + stop_id;
+ ignore_hashchange = false;
}
function hash() {
+ if(ignore_hashchange) 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));
- loadTimes(stop_id);
}
}
@@ -375,7 +393,7 @@
if(data[i].id > 6000) continue;
var opt = document.createElement('option');
opt.value = data[i].id;
- setText(opt, decodeEntities(data[i].name));
+ setText(opt, data[i].name);
stop_name_autocomplete.appendChild(opt);
}
@@ -410,22 +428,29 @@
stop_name_form.addEventListener('submit', function(e) {
e.preventDefault();
if(!stop_name_autocomplete.value) return;
- stop_id = stop_name_autocomplete.value;
- loadTimes(stop_id);
+ 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);
+
+ checkVersionInit();
}
init();
--
Gitblit v1.9.1