From c3b488060589273466a1723ad7cd51416cfba84c Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Thu, 29 Jul 2021 22:43:01 +0000
Subject: [PATCH] [map] Allow zero-prefixed stop identifiers (fix for bus stops)
---
common.js | 281 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 201 insertions(+), 80 deletions(-)
diff --git a/common.js b/common.js
index 6733d46..af26776 100644
--- a/common.js
+++ b/common.js
@@ -1,14 +1,13 @@
-"use strict";
+'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',
+ // b: 'http://ttss.mpk.krakow.pl/internetservice',
};
var ttss_types = ['t', 'b'];
-// Special directions
var special_directions = {
'Zajezdnia Nowa Huta' : 'ZH',
'Zajezdnia Podgórze' : 'ZP',
@@ -17,12 +16,85 @@
'Przejazd techniczny' : 'PT',
};
+
+/********
+ * AJAX *
+ ********/
+
+function Deferred(promise, request) {
+ this.promise = promise;
+ this.request = request;
+}
+Deferred.prototype = {
+ promise: null,
+ request: null,
+ abort: function() {
+ this.request.abort.bind(this.request);
+ return new Deferred(this.promise, this.request);
+ },
+ done: function(func) {
+ return new Deferred(this.promise.then(func.bind(this)), this.request);
+ },
+ fail: function(func) {
+ return new Deferred(this.promise.catch(func.bind(this)), this.request);
+ },
+ always: function(func) {
+ return new Deferred(this.promise.finally(func.bind(this)), this.request);
+ },
+};
+Deferred.all = function(iterable) {
+ return new Deferred(
+ Promise.all(
+ iterable.map(function(x) {
+ return x.promise;
+ })
+ )
+ );
+};
+
+var $ = {
+ timeout: 10000,
+ dataType: 'json',
+ get: function(url, headers) {
+ var self = this;
+ var request = new XMLHttpRequest();
+ var promise = new Promise(function(resolve, reject) {
+ request.open('GET', url, true);
+ if(headers) {
+ Object.keys(headers).forEach(function (header) {
+ request.setRequestHeader(header, headers[header]);
+ });
+ }
+ request.timeout = self.timeout;
+ request.onreadystatechange = function() {
+ if(this.readyState == 4) {
+ if(this.status == 304) {
+ resolve();
+ } else if(this.status == 200) {
+ if(self.dataType === 'json') {
+ resolve(JSON.parse(this.responseText));
+ } else {
+ resolve(this.responseText);
+ }
+ } else {
+ reject(request);
+ }
+ }
+ };
+ request.send();
+ });
+ return new Deferred(promise, request);
+ },
+};
+
+
+/***********
+ * VERSION *
+ ***********/
+
var script_version;
var script_version_xhr;
-var vehicles_info = {};
-
-// Check for website updates
function checkVersion() {
if(script_version_xhr) script_version_xhr.abort();
@@ -46,7 +118,124 @@
setInterval(checkVersion, 3600000);
}
-/* Parsing of received JSON parts */
+/**********
+ * ARRAYS *
+ **********/
+
+function deepMerge(a1, a2) {
+ if(typeof a1 !== 'object' || typeof a2 !== 'object') {
+ return a2;
+ }
+ Object.keys(a2).forEach(function (key) {
+ a1[key] = deepMerge(a1[key], a2[key]);
+ if(a1[key] === null) {
+ delete a1[key];
+ }
+ });
+ return a1;
+}
+
+
+/*******
+ * DOM *
+ *******/
+
+function deleteChildren(element) {
+ while(element.lastChild) element.removeChild(element.lastChild);
+}
+
+function addElementWithText(parent, element, text) {
+ var elem = document.createElement(element);
+ elem.appendChild(document.createTextNode(text));
+ parent.appendChild(elem);
+ return elem;
+}
+
+function addCellWithText(parent, text) {
+ return addElementWithText(parent, 'td', text);
+}
+
+function addParaWithText(parent, text) {
+ return addElementWithText(parent, 'p', text);
+}
+
+function setText(element, text) {
+ deleteChildren(element);
+ element.appendChild(document.createTextNode(text));
+}
+
+
+/*****************
+ * VEHICLES INFO *
+ *****************/
+
+function VehiclesInfo() {
+ this.data = {};
+ this.watchers = [];
+}
+VehiclesInfo.prototype = {
+ update: function () {
+ return $.get(
+ 'https://mpk.jacekk.net/vehicles/'
+ ).done(function(data) {
+ this.data = data;
+ this.watchers.forEach(function(watcher) {
+ watcher(this);
+ });
+ }.bind(this));
+ },
+ addWatcher: function(callback) {
+ this.watchers.push(callback);
+ },
+
+ get: function(vehicleId) {
+ if(!vehicleId) return false;
+ if(typeof this.data[vehicleId] === "undefined") {
+ return false;
+ }
+ return this.data[vehicleId];
+ },
+ getParsed: function (vehicleId) {
+ var vehicle = this.get(vehicleId);
+ if(!vehicle) return false;
+ return {
+ vehicleId: vehicleId,
+ prefix: vehicle['num'].substr(0, 2),
+ id: vehicle['num'].substr(2, 3),
+ num: vehicle['num'],
+ type: vehicle['type'],
+ low: vehicle['low']
+ };
+ },
+ depotIdToVehicleId: function(depotId, typeHelper) {
+ var prop;
+ depotId = depotId.toString();
+ if(typeHelper) {
+ for(prop in this.data) {
+ if(prop.substr(0,1) === typeHelper && this.data[prop]['num'].substr(2) === depotId) {
+ return prop;
+ }
+ }
+ } else {
+ for(prop in this.data) {
+ if(this.data[prop]['num'] === depotId) {
+ return prop;
+ }
+ }
+ }
+ },
+};
+var vehicles_info = new VehiclesInfo();
+
+
+/***********
+ * PARSING *
+ ***********/
+
+function normalizeName(string) {
+ return string.replace('.', '. ').replace(' ', ' ');
+}
+
function parseStatus(status) {
switch(status.status) {
case 'STOPPING':
@@ -64,10 +253,9 @@
}
function parseTime(date, time) {
- var result = new Date(date.getFullYear(), date.getMonth(), date.getDay());
+ var result = new Date(date.getTime());
var time_split = time.split(':');
- result.setHours(time_split[0]);
- result.setMinutes(time_split[1]);
+ result.setHours(time_split[0], time_split[1], 0);
if(result.getTime() - date.getTime() > 72000000) {
result.setTime(result.getTime() - 86400000);
@@ -91,48 +279,6 @@
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(!vehicles_info || !vehicles_info[vehicleId]) {
- return false;
- } else {
- 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']
- };
- }
-}
-
-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;
- }
- }
- }
-}
-
function displayVehicle(vehicleInfo) {
if(!vehicleInfo) return document.createTextNode('');
@@ -140,13 +286,13 @@
span.className = 'vehicleInfo';
var floor_type = '';
- if(vehicleInfo.low == 0) {
+ if(vehicleInfo.low === 0) {
setText(span, lang.high_floor_sign);
floor_type = lang.high_floor;
- } else if(vehicleInfo.low == 1) {
+ } else if(vehicleInfo.low === 1) {
setText(span, lang.partially_low_floor_sign);
floor_type = lang.partially_low_floor;
- } else if(vehicleInfo.low == 2) {
+ } else if(vehicleInfo.low === 2) {
setText(span, lang.low_floor_sign);
floor_type = lang.low_floor;
}
@@ -157,29 +303,4 @@
.replace('$floor', floor_type);
return span;
-}
-
-// Element mangling
-function deleteChildren(element) {
- while(element.lastChild) element.removeChild(element.lastChild);
-}
-
-function addElementWithText(parent, element, text) {
- var elem = document.createElement(element);
- elem.appendChild(document.createTextNode(text));
- parent.appendChild(elem);
- return elem;
-}
-
-function addCellWithText(parent, text) {
- return addElementWithText(parent, 'td', text);
-}
-
-function addParaWithText(parent, text) {
- return addElementWithText(parent, 'p', text);
-}
-
-function setText(element, text) {
- deleteChildren(element);
- element.appendChild(document.createTextNode(text));
}
--
Gitblit v1.9.1