From 1b7c528d8491bc362eabe2ff49f7cff60d76a2e4 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Wed, 13 Mar 2019 00:03:41 +0000
Subject: [PATCH] Allow switching between tram and bus stop
---
map.js | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/map.js b/map.js
index 4640626..089a952 100644
--- a/map.js
+++ b/map.js
@@ -58,6 +58,7 @@
}),
};
var stops_type = ['st', 'sb', 'pt', 'pb'];
+var stops_mapping = {};
var stops_source = {};
var stops_layer = {};
@@ -369,6 +370,7 @@
function updateStopSource(stops, prefix) {
var source = stops_source[prefix];
+ var mapping = stops_mapping[prefix];
for(var i = 0; i < stops.length; i++) {
var stop = stops[i];
@@ -378,6 +380,12 @@
stop.geometry = getGeometry(stop);
var stop_feature = new ol.Feature(stop);
+ if(prefix.startsWith('p')) {
+ mapping[stop.stopPoint] = stop_feature;
+ } else {
+ mapping[stop.shortName] = stop_feature;
+ }
+
stop_feature.setId(prefix + stop.id);
source.addFeature(stop_feature);
@@ -599,8 +607,23 @@
break;
case 's':
type = lang.type_stop_tram;
+ var second_type = lang.departures_for_buses;
+ var mapping = stops_mapping['sb'];
if(feature.getId().startsWith('sb')) {
type = lang.type_stop_bus;
+ second_type = lang.departures_for_trams;
+ mapping = stops_mapping['st'];
+ }
+
+ if(mapping[feature.get('shortName')]) {
+ additional = document.createElement('p');
+ additional.className = 'small';
+ addElementWithText(additional, 'a', second_type).addEventListener(
+ 'click',
+ function() {
+ featureClicked(mapping[feature.get('shortName')]);
+ }
+ );
}
addElementWithText(thead, 'th', lang.header_line);
@@ -622,12 +645,8 @@
addElementWithText(additional, 'a', lang.departures_for_stop).addEventListener(
'click',
function() {
- var source = stops_source['s' + feature.getId().substr(1,1)];
- featureClicked(source.forEachFeature(function(stop_feature) {
- if(stop_feature.get('shortName') == feature.get('shortName')) {
- return stop_feature;
- }
- }));
+ var mapping = stops_mapping['s' + feature.getId().substr(1,1)];
+ featureClicked(mapping[feature.get('shortName')]);
}
);
@@ -851,7 +870,7 @@
if(!f1) return f2;
if(!f2) return f1;
- return (getDistance(point, f1) < getDistance(point, f2)) ? f1 : f2;
+ return (getDistance(point, f1) <= getDistance(point, f2)) ? f1 : f2;
}
function init() {
@@ -876,6 +895,7 @@
renderMode: 'image',
style: stops_style[type],
});
+ stops_mapping[type] = {};
});
stop_selected_source = new ol.source.Vector({
--
Gitblit v1.10.0