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
---
common.js | 241 +++++++++++++++++++++++++----------------------
1 files changed, 129 insertions(+), 112 deletions(-)
diff --git a/common.js b/common.js
index a22a086..0bf165e 100644
--- a/common.js
+++ b/common.js
@@ -1,13 +1,92 @@
-// Special directions
-var special_directions = {
- 'Zajezdnia Nowa Huta' : 'NH',
- 'Zajezdnia Podgórze' : 'P',
+"use strict";
+
+var ttss_urls = {
+ t: 'proxy_tram.php',
+ // t: 'http://www.ttss.krakow.pl/internetservice',
+ b: 'proxy_bus.php',
+ // b: 'http://91.223.13.70/internetservice',
};
+var ttss_types = ['t', 'b'];
+
+var special_directions = {
+ 'Zajezdnia Nowa Huta' : 'ZH',
+ 'Zajezdnia Podgórze' : 'ZP',
+ 'Zjazd do zajezdni' : 'Z',
+ 'Wyjazd na linię' : 'W',
+ 'Przejazd techniczny' : 'PT',
+};
+
+
+/********
+ * AJAX *
+ ********/
+
+function Deferred(promise, request) {
+ return {
+ promise: promise,
+ request: request,
+ abort: function() {
+ request.abort.bind(request)
+ return Deferred(promise, request);
+ },
+ done: function(func) {
+ return Deferred(promise.then(func), request);
+ },
+ fail: function(func) {
+ return Deferred(promise.catch(func), request);
+ },
+ always: function(func) {
+ return Deferred(promise.finally(func), request);
+ },
+ };
+}
+
+Deferred.all = function(iterable) {
+ return Deferred(
+ Promise.all(
+ iterable.map(x => x.promise)
+ )
+ );
+};
+
+var $ = {
+ timeout: 10000,
+ dataType: 'json',
+ get: function(url) {
+ var self = this;
+ var request = new XMLHttpRequest();
+ var promise = new Promise(function(resolve, reject) {
+ request.timeout = self.timeout;
+ request.onreadystatechange = function() {
+ if(this.readyState == 4) {
+ if(this.status == 200) {
+ if(self.dataType == 'json') {
+ resolve(JSON.parse(this.responseText));
+ } else {
+ resolve(this.responseText);
+ }
+ } else {
+ reject(request);
+ }
+ }
+ };
+ request.open("GET", url, true);
+ request.send();
+ });
+ return Deferred(promise, request);
+ },
+};
+
+
+/***********
+ * VERSION *
+ ***********/
var script_version;
var script_version_xhr;
-// Check for website updates
+var vehicles_info = {};
+
function checkVersion() {
if(script_version_xhr) script_version_xhr.abort();
@@ -31,7 +110,15 @@
setInterval(checkVersion, 3600000);
}
-/* Parsing of received JSON parts */
+
+/***********
+ * PARSING *
+ ***********/
+
+function normalizeName(string) {
+ return string.replace('.', '. ').replace(' ', ' ');
+}
+
function parseStatus(status) {
switch(status.status) {
case 'STOPPING':
@@ -76,118 +163,44 @@
return lang.time_minutes_prefix + ((actual.getTime() - planned.getTime()) / 1000 / 60) + lang.time_minutes_suffix;
}
-// Webservice-related functions
function parseVehicle(vehicleId) {
if(!vehicleId) return false;
- if(vehicleId.substr(0, 15) != '635218529567218') {
+ if(!vehicles_info || !vehicles_info[vehicleId]) {
return false;
- }
-
- var id = parseInt(vehicleId.substr(15)) - 736;
- var prefix;
- var type;
- var low; // low floor: 0 = no, 1 - semi, 2 - full
-
- // Single exception - old id used in one case
- if(id == 831) {
- id = 216;
- } else if(id == 311) {
- id = 899
- }
-
- if(101 <= id && id <= 174) {
- prefix = 'HW';
- type = 'E1';
- low = 0;
-
- if((108 <= id && id <= 113) || id == 127 || id == 131 || id == 132 || id == 134 || (137 <= id && id <= 139) || (148 <= id && id <= 150) || (153 <= id && id <= 155)) {
- prefix = 'RW';
- }
- } else if(201 <= id && id <= 293) {
- prefix = 'RZ';
- type = '105Na';
- low = 0;
-
- if(246 <= id) {
- prefix = 'HZ';
- }
- if(id == 290) {
- type = '105Nb';
- }
- } else if(301 <= id && id <= 328) {
- prefix = 'RF';
- type = 'GT8S';
- low = 0;
-
- if(id == 313) {
- type = 'GT8C'
- low = 1;
- } else if(id == 323 || id >= 325) {
- type = 'GT8N'
- low = 1;
- }
- } else if(401 <= id && id <= 440) {
- prefix = 'HL';
- type = 'EU8N';
- low = 1;
- } else if(451 <= id && id <= 462) {
- prefix = 'HK';
- type = 'N8S-NF';
- low = 1;
-
- if((451 <= id && id <= 456) || id == 462) {
- type = 'N8C-NF';
- }
- } else if(601 <= id && id <= 650) {
- prefix = 'RP';
- type = 'NGT6 (3)';
- low = 2;
-
- if(id <= 613) {
- type = 'NGT6 (1)';
- } else if (id <= 626) {
- type = 'NGT6 (2)';
- }
- } else if(801 <= id && id <= 824) {
- prefix = 'RY';
- type = 'NGT8';
- low = 2;
- } else if(id == 899) {
- prefix = 'RY';
- type = '126N';
- low = 2;
- } else if(901 <= id && id <= 936) {
- prefix = 'RG';
- type = '2014N';
- low = 2;
-
- if(915 <= id) {
- prefix = 'HG';
- }
- } else if(id === 999) {
- prefix = 'HG';
- type = '405N-Kr';
- low = 1;
} else {
- console.log('Unknown vehicle, vehicleId=' + vehicleId + ', id=' + id);
- return false;
+ var vehicle = vehicles_info[vehicleId];
+ return {
+ vehicleId: vehicleId,
+ prefix: vehicle['num'].substr(0, 2),
+ id: vehicle['num'].substr(2, 3),
+ num: vehicle['num'],
+ type: vehicle['type'],
+ low: vehicle['low']
+ };
}
-
- return {
- vehicleId: vehicleId,
- prefix: prefix,
- id: id,
- num: prefix + id,
- type: type,
- low: low
- };
}
-function tramIdToVehicleId(tramId) {
- if(0 <= tramId && tramId <= 999) {
- var vehicleId = '0000' + (tramId + 736);
- vehicleId = vehicleId.substr(vehicleId.length - 4)
- return '635218529567218' + vehicleId;
+function updateVehicleInfo() {
+ return $.get(
+ 'https://mpk.jacekk.net/vehicles/'
+ ).done(function(data) {
+ vehicles_info = data;
+ });
+}
+
+function depotIdToVehicleId(depotId, typeHelper) {
+ if(typeHelper) {
+ for(var prop in vehicles_info) {
+ if(prop.substr(0,1) == typeHelper && vehicles_info[prop]['num'].substr(2) == depotId) {
+ return prop;
+ }
+ }
+ } else {
+ for(var prop in vehicles_info) {
+ if(vehicles_info[prop]['num'] == depotId) {
+ return prop;
+ }
+ }
}
}
@@ -217,7 +230,11 @@
return span;
}
-// Element mangling
+
+/*******
+ * DOM *
+ *******/
+
function deleteChildren(element) {
while(element.lastChild) element.removeChild(element.lastChild);
}
--
Gitblit v1.9.1