From d80109132d362199e6d9e370d5f54bd0d6554126 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Thu, 29 Jul 2021 22:40:29 +0000
Subject: [PATCH] [map] Allow zero-prefixed stop identifiers (fix for bus stops)

---
 common.js |  363 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 250 insertions(+), 113 deletions(-)

diff --git a/common.js b/common.js
index 89a8a60..af26776 100644
--- a/common.js
+++ b/common.js
@@ -1,13 +1,100 @@
-// 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) {
+	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;
 
-// Check for website updates
 function checkVersion() {
 	if(script_version_xhr) script_version_xhr.abort();
 	
@@ -31,119 +118,28 @@
 	setInterval(checkVersion, 3600000);
 }
 
-// Webservice-related functions
-function parseVehicle(vehicleId) {
-	if(!vehicleId) return false;
-	if(vehicleId.substr(0, 15) != '635218529567218') {
-		console.log('Unknown vehicle, vehicleId=' + vehicleId);
-		return false;
+/**********
+ * ARRAYS *
+ **********/
+
+function deepMerge(a1, a2) {
+	if(typeof a1 !== 'object' || typeof a2 !== 'object') {
+		return a2;
 	}
-	
-	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;
-	}
-	
-	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';
+	Object.keys(a2).forEach(function (key) {
+		a1[key] = deepMerge(a1[key], a2[key]);
+		if(a1[key] === null) {
+			delete a1[key];
 		}
-	} 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 || id == 323) {
-			type = 'GT8C'
-			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 = 0;
-		
-		if((451 <= id && id <= 456) || id == 459 || id == 460 || id == 462) {
-			type = 'N8C-NF';
-			low = 1;
-		}
-	} 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;
-	}
-	
-	return {
-		vehicleId: vehicleId,
-		prefix: prefix,
-		id: id,
-		num: prefix + id,
-		type: type,
-		low: low
-	};
+	});
+	return a1;
 }
 
-function tramIdToVehicleId(tramId) {
-	if(0 <= tramId && tramId <= 999) {
-		var vehicleId = '0000' + (tramId + 736);
-		vehicleId = vehicleId.substr(vehicleId.length - 4)
-		return '635218529567218' + vehicleId;
-	}
-}
 
-// Element mangling
+/*******
+ * DOM *
+ *******/
+
 function deleteChildren(element) {
 	while(element.lastChild) element.removeChild(element.lastChild);
 }
@@ -167,3 +163,144 @@
 	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':
+		case 'PREDICTED':
+			if(status.actualRelativeTime <= 0)
+				return lang.boarding_sign;
+			if(status.actualRelativeTime >= 60)
+				return lang.time_minutes_prefix + Math.floor(status.actualRelativeTime / 60) + lang.time_minutes_suffix;
+			return lang.time_seconds_prefix + status.actualRelativeTime + lang.time_seconds_suffix;
+		case 'DEPARTED':
+			return lang.time_minutes_ago_prefix + Math.floor(-status.actualRelativeTime / 60) + lang.time_minutes_ago_suffix;
+		default:
+			return status.mixedTime;
+	}
+}
+
+function parseTime(date, time) {
+	var result = new Date(date.getTime());
+	var time_split = time.split(':');
+	result.setHours(time_split[0], time_split[1], 0);
+	
+	if(result.getTime() - date.getTime() > 72000000) {
+		result.setTime(result.getTime() - 86400000);
+	}
+	
+	if(date.getTime() - result.getTime() > 72000000) {
+		result.setTime(result.getTime() + 86400000);
+	}
+	
+	return result;
+}
+
+function parseDelay(status) {
+	if(!status.actualTime) return lang.unknown_sign;
+	if(!status.plannedTime) return lang.unknown_sign;
+	
+	var now = new Date();
+	var actual = parseTime(now, status.actualTime);
+	var planned = parseTime(now, status.plannedTime);
+	
+	return lang.time_minutes_prefix + ((actual.getTime() - planned.getTime()) / 1000 / 60) + lang.time_minutes_suffix;
+}
+
+function displayVehicle(vehicleInfo) {
+	if(!vehicleInfo) return document.createTextNode('');
+	
+	var span = document.createElement('span');
+	span.className = 'vehicleInfo';
+	
+	var floor_type = '';
+	if(vehicleInfo.low === 0) {
+		setText(span, lang.high_floor_sign);
+		floor_type = lang.high_floor;
+	} else if(vehicleInfo.low === 1) {
+		setText(span, lang.partially_low_floor_sign);
+		floor_type = lang.partially_low_floor;
+	} else if(vehicleInfo.low === 2) {
+		setText(span, lang.low_floor_sign);
+		floor_type = lang.low_floor;
+	}
+	
+	span.title = lang.tram_type_pattern
+		.replace('$num', vehicleInfo.num)
+		.replace('$type', vehicleInfo.type)
+		.replace('$floor', floor_type);
+	
+	return span;
+}

--
Gitblit v1.9.1