From 7698583a2b774b68ef1a24f87023c8385d671f9f Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Thu, 13 Jun 2019 18:55:17 +0000
Subject: [PATCH] Factor out common section out of proxy_bus.php and proxy_tram.php

---
 common.js |  175 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 136 insertions(+), 39 deletions(-)

diff --git a/common.js b/common.js
index 59b8a10..c1fceeb 100644
--- a/common.js
+++ b/common.js
@@ -1,15 +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://ttss.mpk.krakow.pl/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;
 
 var vehicles_info = {};
 
-// Check for website updates
 function checkVersion() {
 	if(script_version_xhr) script_version_xhr.abort();
 	
@@ -33,7 +110,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':
@@ -78,7 +192,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]) {
@@ -104,10 +217,19 @@
 	});
 }
 
-function tramIdToVehicleId(tramId) {
-	for(var prop in vehicles_info) {
-		if(vehicles_info[prop]['num'].substr(2) == tramId) {
-			return prop;
+function depotIdToVehicleId(depotId, typeHelper) {
+	var prop;
+	if(typeHelper) {
+		for(prop in vehicles_info) {
+			if(prop.substr(0,1) == typeHelper && vehicles_info[prop]['num'].substr(2) == depotId) {
+				return prop;
+			}
+		}
+	} else {
+		for(prop in vehicles_info) {
+			if(vehicles_info[prop]['num'] == depotId) {
+				return prop;
+			}
 		}
 	}
 }
@@ -119,13 +241,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;
 	}
@@ -136,29 +258,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