From b1632819ee6d2f5f01724d9ef2f69ced5f1c221e Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Tue, 18 Dec 2018 10:06:28 +0000
Subject: [PATCH] Fix tramIdToVehicleId translation using vehicles_info variable
---
map.js | 3 +--
common.js | 10 +++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/common.js b/common.js
index f4afeef..59b8a10 100644
--- a/common.js
+++ b/common.js
@@ -7,7 +7,7 @@
var script_version;
var script_version_xhr;
-var vehicles_info;
+var vehicles_info = {};
// Check for website updates
function checkVersion() {
@@ -105,10 +105,10 @@
}
function tramIdToVehicleId(tramId) {
- if(0 <= tramId && tramId <= 999) {
- var vehicleId = '0000' + (tramId + 736);
- vehicleId = vehicleId.substr(vehicleId.length - 4)
- return '635218529567218' + vehicleId;
+ for(var prop in vehicles_info) {
+ if(vehicles_info[prop]['num'].substr(2) == tramId) {
+ return prop;
+ }
}
}
diff --git a/map.js b/map.js
index 3b0cde2..16510c2 100644
--- a/map.js
+++ b/map.js
@@ -732,9 +732,8 @@
stop_points_layer.setVisible(map.getView().getZoom() >= 16);
});
- updateVehicleInfo()
-
$.when(
+ updateVehicleInfo(),
updateVehicles(),
updateStops(),
updateStopPoints()
--
Gitblit v1.9.1