From 9dd2e1123817b7896de3f1c64e81eb89cef0cafc Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Wed, 13 Mar 2019 12:31:13 +0000
Subject: [PATCH] Do not refresh vehicle pathinfo on every ttss_refresh seconds
---
map.js | 699 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 416 insertions(+), 283 deletions(-)
diff --git a/map.js b/map.js
index 8959003..8e78e93 100644
--- a/map.js
+++ b/map.js
@@ -3,6 +3,14 @@
var ttss_refresh = 10000; // 10 seconds
var ttss_position_type = 'CORRECTED';
+var geolocation = null;
+var geolocation_set = 0;
+var geolocation_button = null;
+var geolocation_feature = null;
+var geolocation_accuracy = null;
+var geolocation_source = null;
+var geolocation_layer = null;
+
var trams_xhr = null;
var trams_timer = null;
var trams_last_update = 0;
@@ -18,14 +26,41 @@
var vehicles_info = {};
var stops_xhr = null;
-var stops_buses_source = null;
-var stops_buses_layer = null;
-var stops_trams_source = null;
-var stops_trams_layer = null;
-var stop_points_buses_source = null;
-var stop_points_buses_layer = null;
-var stop_points_trams_source = null;
-var stop_points_trams_layer = null;
+var stops_ignored = ['131'];
+var stops_style = {
+ 'sb': new ol.style.Style({
+ image: new ol.style.Circle({
+ fill: new ol.style.Fill({color: '#07F'}),
+ stroke: new ol.style.Stroke({color: '#05B', width: 2}),
+ radius: 3,
+ }),
+ }),
+ 'st': new ol.style.Style({
+ image: new ol.style.Circle({
+ fill: new ol.style.Fill({color: '#FA0'}),
+ stroke: new ol.style.Stroke({color: '#B70', width: 2}),
+ radius: 3,
+ }),
+ }),
+ 'pb': new ol.style.Style({
+ image: new ol.style.Circle({
+ fill: new ol.style.Fill({color: '#07F'}),
+ stroke: new ol.style.Stroke({color: '#05B', width: 1}),
+ radius: 3,
+ }),
+ }),
+ 'pt': new ol.style.Style({
+ image: new ol.style.Circle({
+ fill: new ol.style.Fill({color: '#FA0'}),
+ stroke: new ol.style.Stroke({color: '#B70', width: 1}),
+ radius: 3,
+ }),
+ }),
+};
+var stops_type = ['st', 'sb', 'pt', 'pb'];
+var stops_mapping = {};
+var stops_source = {};
+var stops_layer = {};
var stop_selected_source = null;
var stop_selected_layer = null;
@@ -33,24 +68,91 @@
var feature_clicked = null;
var feature_xhr = null;
var feature_timer = null;
+var path_xhr = null;
var route_source = null;
var route_layer = null;
var map = null;
-var popup_element = document.getElementById('popup');
-var popup_close_callback;
+
+var panel = null;
+
var fail_element = document.getElementById('fail');
+var fail_text = document.querySelector('#fail span');
var ignore_hashchange = false;
-function fail(msg) {
- setText(fail_element, msg);
- fail_element.style.top = '0.5em';
-}
-function fail_popup(msg) {
- addElementWithText(popup_element, 'p', msg).className = 'error';
+function Panel(element) {
+ this._element = element;
+ this._element.classList.add('panel');
+
+ this._hide = addParaWithText(this._element, '▶');
+ this._hide.title = lang.action_collapse;
+ this._hide.className = 'hide';
+ this._hide.addEventListener('click', this.toggleExpanded.bind(this));
+
+ this._close = addParaWithText(this._element, '×');
+ this._close.title = lang.action_close;
+ this._close.className = 'close';
+ this._close.addEventListener('click', this.close.bind(this));
+
+ this._content = document.createElement('div');
+ this._element.appendChild(this._content);
+};
+Panel.prototype = {
+ _element: null,
+ _hide: null,
+ _close: null,
+ _content: null,
+
+ _closeCallback: null,
+ _runCallback: function() {
+ var callback = this.closeCallback;
+ this.closeCallback = null;
+ if(callback) callback();
+ },
+
+ expand: function() {
+ this._element.classList.add('expanded');
+ setText(this._hide, '▶');
+ this._hide.title = lang.action_collapse;
+ },
+ collapse: function() {
+ this._element.classList.remove('expanded');
+ setText(this._hide, '◀');
+ this._hide.title = lang.action_expand;
+ },
+ toggleExpanded: function() {
+ if(this._element.classList.contains('expanded')) {
+ this.collapse();
+ } else {
+ this.expand();
+ }
+ },
+ fail: function(message) {
+ addParaWithText(this._content, message).className = 'error';
+ },
+ show: function(contents, closeCallback) {
+ this._runCallback();
+ this.closeCallback = closeCallback;
+
+ deleteChildren(this._content);
+
+ this._content.appendChild(contents);
+ this._element.classList.add('enabled');
+ setTimeout(this.expand.bind(this), 1);
+ },
+ close: function() {
+ this._runCallback();
+ this._element.classList.remove('expanded');
+ this._element.classList.remove('enabled');
+ },
+};
+
+function fail(msg) {
+ setText(fail_text, msg);
+ fail_element.style.top = '0.5em';
}
function fail_ajax_generic(data, fnc) {
@@ -71,7 +173,7 @@
}
function fail_ajax_popup(data) {
- fail_ajax_generic(data, fail_popup);
+ fail_ajax_generic(data, panel.fail.bind(panel));
}
function getGeometry(object) {
@@ -118,11 +220,7 @@
function markStops(stops, type, routeStyle) {
stop_selected_source.clear();
- var style = stops_trams_layer.getStyle();
- if(type == 'b') {
- style = stops_buses_layer.getStyle();
- }
- style = style.clone();
+ var style = stops_layer['s'+type].getStyle().clone();
if(routeStyle) {
style.getImage().setRadius(5);
@@ -142,16 +240,7 @@
feature = stops[i];
} else {
prefix = stops[i].substr(0,2);
- feature = null;
- if(prefix == 'sb') {
- feature = stops_buses_source.getFeatureById(stops[i]);
- } else if(prefix == 'st') {
- feature = stops_trams_source.getFeatureById(stops[i]);
- } else if(prefix == 'pb') {
- feature = stop_points_buses_source.getFeatureById(stops[i]);
- } else if(prefix == 'pt') {
- feature = stop_points_trams_source.getFeatureById(stops[i]);
- }
+ feature = stops_source[prefix].getFeatureById(stops[i]);
}
if(feature) {
stop_selected_source.addFeature(feature);
@@ -213,6 +302,7 @@
} else {
vehicle_feature.setProperties(vehicle);
vehicle_feature.getStyle().getImage().setRotation(Math.PI * parseFloat(vehicle.heading ? vehicle.heading : 0) / 180.0);
+ vehicle_feature.getStyle().getText().setText(vehicle.line);
}
}
@@ -280,14 +370,23 @@
return buses_xhr;
}
-function updateStopSource(stops, prefix, source) {
+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];
if(stop.category == 'other') continue;
+ if(stops_ignored.indexOf(stop.shortName) >= 0) continue;
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);
@@ -295,7 +394,7 @@
}
}
-function updateStops(base, suffix, source) {
+function updateStops(base, suffix) {
return $.get(
base + '/geoserviceDispatcher/services/stopinfo/stops'
+ '?left=-648000000'
@@ -303,11 +402,11 @@
+ '&right=648000000'
+ '&top=324000000'
).done(function(data) {
- updateStopSource(data.stops, 's' + suffix, source);
+ updateStopSource(data.stops, 's' + suffix);
}).fail(fail_ajax);
}
-function updateStopPoints(base, suffix, source) {
+function updateStopPoints(base, suffix) {
return $.get(
base + '/geoserviceDispatcher/services/stopinfo/stopPoints'
+ '?left=-648000000'
@@ -315,24 +414,58 @@
+ '&right=648000000'
+ '&top=324000000'
).done(function(data) {
- updateStopSource(data.stopPoints, 'p' + suffix, source);
+ updateStopSource(data.stopPoints, 'p' + suffix);
}).fail(fail_ajax);
}
-function vehicleTable(tripId, table, featureId) {
- if(feature_xhr) feature_xhr.abort();
- if(feature_timer) clearTimeout(feature_timer);
+function vehiclePath(feature, tripId) {
+ if(path_xhr) path_xhr.abort();
+
+ var featureId = feature.getId();
+ var vehicleId = featureId.substr(1);
var url = ttss_trams_base;
if(featureId.startsWith('b')) {
url = ttss_buses_base;
}
- var vehicleId = featureId.substr(1);
+ path_xhr = $.get(
+ url + '/geoserviceDispatcher/services/pathinfo/vehicle'
+ + '?id=' + encodeURIComponent(vehicleId)
+ ).done(function(data) {
+ if(!data || !data.paths || !data.paths[0] || !data.paths[0].wayPoints) return;
+
+ var point = null;
+ var points = [];
+ for(var i = 0; i < data.paths[0].wayPoints.length; i++) {
+ point = data.paths[0].wayPoints[i];
+ points.push(ol.proj.fromLonLat([
+ point.lon / 3600000.0,
+ point.lat / 3600000.0,
+ ]));
+ }
+
+ route_source.addFeature(new ol.Feature({
+ geometry: new ol.geom.LineString(points)
+ }));
+ route_layer.setVisible(true);
+ });
+}
+
+function vehicleTable(feature, table) {
+ if(feature_xhr) feature_xhr.abort();
+ if(feature_timer) clearTimeout(feature_timer);
+
+ var featureId = feature.getId();
+
+ var url = ttss_trams_base;
+ if(featureId.startsWith('b')) {
+ url = ttss_buses_base;
+ }
feature_xhr = $.get(
url + '/services/tripInfo/tripPassages'
- + '?tripId=' + encodeURIComponent(tripId)
+ + '?tripId=' + encodeURIComponent(feature.get('tripId'))
+ '&mode=departure'
).done(function(data) {
if(!data.routeName || !data.directionText) {
@@ -367,31 +500,7 @@
markStops(stopsToMark, featureId.substr(0,1), true);
- feature_timer = setTimeout(function() { vehicleTable(tripId, table, featureId); }, ttss_refresh);
-
- if(!vehicleId) return;
-
- feature_xhr = $.get(
- url + '/geoserviceDispatcher/services/pathinfo/vehicle'
- + '?id=' + encodeURIComponent(vehicleId)
- ).done(function(data) {
- if(!data || !data.paths || !data.paths[0] || !data.paths[0].wayPoints) return;
-
- var point = null;
- var points = [];
- for(var i = 0; i < data.paths[0].wayPoints.length; i++) {
- point = data.paths[0].wayPoints[i];
- points.push(ol.proj.fromLonLat([
- point.lon / 3600000.0,
- point.lat / 3600000.0,
- ]));
- }
-
- route_source.addFeature(new ol.Feature({
- geometry: new ol.geom.LineString(points)
- }));
- route_layer.setVisible(true);
- });
+ feature_timer = setTimeout(function() { vehicleTable(feature, table); }, ttss_refresh);
}).fail(fail_ajax_popup);
}
@@ -453,38 +562,13 @@
}).fail(fail_ajax_popup);
}
-function showPanel(contents, closeCallback) {
- var old_callback = popup_close_callback;
- popup_close_callback = null;
- if(old_callback) old_callback();
- popup_close_callback = closeCallback;
-
- deleteChildren(popup_element);
-
- var close = addParaWithText(popup_element, '×');
- close.className = 'close';
- close.addEventListener('click', function() { hidePanel(); });
-
- popup_element.appendChild(contents);
-
- $(popup_element).addClass('show');
-}
-
-function hidePanel() {
- var old_callback = popup_close_callback;
- popup_close_callback = null;
- if(old_callback) old_callback();
-
- $(popup_element).removeClass('show');
-}
-
function featureClicked(feature) {
if(feature && !feature.getId()) return;
unstyleSelectedFeatures();
if(!feature) {
- hidePanel();
+ panel.close();
return;
}
@@ -501,7 +585,14 @@
table.appendChild(thead);
table.appendChild(tbody);
+ var tabular_data = true;
+
switch(feature.getId().substr(0, 1)) {
+ case 'l':
+ tabular_data = false;
+ type = '';
+ name = lang.type_location;
+ break;
case 't':
case 'b':
type = lang.type_tram;
@@ -522,14 +613,30 @@
addElementWithText(thead, 'th', lang.header_time);
addElementWithText(thead, 'th', lang.header_stop);
- vehicleTable(feature.get('tripId'), tbody, feature.getId());
+ vehicleTable(feature, tbody);
+ vehiclePath(feature);
styleVehicle(feature, true);
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);
@@ -551,15 +658,8 @@
addElementWithText(additional, 'a', lang.departures_for_stop).addEventListener(
'click',
function() {
- var stops_source = stops_trams_source;
- if(feature.getId().startsWith('pb')) {
- stops_source = stops_buses_source;
- }
- featureClicked(stops_source.forEachFeature(function(stop_feature) {
- if(stop_feature.get('shortName') == feature.get('shortName') && stop_feature.getId().substr(1,1) == feature.getId().substr(1,1)) {
- return stop_feature;
- }
- }));
+ var mapping = stops_mapping['s' + feature.getId().substr(1,1)];
+ featureClicked(mapping[feature.get('shortName')]);
}
);
@@ -584,29 +684,146 @@
div.appendChild(additional);
}
- div.appendChild(table);
+ if(tabular_data) {
+ div.appendChild(table);
+ ignore_hashchange = true;
+ window.location.hash = '#!' + feature.getId();
+ }
setTimeout(function () {map.getView().animate({
center: feature.getGeometry().getCoordinates(),
}) }, 10);
- ignore_hashchange = true;
- window.location.hash = '#!' + feature.getId();
- showPanel(div, function() {
+ panel.show(div, function() {
if(!ignore_hashchange) {
ignore_hashchange = true;
window.location.hash = '';
- feature_clicked = null;
unstyleSelectedFeatures();
+ feature_clicked = null;
+ if(path_xhr) path_xhr.abort();
if(feature_xhr) feature_xhr.abort();
if(feature_timer) clearTimeout(feature_timer);
}
});
feature_clicked = feature;
+}
+
+function mapClicked(e) {
+ var point = e.coordinate;
+ var features = [];
+ map.forEachFeatureAtPixel(e.pixel, function(feature, layer) {
+ if(layer == stop_selected_layer) return;
+ if(feature.getId()) features.push(feature);
+ });
+
+ if(features.length > 1) {
+ featureClicked();
+
+ var div = document.createElement('div');
+
+ addParaWithText(div, lang.select_feature);
+
+ for(var i = 0; i < features.length; i++) {
+ var feature = features[i];
+
+ var p = document.createElement('p');
+ var a = document.createElement('a');
+ p.appendChild(a);
+ a.addEventListener('click', function(feature) { return function() {
+ featureClicked(feature);
+ }}(feature));
+
+ var type = '';
+ switch(feature.getId().substr(0, 1)) {
+ case 'l':
+ type = '';
+ name = lang.type_location;
+ break;
+ case 't':
+ case 'b':
+ 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_tram;
+ if(feature.getId().startsWith('sb')) {
+ type = lang.type_stop_bus;
+ }
+ break;
+ case 'p':
+ type = lang.type_stoppoint_tram;
+ if(feature.getId().startsWith('pb')) {
+ type = lang.type_stoppoint_bus;
+ }
+ break;
+ }
+
+ addElementWithText(a, 'span', type).className = 'small';
+ a.appendChild(document.createTextNode(' '));
+ addElementWithText(a, 'span', feature.get('name'));
+
+ div.appendChild(p);
+ }
+
+ panel.show(div);
+
+ return;
+ }
+
+ var feature = features[0];
+ if(!feature) {
+ stops_type.forEach(function(type) {
+ if(stops_layer[type].getVisible()) {
+ feature = returnClosest(point, feature, stops_source[type].getClosestFeatureToCoordinate(point));
+ }
+ });
+ if(trams_layer.getVisible()) {
+ feature = returnClosest(point, feature, trams_source.getClosestFeatureToCoordinate(point));
+ }
+ if(buses_layer.getVisible()) {
+ feature = returnClosest(point, feature, buses_source.getClosestFeatureToCoordinate(point));
+ }
+
+ if(getDistance(point, feature) > map.getView().getResolution() * 20) {
+ feature = null;
+ }
+ }
+
+ featureClicked(feature);
+}
+
+function trackingStop() {
+ geolocation_button.classList.remove('clicked');
+ geolocation.setTracking(false);
+
+ geolocation_source.clear();
+}
+function trackingStart() {
+ geolocation_set = 0;
+ geolocation_button.classList.add('clicked');
+ geolocation_feature.setGeometry(new ol.geom.Point(map.getView().getCenter()));
+ geolocation_accuracy.setGeometry(new ol.geom.Circle(map.getView().getCenter(), 100000));
+
+ geolocation_source.addFeature(geolocation_feature);
+ geolocation_source.addFeature(geolocation_accuracy);
+
+ geolocation.setTracking(true);
+}
+function trackingToggle() {
+ if(geolocation.getTracking()) {
+ trackingStop();
+ } else {
+ trackingStart();
+ }
}
function hash() {
@@ -644,15 +861,7 @@
feature = trams_source.getFeatureById(vehicleId);
}
} else if(stopId) {
- if(stopId.startsWith('st')) {
- feature = stops_trams_source.getFeatureById(stopId);
- } else if(stopId.startsWith('sb')) {
- feature = stops_buses_source.getFeatureById(stopId);
- } else if(stopId.startsWith('pt')) {
- feature = stop_points_trams_source.getFeatureById(stopId);
- } else if(stopId.startsWith('pb')) {
- feature = stop_points_buses_source.getFeatureById(stopId);
- }
+ feature = stops_source[stopId.substr(0,2)].getFeatureById(stopId);
}
featureClicked(feature);
@@ -675,7 +884,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() {
@@ -689,66 +898,18 @@
timeout: 10000,
});
- stops_buses_source = new ol.source.Vector({
- features: [],
- });
- stops_buses_layer = new ol.layer.Vector({
- source: stops_buses_source,
- renderMode: 'image',
- style: new ol.style.Style({
- image: new ol.style.Circle({
- fill: new ol.style.Fill({color: '#07F'}),
- stroke: new ol.style.Stroke({color: '#05B', width: 1}),
- radius: 3,
- }),
- }),
- });
+ panel = new Panel(document.getElementById('panel'));
- stops_trams_source = new ol.source.Vector({
- features: [],
- });
- stops_trams_layer = new ol.layer.Vector({
- source: stops_trams_source,
- renderMode: 'image',
- style: new ol.style.Style({
- image: new ol.style.Circle({
- fill: new ol.style.Fill({color: '#FA0'}),
- stroke: new ol.style.Stroke({color: '#B70', width: 1}),
- radius: 3,
- }),
- }),
- });
-
- stop_points_buses_source = new ol.source.Vector({
- features: [],
- });
- stop_points_buses_layer = new ol.layer.Vector({
- source: stop_points_buses_source,
- renderMode: 'image',
- visible: false,
- style: new ol.style.Style({
- image: new ol.style.Circle({
- fill: new ol.style.Fill({color: '#07F'}),
- stroke: new ol.style.Stroke({color: '#05B', width: 2}),
- radius: 3,
- }),
- }),
- });
-
- stop_points_trams_source = new ol.source.Vector({
- features: [],
- });
- stop_points_trams_layer = new ol.layer.Vector({
- source: stop_points_trams_source,
- renderMode: 'image',
- visible: false,
- style: new ol.style.Style({
- image: new ol.style.Circle({
- fill: new ol.style.Fill({color: '#FA0'}),
- stroke: new ol.style.Stroke({color: '#B70', width: 2}),
- radius: 3,
- }),
- }),
+ stops_type.forEach(function(type) {
+ stops_source[type] = new ol.source.Vector({
+ features: [],
+ });
+ stops_layer[type] = new ol.layer.Vector({
+ source: stops_source[type],
+ renderMode: 'image',
+ style: stops_style[type],
+ });
+ stops_mapping[type] = {};
});
stop_selected_source = new ol.source.Vector({
@@ -783,24 +944,77 @@
}),
});
+ ol.style.IconImageCache.shared.setSize(512);
+
+ geolocation_feature = new ol.Feature({
+ name: '',
+ style: new ol.style.Style({
+ image: new ol.style.Circle({
+ fill: new ol.style.Fill({color: '#39C'}),
+ stroke: new ol.style.Stroke({color: '#FFF', width: 2}),
+ radius: 5,
+ }),
+ }),
+ });
+ geolocation_feature.setId('location_point');
+ geolocation_accuracy = new ol.Feature();
+ geolocation_source = new ol.source.Vector({
+ features: [],
+ });
+ geolocation_layer = new ol.layer.Vector({
+ source: geolocation_source,
+ });
+ geolocation_button = document.querySelector('#track button');
+ if(!navigator.geolocation) {
+ geolocation_button.classList.add('hidden');
+ }
+
+ geolocation = new ol.Geolocation({projection: 'EPSG:3857'});
+ geolocation.on('change:position', function() {
+ var coordinates = geolocation.getPosition();
+ geolocation_feature.setGeometry(coordinates ? new ol.geom.Point(coordinates) : null);
+ if(geolocation_set < 1) {
+ geolocation_set = 1;
+ map.getView().animate({
+ center: coordinates,
+ })
+ }
+ });
+ geolocation.on('change:accuracyGeometry', function() {
+ var accuracy = geolocation.getAccuracyGeometry();
+ geolocation_accuracy.setGeometry(accuracy);
+ if(geolocation_set < 2) {
+ geolocation_set = 2;
+ map.getView().fit(accuracy);
+ }
+ });
+ geolocation.on('error', function(error) {
+ fail(lang.error_location + ' ' + error.message);
+ trackingStop();
+ geolocation_button.classList.add('hidden');
+ });
+ geolocation_button.addEventListener('click', trackingToggle);
+
map = new ol.Map({
target: 'map',
layers: [
new ol.layer.Tile({
- source: new ol.source.OSM()
+ source: new ol.source.OSM(),
}),
route_layer,
- stops_buses_layer,
- stops_trams_layer,
- stop_points_buses_layer,
- stop_points_trams_layer,
+ geolocation_layer,
+ stops_layer['st'],
+ stops_layer['sb'],
+ stops_layer['pt'],
+ stops_layer['pb'],
stop_selected_layer,
buses_layer,
trams_layer,
],
view: new ol.View({
center: ol.proj.fromLonLat([19.94, 50.06]),
- zoom: 14
+ zoom: 14,
+ maxZoom: 19,
}),
controls: ol.control.defaults({
attributionOptions: ({
@@ -812,103 +1026,16 @@
}),
new ol.control.Control({
element: fail_element,
- })
+ }),
+ new ol.control.Control({
+ element: document.getElementById('track'),
+ }),
]),
loadTilesWhileAnimating: false,
});
// Display popup on click
- map.on('singleclick', function(e) {
- var point = e.coordinate;
- var features = [];
- map.forEachFeatureAtPixel(e.pixel, function(feature, layer) {
- if(layer == stop_selected_layer) return;
- if(feature.getId()) features.push(feature);
- });
-
- if(features.length > 1) {
- featureClicked();
-
- var div = document.createElement('div');
-
- addParaWithText(div, lang.select_feature);
-
- for(var i = 0; i < features.length; i++) {
- var feature = features[i];
-
- var p = document.createElement('p');
- var a = document.createElement('a');
- p.appendChild(a);
- a.addEventListener('click', function(feature) { return function() {
- featureClicked(feature);
- }}(feature));
-
- var type = '';
- switch(feature.getId().substr(0, 1)) {
- case 't':
- case 'b':
- 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_tram;
- if(feature.getId().startsWith('sb')) {
- type = lang.type_stop_bus;
- }
- break;
- case 'p':
- type = lang.type_stoppoint_tram;
- if(feature.getId().startsWith('pb')) {
- type = lang.type_stoppoint_bus;
- }
- break;
- }
-
- addElementWithText(a, 'span', type).className = 'small';
- a.appendChild(document.createTextNode(' '));
- addElementWithText(a, 'span', feature.get('name'));
-
- div.appendChild(p);
- }
-
- showPanel(div);
-
- return;
- }
-
- var feature = features[0];
- if(!feature) {
- if(stops_buses_layer.getVisible()) {
- feature = returnClosest(point, feature, stops_buses_source.getClosestFeatureToCoordinate(point));
- }
- if(stops_trams_layer.getVisible()) {
- feature = returnClosest(point, feature, stops_trams_source.getClosestFeatureToCoordinate(point));
- }
- if(stop_points_buses_layer.getVisible()) {
- feature = returnClosest(point, feature, stop_points_buses_source.getClosestFeatureToCoordinate(point));
- }
- if(stop_points_trams_layer.getVisible()) {
- feature = returnClosest(point, feature, stop_points_trams_source.getClosestFeatureToCoordinate(point));
- }
- if(trams_layer.getVisible()) {
- feature = returnClosest(point, feature, trams_source.getClosestFeatureToCoordinate(point));
- }
- if(buses_layer.getVisible()) {
- feature = returnClosest(point, feature, buses_source.getClosestFeatureToCoordinate(point));
- }
-
- if(getDistance(point, feature) > map.getView().getResolution() * 20) {
- feature = null;
- }
- }
-
- featureClicked(feature);
- });
+ map.on('singleclick', mapClicked);
fail_element.addEventListener('click', function() {
fail_element.style.top = '-10em';
@@ -922,19 +1049,25 @@
});
// Change layer visibility on zoom
- map.getView().on('change:resolution', function(e) {
- stop_points_buses_layer.setVisible(map.getView().getZoom() >= 16);
- stop_points_trams_layer.setVisible(map.getView().getZoom() >= 16);
- });
+ var change_resolution = function(e) {
+ stops_type.forEach(function(type) {
+ if(type.startsWith('p')) {
+ stops_layer[type].setVisible(map.getView().getZoom() >= 16);
+ stops_layer[type].setVisible(map.getView().getZoom() >= 16);
+ }
+ });
+ };
+ map.getView().on('change:resolution', change_resolution);
+ change_resolution();
$.when(
updateVehicleInfo(),
updateTrams(),
updateBuses(),
- updateStops(ttss_trams_base, 't', stops_trams_source),
- updateStops(ttss_buses_base, 'b', stops_buses_source),
- updateStopPoints(ttss_trams_base, 't', stop_points_trams_source),
- updateStopPoints(ttss_buses_base, 'b', stop_points_buses_source),
+ updateStops(ttss_trams_base, 't'),
+ updateStops(ttss_buses_base, 'b'),
+ updateStopPoints(ttss_trams_base, 't'),
+ updateStopPoints(ttss_buses_base, 'b'),
).done(function() {
hash();
});
--
Gitblit v1.9.1