From 76f5c4d36a5b21663ead52349ad944d18f55e6d6 Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Sat, 13 Apr 2019 23:06:22 +0000 Subject: [PATCH] Use mapping for transations of feature type --- index.js | 164 ++++++++++++++++++++---------------------------------- 1 files changed, 62 insertions(+), 102 deletions(-) diff --git a/index.js b/index.js index dbcbf83..3000b78 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]; @@ -27,6 +27,7 @@ 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'); @@ -40,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); @@ -155,17 +85,22 @@ 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(); 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 +117,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 +127,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 +135,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 +143,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 +157,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); } @@ -245,16 +182,21 @@ if(!tripId) tripId = route_id; if(!tripId) return; - if(!vehicleInfo) vehicleInfo = route_vehicle_info; + if(vehicleInfo === undefined) vehicleInfo = route_vehicle_info; console.log('loadRoute(' + tripId + ')'); + + var prefix = tripId.substr(0, 1); + var trip = tripId.substr(1); + var url = ttss_urls[prefix]; + 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 +223,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 +235,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); @@ -340,7 +282,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; } @@ -364,8 +306,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; @@ -373,29 +315,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); + } } } @@ -403,15 +363,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, lang.select_stop_type[data[i].id.substr(0,1)].replace('$stop', data[i].name)); stop_name_autocomplete.appendChild(opt); } @@ -464,6 +422,8 @@ setText(vehicle_data_style, '.vehicleData { display: table-cell; }') }); + updateVehicleInfo() + hash(); window.addEventListener('hashchange', hash); -- Gitblit v1.9.1