From f0bae098106cc2f7dcd103f472e1562cdc829620 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Tue, 18 Dec 2018 09:55:15 +0000
Subject: [PATCH] Use a webservice to gather vehicle numbers and types
---
index.js | 2
map.js | 13 +++-
common.js | 125 +++++++----------------------------------
proxy.php | 2
4 files changed, 35 insertions(+), 107 deletions(-)
diff --git a/common.js b/common.js
index a22a086..f4afeef 100644
--- a/common.js
+++ b/common.js
@@ -7,6 +7,8 @@
var script_version;
var script_version_xhr;
+var vehicles_info;
+
// Check for website updates
function checkVersion() {
if(script_version_xhr) script_version_xhr.abort();
@@ -79,108 +81,27 @@
// 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 updateVehicleInfo() {
+ return $.get(
+ 'https://mpk.jacekk.net/vehicles/'
+ ).done(function(data) {
+ vehicles_info = data;
+ });
}
function tramIdToVehicleId(tramId) {
@@ -198,13 +119,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;
}
diff --git a/index.js b/index.js
index c21eff0..8780766 100644
--- a/index.js
+++ b/index.js
@@ -402,6 +402,8 @@
setText(vehicle_data_style, '.vehicleData { display: table-cell; }')
});
+ updateVehicleInfo()
+
hash();
window.addEventListener('hashchange', hash);
diff --git a/map.js b/map.js
index ee37cd9..3b0cde2 100644
--- a/map.js
+++ b/map.js
@@ -7,6 +7,7 @@
var vehicles_last_update = 0;
var vehicles_source = null;
var vehicles_layer = null;
+var vehicles_info = {};
var stops_xhr = null;
var stops_source = null;
@@ -68,13 +69,13 @@
var color_type = 'black';
if(vehicle.get('vehicle_type')) {
switch(vehicle.get('vehicle_type').low) {
- case 0:
+ case '0':
color_type = 'orange';
break;
- case 1:
+ case '1':
color_type = 'blue';
break;
- case 2:
+ case '2':
color_type = 'green';
break;
}
@@ -427,6 +428,8 @@
additional = document.createElement('p');
if(span.title) {
setText(additional, span.title);
+ } else {
+ setText(additional, feature.getId());
}
additional.insertBefore(span, additional.firstChild);
@@ -716,7 +719,7 @@
fail_element.addEventListener('click', function() {
fail_element.style.top = '-10em';
});
-
+
// Change mouse cursor when over marker
map.on('pointermove', function(e) {
var hit = map.hasFeatureAtPixel(e.pixel);
@@ -729,6 +732,8 @@
stop_points_layer.setVisible(map.getView().getZoom() >= 16);
});
+ updateVehicleInfo()
+
$.when(
updateVehicles(),
updateStops(),
diff --git a/proxy.php b/proxy.php
index f24d447..e764cb6 100644
--- a/proxy.php
+++ b/proxy.php
@@ -65,7 +65,7 @@
],
'/geoserviceDispatcher/services/vehicleinfo/vehicles' => [
'lastUpdate' => 'ctype_digit',
- 'positionType' => function($type) { return in_array($type, ['CORRECTED']); },
+ 'positionType' => function($type) { return in_array($type, ['RAW', 'CORRECTED']); },
'colorType' => function($type) { return in_array($type, ['ROUTE_BASED']); },
],
];
--
Gitblit v1.9.1