From 7eec40947267a8044771ac7c2da6864ecf867b2e Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Sun, 14 Apr 2019 10:48:23 +0000 Subject: [PATCH] Update stop names --- map.js | 96 ++++++++++++++++++++++------------------------- 1 files changed, 45 insertions(+), 51 deletions(-) diff --git a/map.js b/map.js index e8550d4..c6e54d2 100644 --- a/map.js +++ b/map.js @@ -151,9 +151,9 @@ function fail_ajax_generic(data, fnc) { // abort() is not a failure - if(data.readyState == 0) return; + if(data.readyState === 0) return; - if(data.status == 0) { + if(data.status === 0) { fnc(lang.error_request_failed_connectivity, data); } else if (data.statusText) { fnc(lang.error_request_failed_status.replace('$status', data.statusText), data); @@ -226,8 +226,7 @@ stop_selected_layer.setStyle(style); - var feature = null; - var prefix = null; + var feature, prefix; for(var i = 0; i < stops.length; i++) { feature = null; if(stops[i].getId) { @@ -360,7 +359,7 @@ ).done(function(data) { if(!data || !data.paths || !data.paths[0] || !data.paths[0].wayPoints) return; - var point = null; + var point; var points = []; for(var i = 0; i < data.paths[0].wayPoints.length; i++) { point = data.paths[0].wayPoints[i]; @@ -390,34 +389,38 @@ + '?tripId=' + encodeURIComponent(feature.get('tripId')) + '&mode=departure' ).done(function(data) { - if(!data.routeName || !data.directionText) { + if(typeof data.old === "undefined" || typeof data.actual === "undefined") { return; } deleteChildren(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'; - table.appendChild(tr); - } - + var all_departures = data.old.concat(data.actual); + var tr; var stopsToMark = []; - - 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); + 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); - stopsToMark.push('s' + ttss_type + data.actual[i].stop.id); + if(i >= data.old.length) { + stopsToMark.push('s' + ttss_type + all_departures[i].stop.id); + } - if(data.actual[i].status == 'STOPPING') { + if(i < data.old.length) { + tr.className = 'active'; + } else if(all_departures[i].status === 'STOPPING') { tr.className = 'success'; } table.appendChild(tr); + } + + if(all_departures.length === 0) { + tr = document.createElement('tr'); + table.appendChild(tr); + tr = addCellWithText(tr, lang.no_data); + tr.colSpan = '2'; + tr.className = 'active'; } markStops(stopsToMark, ttss_type, true); @@ -438,32 +441,22 @@ ).done(function(data) { deleteChildren(table); - 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(data.old[i].vehicleId); + var all_departures = data.old.concat(data.actual); + var tr, dir_cell, vehicle, status, status_cell, delay, delay_cell; + for(var 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(all_departures[i].vehicleId); dir_cell.appendChild(displayVehicle(vehicle)); - var status = parseStatus(data.old[i]); - addCellWithText(tr, status); - addCellWithText(tr, ''); + status = parseStatus(all_departures[i]); + status_cell = addCellWithText(tr, status); + delay = parseDelay(all_departures[i]); + delay_cell = addCellWithText(tr, delay); - tr.className = 'active'; - 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(data.actual[i].vehicleId); - dir_cell.appendChild(displayVehicle(vehicle)); - 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(status === lang.boarding_sign) { tr.className = 'success'; status_cell.className = 'status-boarding'; } else if(parseInt(delay) > 9) { @@ -642,18 +635,19 @@ addParaWithText(div, lang.select_feature); + var feature, p, a, full_type, typeName; for(var i = 0; i < features.length; i++) { - var feature = features[i]; + feature = features[i]; - var p = document.createElement('p'); - var a = document.createElement('a'); + p = document.createElement('p'); + a = document.createElement('a'); p.appendChild(a); a.addEventListener('click', function(feature) { return function() { featureClicked(feature); }}(feature)); - var full_type = feature.getId().match(/^[a-z]+/)[0]; - var typeName = lang.types[full_type]; + full_type = feature.getId().match(/^[a-z]+/)[0]; + typeName = lang.types[full_type]; if(typeof typeName === 'undefined') { typeName = ''; } -- Gitblit v1.9.1