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
---
map.js | 80 +++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 46 deletions(-)
diff --git a/map.js b/map.js
index 11c7aa0..c6f8bdc 100644
--- a/map.js
+++ b/map.js
@@ -20,7 +20,7 @@
var vehicles_info = {};
var stops_xhr = null;
-var stops_ignored = ['131'];
+var stops_ignored = ['131', '744'];
var stops_style = {
'sb': new ol.style.Style({
image: new ol.style.Circle({
@@ -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);
@@ -278,7 +278,7 @@
var vehicle_name_space = vehicle.name.indexOf(' ');
vehicle.line = vehicle.name.substr(0, vehicle_name_space);
- vehicle.direction = vehicle.name.substr(vehicle_name_space+1);
+ vehicle.direction = normalizeName(vehicle.name.substr(vehicle_name_space+1));
if(special_directions[vehicle.direction]) {
vehicle.line = special_directions[vehicle.direction];
}
@@ -389,36 +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);
- var i, il;
+ var all_departures = data.old.concat(data.actual);
var tr;
- for(i = 0, il = data.old.length; i < il; i++) {
- 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 stopsToMark = [];
-
- for(i = 0, il = data.actual.length; i < il; i++) {
+ for(var i = 0, il = all_departures.length; i < il; i++) {
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);
+ addCellWithText(tr, all_departures[i].actualTime || all_departures[i].plannedTime);
+ addCellWithText(tr, all_departures[i].stop_seq_num + '. ' + normalizeName(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);
@@ -439,36 +441,22 @@
).done(function(data) {
deleteChildren(table);
- var i, il;
+ var all_departures = data.old.concat(data.actual);
var tr, dir_cell, vehicle, status, status_cell, delay, delay_cell;
- for(i = 0, il = data.old.length; i < il; i++) {
+ for(var i = 0, il = all_departures.length; i < il; i++) {
tr = document.createElement('tr');
- addCellWithText(tr, data.old[i].patternText);
- dir_cell = addCellWithText(tr, data.old[i].direction);
- vehicle = parseVehicle(data.old[i].vehicleId);
+ addCellWithText(tr, all_departures[i].patternText);
+ dir_cell = addCellWithText(tr, normalizeName(all_departures[i].direction));
+ vehicle = parseVehicle(all_departures[i].vehicleId);
dir_cell.appendChild(displayVehicle(vehicle));
- status = parseStatus(data.old[i]);
+ status = parseStatus(all_departures[i]);
status_cell = addCellWithText(tr, status);
- delay_cell = addCellWithText(tr, '');
-
- tr.className = 'active';
- table.appendChild(tr);
- }
-
- for(i = 0, il = data.actual.length; i < il; i++) {
- tr = document.createElement('tr');
- addCellWithText(tr, data.actual[i].patternText);
- dir_cell = addCellWithText(tr, data.actual[i].direction);
- vehicle = parseVehicle(data.actual[i].vehicleId);
- dir_cell.appendChild(displayVehicle(vehicle));
- status = parseStatus(data.actual[i]);
- status_cell = addCellWithText(tr, status);
- delay = parseDelay(data.actual[i]);
+ delay = parseDelay(all_departures[i]);
delay_cell = addCellWithText(tr, delay);
- if(data.actual[i].status === 'DEPARTED') {
+ if(i < data.old.length) {
tr.className = 'active';
- } else if(status == lang.boarding_sign) {
+ } else if(status === lang.boarding_sign) {
tr.className = 'success';
status_cell.className = 'status-boarding';
} else if(parseInt(delay) > 9) {
@@ -501,7 +489,7 @@
var div = document.createElement('div');
var typeName;
- var name = feature.get('name');
+ var name = normalizeName(feature.get('name'));
var additional;
var table = document.createElement('table');
var thead = document.createElement('thead');
@@ -666,7 +654,7 @@
addElementWithText(a, 'span', typeName).className = 'small';
a.appendChild(document.createTextNode(' '));
- addElementWithText(a, 'span', feature.get('name'));
+ addElementWithText(a, 'span', normalizeName(feature.get('name')));
div.appendChild(p);
}
--
Gitblit v1.9.1