From a830993fed93fd4d700c26f3bf8158fa4c0db68e Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Thu, 31 Jan 2019 10:38:41 +0000
Subject: [PATCH] Add feature type (bus/tram stop) to the headers and listings
---
map.js | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/map.js b/map.js
index b31d688..737a1f8 100644
--- a/map.js
+++ b/map.js
@@ -506,7 +506,10 @@
switch(feature.getId().substr(0, 1)) {
case 't':
case 'b':
- type = lang.type_vehicle;
+ type = lang.type_tram;
+ if(feature.getId().startsWith('b')) {
+ type = lang.type_bus;
+ }
var span = displayVehicle(feature.get('vehicle_type'));
@@ -524,7 +527,10 @@
vehicleTable(feature.get('tripId'), tbody, feature.getId());
break;
case 's':
- type = lang.type_stop;
+ type = lang.type_stop_tram;
+ if(feature.getId().startsWith('sb')) {
+ type = lang.type_stop_bus;
+ }
addElementWithText(thead, 'th', lang.header_line);
addElementWithText(thead, 'th', lang.header_direction);
@@ -534,7 +540,10 @@
stopTable('stop', feature.get('shortName'), tbody, feature.getId());
break;
case 'p':
- type = lang.type_stoppoint;
+ type = lang.type_stoppoint_tram;
+ if(feature.getId().startsWith('pb')) {
+ type = lang.type_stoppoint_bus;
+ }
additional = document.createElement('p');
additional.className = 'small';
@@ -542,7 +551,7 @@
'click',
function() {
featureClicked(stops_source.forEachFeature(function(stop_feature) {
- if(stop_feature.get('shortName') == feature.get('shortName')) {
+ if(stop_feature.get('shortName') == feature.get('shortName') && stop_feature.getId().substr(1,1) == feature.getId().substr(1,1)) {
return stop_feature;
}
}));
@@ -773,16 +782,25 @@
switch(feature.getId().substr(0, 1)) {
case 't':
case 'b':
- type = lang.type_vehicle;
+ type = lang.type_tram;
+ if(feature.getId().startsWith('b')) {
+ type = lang.type_bus;
+ }
if(feature.get('vehicle_type').num) {
type += ' ' + feature.get('vehicle_type').num;
}
break;
case 's':
- type = lang.type_stop;
+ type = lang.type_stop_tram;
+ if(feature.getId().startsWith('sb')) {
+ type = lang.type_stop_bus;
+ }
break;
case 'p':
- type = lang.type_stoppoint;
+ type = lang.type_stoppoint_tram;
+ if(feature.getId().startsWith('pb')) {
+ type = lang.type_stoppoint_bus;
+ }
break;
}
--
Gitblit v1.9.1