From 08514a8ed6a4e7f543078a19271cb0546532e35d Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Mon, 02 Nov 2020 00:15:43 +0000 Subject: [PATCH] [map] New API approach --- index.js | 387 +++++++++++++++++++++++++++---------------------------- 1 files changed, 189 insertions(+), 198 deletions(-) diff --git a/index.js b/index.js index ece01b3..2927c12 100644 --- a/index.js +++ b/index.js @@ -1,3 +1,5 @@ +'use strict'; + var ttss_refresh = 20000; // 20 seconds var page_title = document.getElementsByTagName('title')[0]; @@ -15,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'); @@ -52,9 +55,9 @@ 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); @@ -73,180 +76,6 @@ function loading_end() { nav.className = nav.className.replace(' loading', ''); -} - -function loadTimes(stopId) { - if(!stopId) stopId = stop_id; - if(!stopId) return; - - if(times_timer) clearTimeout(times_timer); - 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'); - - times_xhr = $.get( - 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)); - deleteChildren(times_alerts); - deleteChildren(times_table); - //deleteChildren(times_lines); - - for(var 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); - 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]); - addCellWithText(tr, status); - addCellWithText(tr, ''); - - tr.className = 'active'; - tr.addEventListener('click', function(tripId, vehicleInfo) { - return function(){ loadRoute(tripId, vehicleInfo); } - }(prefix + data.old[i].tripId, vehicle)); - 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); - 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]); - var status_cell = addCellWithText(tr, status); - var delay = parseDelay(data.actual[i]); - var delay_cell = addCellWithText(tr, delay); - - if(data.actual[i].status == 'STOPPING') { - tr.className = 'success'; - if (data.actual[i].actualRelativeTime <= 0) { - status_cell.className = 'status-boarding'; - } - } else if(parseInt(delay) > 9) { - tr.className = 'danger'; - delay_cell.className = 'status-delayed'; - } else if(parseInt(delay) > 3) { - tr.className = 'warning'; - } - - tr.addEventListener('click', function(tripId, vehicleInfo) { - return function(){ loadRoute(tripId, vehicleInfo); } - }(prefix + data.actual[i].tripId, vehicle)); - times_table.appendChild(tr); - } - - /* - for(var i = 0, il = data.routes.length; i < il; i++) { - var tr = document.createElement('tr'); - addCellWithText(tr, data.routes[i].name); - addCellWithText(tr, data.routes[i].directions.join(' - ')); - addCellWithText(tr, data.routes[i].authority); - times_lines.appendChild(tr); - } - */ - - startTimer(new Date()); - fail_hide(); - - times_timer = setTimeout(function(){ loadTimes(); loadRoute(); }, ttss_refresh); - }).fail(fail_ajax).always(loading_end); -} - -function loadRoute(tripId, vehicleInfo) { - if(!tripId) tripId = route_id; - if(!tripId) return; - - 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( - url + '/services/tripInfo/tripPassages' - + '?tripId=' + encodeURIComponent(trip) - + '&mode=departure' - ).done(function(data) { - if(!data.routeName || !data.directionText || data.old.length + data.actual.length == 0) { - route_id = null; - return; - } - - 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++) { - 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'; - tr.addEventListener('click', function(stopId){ return function(){ loadTimes(stopId); } }(prefix + data.old[i].stop.shortName) ); - route_table.appendChild(tr); - } - - 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); - - if(data.actual[i].status == 'STOPPING') { - tr.className = 'success'; - } - tr.addEventListener('click', function(stopId){ return function(){ loadTimes(stopId); } }(prefix + data.actual[i].stop.shortName) ); - route_table.appendChild(tr); - } - }).fail(fail_ajax); } function startTimer(date) { @@ -284,13 +113,181 @@ }, interval); } +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_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) { + route_id = null; + return; + } + + 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); + + 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(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 loadTimes(stopId) { + if(!stopId) stopId = stop_id; + if(!stopId) return; + + if(times_timer) clearTimeout(times_timer); + 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; + refresh_button.removeAttribute('disabled'); + + 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( + url + '/services/passageInfo/stopPassages/stop' + + '?stop=' + encodeURIComponent(stop) + + '&mode=departure' + ).done(function(data) { + 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); + + 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); + } + + 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 = vehicles_info.getParsed(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); + + if(i < data.old.length) { + tr.className = 'active'; + } else if(all_departures[i].status === 'STOPPING') { + tr.className = 'success'; + if (all_departures[i].actualRelativeTime <= 0) { + status_cell.className = 'status-boarding'; + } + } else if(parseInt(delay) > 9) { + tr.className = 'danger'; + delay_cell.className = 'status-delayed'; + } else if(parseInt(delay) > 3) { + tr.className = 'warning'; + } + + tr.addEventListener('click', function(tripId, vehicleInfo) { + return function(){ loadRoute(tripId, vehicleInfo); } + }(prefix + all_departures[i].tripId, vehicle)); + times_table.appendChild(tr); + } + + /* + for(var i = 0, il = data.routes.length; i < il; i++) { + var tr = document.createElement('tr'); + addCellWithText(tr, data.routes[i].name); + addCellWithText(tr, data.routes[i].directions.join(' - ')); + addCellWithText(tr, data.routes[i].authority); + times_lines.appendChild(tr); + } + */ + + startTimer(new Date()); + fail_hide(); + + times_timer = setTimeout(function(){ loadTimes(); loadRoute(); }, ttss_refresh); + }).fail(fail_ajax).always(loading_end); + return times_xhr; +} + function translate() { var elements = document.querySelectorAll('*[data-translate]'); 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,13 +320,15 @@ } 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; @@ -344,23 +343,24 @@ return; } + var stop; if(window.location.hash.match(/^#![0-9]+$/)) { 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 = 't' + window.location.hash.substr(4); - if(stop) stop_id = stop; + stop = window.location.hash.substr(4); + if(stop) stop_id = 't' + stop; if(!change_language(window.location.hash.substr(2, 2))) { - loadTimes(stop); + loadTimes(); } } else if(window.location.hash.match(/^#![a-z]{2}[bt][0-9]*$/)) { - var stop = window.location.hash.substr(4); + stop = window.location.hash.substr(4); if(stop) stop_id = stop; if(!change_language(window.location.hash.substr(2, 2))) { - loadTimes(stop); + loadTimes(); } } } @@ -375,30 +375,21 @@ for(var i = 0, il = data.length; i < il; i++) { var opt = document.createElement('option'); opt.value = data[i].id; - 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)); + 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) { + lang_select.addEventListener('input', function() { change_language(lang_select.value); }); - stop_name.addEventListener('input', function(e) { + stop_name.addEventListener('input', function() { if(!stop_name.value) return; if(stop_name_autocomplete_timer) clearTimeout(stop_name_autocomplete_timer); @@ -428,7 +419,7 @@ setText(vehicle_data_style, '.vehicleData { display: table-cell; }') }); - updateVehicleInfo() + vehicles_info.update(); hash(); -- Gitblit v1.9.1