From 9155810509e9cda6e0d696ae791d606222d761ff Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sat, 13 Jul 2019 20:23:55 +0000
Subject: [PATCH] Add stops "Brzegi Użytek Ekologiczny (nż)" and "Orzeszkowej"
---
common.js | 161 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 121 insertions(+), 40 deletions(-)
diff --git a/common.js b/common.js
index f238013..4c7b840 100644
--- a/common.js
+++ b/common.js
@@ -1,11 +1,13 @@
-"use strict";
+'use strict';
-//var ttss_trams_base = 'http://www.ttss.krakow.pl/internetservice';
-var ttss_trams_base = 'proxy_tram.php';
-//var ttss_buses_base = 'http://91.223.13.70/internetservice';
-var ttss_buses_base = 'proxy_bus.php';
+var ttss_urls = {
+ t: 'proxy_tram.php',
+ // t: 'http://www.ttss.krakow.pl/internetservice',
+ b: 'proxy_bus.php',
+ // 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',
@@ -14,12 +16,80 @@
'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), this.request);
+ },
+ fail: function(func) {
+ return new Deferred(this.promise.catch(func), this.request);
+ },
+ always: function(func) {
+ return new Deferred(this.promise.finally(func), 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) {
+ var self = this;
+ var request = new XMLHttpRequest();
+ var promise = new Promise(function(resolve, reject) {
+ request.open('GET', url, true);
+ 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.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();
@@ -43,7 +113,44 @@
setInterval(checkVersion, 3600000);
}
-/* Parsing of received JSON parts */
+
+/*******
+ * 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));
+}
+
+
+/***********
+ * PARSING *
+ ***********/
+
+function normalizeName(string) {
+ return string.replace('.', '. ').replace(' ', ' ');
+}
+
function parseStatus(status) {
switch(status.status) {
case 'STOPPING':
@@ -61,10 +168,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);
@@ -88,7 +194,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]) {
@@ -115,14 +220,15 @@
}
function depotIdToVehicleId(depotId, typeHelper) {
+ var prop;
if(typeHelper) {
- for(var prop in vehicles_info) {
- if(prop.substr(0,1) == type && vehicles_info[prop]['num'].substr(2) == depotId) {
+ for(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) {
+ for(prop in vehicles_info) {
if(vehicles_info[prop]['num'] == depotId) {
return prop;
}
@@ -154,29 +260,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