From d87cf076349d354b829bfe896ef11247b1182dd9 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sat, 04 May 2019 12:46:08 +0000
Subject: [PATCH] Use number of matched query chars when ordering stop search results
---
map.js | 1010 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 606 insertions(+), 404 deletions(-)
diff --git a/map.js b/map.js
index 0c553fb..c6f8bdc 100644
--- a/map.js
+++ b/map.js
@@ -1,49 +1,159 @@
-//var ttss_base = 'http://www.ttss.krakow.pl/internetservice';
-var ttss_base = 'proxy.php';
-var ttss_refresh = 10000; // 10 seconds
+"use strict";
-var vehicles_xhr = null;
-var vehicles_timer = null;
-var vehicles_last_update = 0;
-var vehicles_source = null;
-var vehicles_layer = null;
+var ttss_refresh = 10000; // 10 seconds
+var ttss_position_type = 'RAW';
+
+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 vehicles_xhr = {};
+var vehicles_timer = {};
+var vehicles_last_update = {};
+var vehicles_source = {};
+var vehicles_layer = {};
+
+var vehicles_info = {};
var stops_xhr = null;
-var stops_source = null;
-var stops_layer = null;
-var stop_points_source = null;
-var stop_points_layer = null;
+var stops_ignored = ['131', '744'];
+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;
var feature_clicked = null;
-var feature_selected = [];
var feature_xhr = null;
var feature_timer = null;
+var path_xhr = null;
var route_source = null;
var route_layer = null;
var map = null;
-var map_sphere = 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) {
// abort() is not a failure
- if(data.readyState == 0 && data.statusText == 'abort') return;
+ if(data.readyState === 0) return;
- if(data.status == 0) {
+ if(data.status === 0) {
fnc(lang.error_request_failed_connectivity, data);
} else if (data.statusText) {
fnc(lang.error_request_failed_status.replace('$status', data.statusText), data);
@@ -57,7 +167,7 @@
}
function fail_ajax_popup(data) {
- fail_ajax_generic(data, fail_popup);
+ fail_ajax_generic(data, panel.fail.bind(panel));
}
function getGeometry(object) {
@@ -72,104 +182,93 @@
color_type = 'orange';
break;
case 1:
- color_type = 'blue';
- break;
case 2:
color_type = 'green';
break;
}
}
- var fill = (selected ? '#a00' : '#3399ff');
+ var fill = '#B70';
+ if(vehicle.getId().startsWith('b')) {
+ fill = '#05B';
+ }
+ if(selected) {
+ fill = '#292';
+ }
- var image = '<svg xmlns="http://www.w3.org/2000/svg" height="30" width="20"><polygon points="10,0 20,23 0,23" style="fill:'+fill+';stroke:'+color_type+';stroke-width:2" /></svg>';
+ var image = '<svg xmlns="http://www.w3.org/2000/svg" height="30" width="20"><polygon points="10,0 20,23 0,23" style="fill:'+fill+';stroke:'+color_type+';stroke-width:3" /></svg>';
- return new ol.style.Style({
+ vehicle.setStyle(new ol.style.Style({
image: new ol.style.Icon({
src: 'data:image/svg+xml;base64,' + btoa(image),
- rotation: Math.PI * parseFloat(vehicle.get('heading')) / 180.0,
+ rotation: Math.PI * parseFloat(vehicle.get('heading') ? vehicle.get('heading') : 0) / 180.0,
}),
text: new ol.style.Text({
font: 'bold 10px sans-serif',
text: vehicle.get('line'),
fill: new ol.style.Fill({color: 'white'}),
}),
- });
+ }));
}
-function styleStop(stop, selected) {
- var fill = 'orange';
- var stroke = 'red';
- var stroke_width = 1;
- var radius = 3;
+function markStops(stops, ttss_type, routeStyle) {
+ stop_selected_source.clear();
- if(selected == 2) {
- radius = 5;
- } else if(selected) {
- fill = 'red';
- stroke = '#900';
- stroke_width = 2;
- radius = 5;
+ var style = stops_layer['s' + ttss_type].getStyle().clone();
+
+ if(routeStyle) {
+ style.getImage().setRadius(5);
+ } else {
+ style.getImage().getStroke().setWidth(2);
+ style.getImage().getStroke().setColor('#F00');
+ style.getImage().setRadius(5);
}
- return new ol.style.Style({
- image: new ol.style.Circle({
- fill: new ol.style.Fill({color: fill}),
- stroke: new ol.style.Stroke({color: stroke, width: stroke_width}),
- radius: radius,
- }),
- });
-}
-
-function styleFeature(feature, selected) {
- if(!feature) return;
- if(!feature.getId()) return;
+ stop_selected_layer.setStyle(style);
- var style = null;
-
- switch(feature.getId().substr(0, 1)) {
- case 'v':
- style = styleVehicle(feature, selected);
- break;
-
- case 's':
- case 'p':
- style = styleStop(feature, selected);
- break;
+ var feature, prefix;
+ for(var i = 0; i < stops.length; i++) {
+ feature = null;
+ if(stops[i].getId) {
+ feature = stops[i];
+ } else {
+ prefix = stops[i].substr(0,2);
+ feature = stops_source[prefix].getFeatureById(stops[i]);
+ }
+ if(feature) {
+ stop_selected_source.addFeature(feature);
+ }
}
- feature.setStyle(style);
- if(selected) {
- feature_selected.push(feature);
- }
+ stop_selected_layer.setVisible(true);
}
function unstyleSelectedFeatures() {
- for(var i = 0; i < feature_selected.length; i++) {
- styleFeature(feature_selected[i]);
+ stop_selected_source.clear();
+ route_source.clear();
+ if(feature_clicked && ttss_types.includes(feature_clicked.getId().substr(0, 1))) {
+ styleVehicle(feature_clicked);
}
- feature_selected = [];
}
-function updateVehicles() {
- if(vehicles_timer) clearTimeout(vehicles_timer);
- if(vehicles_xhr) vehicles_xhr.abort();
-
- vehicles_xhr = $.get(
- ttss_base + '/geoserviceDispatcher/services/vehicleinfo/vehicles'
- + '?positionType=CORRECTED'
+function updateVehicles(prefix) {
+ if(vehicles_timer[prefix]) clearTimeout(vehicles_timer[prefix]);
+ if(vehicles_xhr[prefix]) vehicles_xhr[prefix].abort();
+ vehicles_xhr[prefix] = $.get(
+ ttss_urls[prefix] + '/geoserviceDispatcher/services/vehicleinfo/vehicles'
+ + '?positionType=' + ttss_position_type
+ '&colorType=ROUTE_BASED'
- + '&lastUpdate=' + encodeURIComponent(vehicles_last_update)
+ + '&lastUpdate=' + encodeURIComponent(vehicles_last_update[prefix])
).done(function(data) {
- vehicles_last_update = data.lastUpdate;
+ vehicles_last_update[prefix] = data.lastUpdate;
for(var i = 0; i < data.vehicles.length; i++) {
var vehicle = data.vehicles[i];
- var vehicle_feature = vehicles_source.getFeatureById('v' + vehicle.id);
- if(vehicle.isDeleted) {
+ var vehicle_feature = vehicles_source[prefix].getFeatureById(prefix + vehicle.id);
+ if(vehicle.isDeleted || !vehicle.latitude || !vehicle.longitude) {
if(vehicle_feature) {
- vehicles_source.removeFeature(vehicle_feature);
+ vehicles_source[prefix].removeFeature(vehicle_feature);
if(feature_clicked && feature_clicked.getId() === vehicle_feature.getId()) {
featureClicked();
}
@@ -179,180 +278,185 @@
var vehicle_name_space = vehicle.name.indexOf(' ');
vehicle.line = vehicle.name.substr(0, vehicle_name_space);
- vehicle.direction = vehicle.name.substr(vehicle_name_space+1);
+ vehicle.direction = normalizeName(vehicle.name.substr(vehicle_name_space+1));
if(special_directions[vehicle.direction]) {
vehicle.line = special_directions[vehicle.direction];
}
vehicle.geometry = getGeometry(vehicle);
- vehicle.vehicle_type = parseVehicle(vehicle.id);
+ vehicle.vehicle_type = parseVehicle(prefix + vehicle.id);
if(!vehicle_feature) {
vehicle_feature = new ol.Feature(vehicle);
- vehicle_feature.setId('v' + vehicle.id);
+ vehicle_feature.setId(prefix + vehicle.id);
- styleFeature(vehicle_feature);
- vehicles_source.addFeature(vehicle_feature);
+ styleVehicle(vehicle_feature);
+ vehicles_source[prefix].addFeature(vehicle_feature);
} else {
vehicle_feature.setProperties(vehicle);
- vehicle_feature.getStyle().getImage().setRotation(Math.PI * parseFloat(vehicle.heading) / 180.0);
+ vehicle_feature.getStyle().getImage().setRotation(Math.PI * parseFloat(vehicle.heading ? vehicle.heading : 0) / 180.0);
+ vehicle_feature.getStyle().getText().setText(vehicle.line);
}
}
- vehicles_timer = setTimeout(function() {
- updateVehicles();
+ vehicles_timer[prefix] = setTimeout(function() {
+ updateVehicles(prefix);
}, ttss_refresh);
}).fail(fail_ajax);
- return vehicles_xhr;
+ return vehicles_xhr[prefix];
}
-function updateStopSource(stops, prefix, source) {
- source.clear();
-
+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.includes(stop.shortName)) 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);
- styleFeature(stop_feature);
source.addFeature(stop_feature);
}
}
-function updateStops() {
+function updateStops(stop_type, ttss_type) {
+ var methods = {
+ 's': 'stops',
+ 'p': 'stopPoints',
+ };
return $.get(
- ttss_base + '/geoserviceDispatcher/services/stopinfo/stops'
+ ttss_urls[ttss_type] + '/geoserviceDispatcher/services/stopinfo/' + methods[stop_type]
+ '?left=-648000000'
+ '&bottom=-324000000'
+ '&right=648000000'
+ '&top=324000000'
).done(function(data) {
- updateStopSource(data.stops, 's', stops_source);
+ updateStopSource(data[methods[stop_type]], stop_type + ttss_type);
}).fail(fail_ajax);
}
-function updateStopPoints() {
- return $.get(
- ttss_base + '/geoserviceDispatcher/services/stopinfo/stopPoints'
- + '?left=-648000000'
- + '&bottom=-324000000'
- + '&right=648000000'
- + '&top=324000000'
+function vehiclePath(feature, tripId) {
+ if(path_xhr) path_xhr.abort();
+
+ var featureId = feature.getId();
+ var ttss_type = featureId.substr(0, 1);
+
+ path_xhr = $.get(
+ ttss_urls[ttss_type] + '/geoserviceDispatcher/services/pathinfo/vehicle'
+ + '?id=' + encodeURIComponent(featureId.substr(1))
).done(function(data) {
- updateStopSource(data.stopPoints, 'p', stop_points_source);
- }).fail(fail_ajax);
+ if(!data || !data.paths || !data.paths[0] || !data.paths[0].wayPoints) return;
+
+ var point;
+ 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);
+ });
+ return path_xhr;
}
-function vehicleTable(tripId, table, vehicleId) {
+function vehicleTable(feature, table) {
if(feature_xhr) feature_xhr.abort();
if(feature_timer) clearTimeout(feature_timer);
+ var featureId = feature.getId();
+ var ttss_type = featureId.substr(0, 1);
+
feature_xhr = $.get(
- ttss_base + '/services/tripInfo/tripPassages'
- + '?tripId=' + encodeURIComponent(tripId)
+ ttss_urls[ttss_type] + '/services/tripInfo/tripPassages'
+ + '?tripId=' + encodeURIComponent(feature.get('tripId'))
+ '&mode=departure'
).done(function(data) {
- if(!data.routeName || !data.directionText) {
+ if(typeof data.old === "undefined" || typeof data.actual === "undefined") {
return;
}
deleteChildren(table);
- for(var i = 0, il = data.old.length; i < il; i++) {
- var tr = document.createElement('tr');
- addCellWithText(tr, data.old[i].actualTime || data.old[i].plannedTime);
- addCellWithText(tr, data.old[i].stop_seq_num + '. ' + data.old[i].stop.name);
+ var all_departures = data.old.concat(data.actual);
+ var tr;
+ var stopsToMark = [];
+ for(var i = 0, il = all_departures.length; i < il; i++) {
+ tr = document.createElement('tr');
+ addCellWithText(tr, all_departures[i].actualTime || all_departures[i].plannedTime);
+ addCellWithText(tr, all_departures[i].stop_seq_num + '. ' + normalizeName(all_departures[i].stop.name));
- tr.className = 'active';
- table.appendChild(tr);
- }
-
- unstyleSelectedFeatures();
- styleFeature(feature_clicked, true);
-
- for(var i = 0, il = data.actual.length; i < il; i++) {
- var tr = document.createElement('tr');
- addCellWithText(tr, data.actual[i].actualTime || data.actual[i].plannedTime);
- addCellWithText(tr, data.actual[i].stop_seq_num + '. ' + data.actual[i].stop.name);
+ if(i >= data.old.length) {
+ stopsToMark.push('s' + ttss_type + all_departures[i].stop.id);
+ }
- styleFeature(stops_source.getFeatureById('s' + data.actual[i].stop.id), 2);
-
- if(data.actual[i].status == 'STOPPING') {
+ if(i < data.old.length) {
+ tr.className = 'active';
+ } else if(all_departures[i].status === 'STOPPING') {
tr.className = 'success';
}
table.appendChild(tr);
}
- feature_timer = setTimeout(function() { vehicleTable(tripId, table); }, ttss_refresh);
+ if(all_departures.length === 0) {
+ tr = document.createElement('tr');
+ table.appendChild(tr);
+ tr = addCellWithText(tr, lang.no_data);
+ tr.colSpan = '2';
+ tr.className = 'active';
+ }
- if(!vehicleId) return;
-
- feature_xhr = $.get(
- ttss_base + '/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)
- }));
- });
+ markStops(stopsToMark, ttss_type, true);
+
+ feature_timer = setTimeout(function() { vehicleTable(feature, table); }, ttss_refresh);
}).fail(fail_ajax_popup);
+ return feature_xhr;
}
-function stopTable(stopType, stopId, table) {
+function stopTable(stopType, stopId, table, ttss_type) {
if(feature_xhr) feature_xhr.abort();
if(feature_timer) clearTimeout(feature_timer);
feature_xhr = $.get(
- ttss_base + '/services/passageInfo/stopPassages/' + stopType
+ ttss_urls[ttss_type] + '/services/passageInfo/stopPassages/' + stopType
+ '?' + stopType + '=' + encodeURIComponent(stopId)
+ '&mode=departure'
).done(function(data) {
deleteChildren(table);
- for(var i = 0, il = data.old.length; i < il; i++) {
- var tr = document.createElement('tr');
- addCellWithText(tr, data.old[i].patternText);
- var dir_cell = addCellWithText(tr, data.old[i].direction);
- var vehicle = parseVehicle(data.old[i].vehicleId);
+ var all_departures = data.old.concat(data.actual);
+ var tr, dir_cell, vehicle, status, status_cell, delay, delay_cell;
+ for(var i = 0, il = all_departures.length; i < il; i++) {
+ tr = document.createElement('tr');
+ addCellWithText(tr, all_departures[i].patternText);
+ dir_cell = addCellWithText(tr, normalizeName(all_departures[i].direction));
+ vehicle = parseVehicle(all_departures[i].vehicleId);
dir_cell.appendChild(displayVehicle(vehicle));
- var status = parseStatus(data.old[i]);
- addCellWithText(tr, status);
- addCellWithText(tr, '');
+ status = parseStatus(all_departures[i]);
+ status_cell = addCellWithText(tr, status);
+ delay = parseDelay(all_departures[i]);
+ delay_cell = addCellWithText(tr, delay);
- tr.className = 'active';
- table.appendChild(tr);
- }
-
- for(var i = 0, il = data.actual.length; i < il; i++) {
- var tr = document.createElement('tr');
- addCellWithText(tr, data.actual[i].patternText);
- var dir_cell = addCellWithText(tr, data.actual[i].direction);
- var vehicle = parseVehicle(data.actual[i].vehicleId);
- dir_cell.appendChild(displayVehicle(vehicle));
- var status = parseStatus(data.actual[i]);
- var status_cell = addCellWithText(tr, status);
- var delay = parseDelay(data.actual[i]);
- var delay_cell = addCellWithText(tr, delay);
-
- if(status == lang.boarding_sign) {
+ if(i < data.old.length) {
+ tr.className = 'active';
+ } else if(status === lang.boarding_sign) {
tr.className = 'success';
status_cell.className = 'status-boarding';
} else if(parseInt(delay) > 9) {
@@ -365,43 +469,18 @@
table.appendChild(tr);
}
- feature_timer = setTimeout(function() { stopTable(stopType, stopId, table); }, ttss_refresh);
+ feature_timer = setTimeout(function() { stopTable(stopType, stopId, table, ttss_type); }, ttss_refresh);
}).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');
+ return feature_xhr;
}
function featureClicked(feature) {
if(feature && !feature.getId()) return;
unstyleSelectedFeatures();
- route_source.clear();
if(!feature) {
- hidePanel();
+ panel.close();
return;
}
@@ -409,8 +488,8 @@
var div = document.createElement('div');
- var type;
- var name = feature.get('name');
+ var typeName;
+ var name = normalizeName(feature.get('name'));
var additional;
var table = document.createElement('table');
var thead = document.createElement('thead');
@@ -418,91 +497,121 @@
table.appendChild(thead);
table.appendChild(tbody);
- switch(feature.getId().substr(0, 1)) {
- case 'v':
- type = lang.type_vehicle;
+ var tabular_data = true;
+
+ var type = feature.getId().substr(0, 1);
+ var full_type = feature.getId().match(/^[a-z]+/)[0];
+ var typeName = lang.types[full_type];
+ if(typeof typeName === 'undefined') {
+ typeName = '';
+ }
+
+ // Location
+ if(type == 'l') {
+ tabular_data = false;
+ name = typeName;
+ typeName = '';
+ }
+ // Vehicle
+ else if(ttss_types.includes(type)) {
+ var span = displayVehicle(feature.get('vehicle_type'));
+
+ additional = document.createElement('p');
+ if(span.title) {
+ setText(additional, span.title);
+ } else {
+ setText(additional, feature.getId());
+ }
+ additional.insertBefore(span, additional.firstChild);
+
+ addElementWithText(thead, 'th', lang.header_time);
+ addElementWithText(thead, 'th', lang.header_stop);
+
+ vehicleTable(feature, tbody);
+ vehiclePath(feature);
+
+ styleVehicle(feature, true);
+ }
+ // Stop or stop point
+ else if(['s', 'p'].includes(type)) {
+ var ttss_type = feature.getId().substr(1, 1);
+ if(type == 's') {
+ var second_type = lang.departures_for_buses;
+ var mapping = stops_mapping['sb'];
- if(!feature.get('vehicle_type')) {
- break;
+ if(ttss_type == 'b') {
+ second_type = lang.departures_for_trams;
+ mapping = stops_mapping['st'];
}
- var span = displayVehicle(feature.get('vehicle_type'));
+ stopTable('stop', feature.get('shortName'), tbody, ttss_type);
- additional = document.createElement('p');
- setText(additional, span.title);
- additional.insertBefore(span, additional.firstChild);
-
- addElementWithText(thead, 'th', lang.header_time);
- addElementWithText(thead, 'th', lang.header_stop);
-
- vehicleTable(feature.get('tripId'), tbody, feature.get('id'));
- break;
- case 's':
- type = lang.type_stop;
-
- addElementWithText(thead, 'th', lang.header_line);
- addElementWithText(thead, 'th', lang.header_direction);
- addElementWithText(thead, 'th', lang.header_time);
- addElementWithText(thead, 'th', lang.header_delay);
-
- stopTable('stop', feature.get('shortName'), tbody);
- break;
- case 'p':
- type = lang.type_stoppoint;
+ 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')]);
+ }
+ );
+ }
+ } else {
+ stopTable('stopPoint', feature.get('stopPoint'), tbody, ttss_type);
additional = document.createElement('p');
additional.className = 'small';
addElementWithText(additional, 'a', lang.departures_for_stop).addEventListener(
'click',
function() {
- featureClicked(stops_source.forEachFeature(function(stop_feature) {
- if(stop_feature.get('shortName') == feature.get('shortName')) {
- return stop_feature;
- }
- }));
+ var mapping = stops_mapping['s' + ttss_type];
+ featureClicked(mapping[feature.get('shortName')]);
}
);
-
- addElementWithText(thead, 'th', lang.header_line);
- addElementWithText(thead, 'th', lang.header_direction);
- addElementWithText(thead, 'th', lang.header_time);
- addElementWithText(thead, 'th', lang.header_delay);
-
- stopTable('stopPoint', feature.get('stopPoint'), tbody);
- break;
+ }
+
+ addElementWithText(thead, 'th', lang.header_line);
+ addElementWithText(thead, 'th', lang.header_direction);
+ addElementWithText(thead, 'th', lang.header_time);
+ addElementWithText(thead, 'th', lang.header_delay);
+
+ markStops([feature], feature.getId().substr(1,1));
+ } else {
+ panel.close();
+ return;
}
var loader = addElementWithText(tbody, 'td', lang.loading);
loader.className = 'active';
loader.colSpan = thead.childNodes.length;
- addParaWithText(div, type).className = 'type';
+ addParaWithText(div, typeName).className = 'type';
addParaWithText(div, name).className = 'name';
if(additional) {
div.appendChild(additional);
}
- div.appendChild(table);
-
- styleFeature(feature, true);
+ 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();
- route_source.clear();
+ feature_clicked = null;
+ if(path_xhr) path_xhr.abort();
if(feature_xhr) feature_xhr.abort();
if(feature_timer) clearTimeout(feature_timer);
}
@@ -511,42 +620,126 @@
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);
+
+ var feature, p, a, full_type, typeName;
+ for(var i = 0; i < features.length; i++) {
+ feature = features[i];
+
+ p = document.createElement('p');
+ a = document.createElement('a');
+ p.appendChild(a);
+ a.addEventListener('click', function(feature) { return function() {
+ featureClicked(feature);
+ }}(feature));
+
+ full_type = feature.getId().match(/^[a-z]+/)[0];
+ typeName = lang.types[full_type];
+ if(typeof typeName === 'undefined') {
+ typeName = '';
+ }
+
+ addElementWithText(a, 'span', typeName).className = 'small';
+ a.appendChild(document.createTextNode(' '));
+ addElementWithText(a, 'span', normalizeName(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));
+ }
+ });
+ ttss_types.forEach(function(type) {
+ if(vehicles_layer[type].getVisible()) {
+ feature = returnClosest(point, feature, vehicles_source[type].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() {
if(ignore_hashchange) {
ignore_hashchange = false;
return;
}
- var tramId = null;
-
+ var feature = null;
var vehicleId = null;
var stopId = null;
- var stopPointId = null;
-
- var feature = null;
if(window.location.hash.match(/^#!t[0-9]{3}$/)) {
- tramId = parseInt(window.location.hash.substr(3));
+ vehicleId = depotIdToVehicleId(window.location.hash.substr(3), 't');
+ } else if(window.location.hash.match(/^#!b[0-9]{3}$/)) {
+ vehicleId = depotIdToVehicleId(window.location.hash.substr(3), 'b');
} else if(window.location.hash.match(/^#![A-Za-z]{2}[0-9]{3}$/)) {
- tramId = parseInt(window.location.hash.substr(4));
- } else if(window.location.hash.match(/^#!v[0-9]+$/)) {
- vehicleId = window.location.hash.substr(3);
- } else if(window.location.hash.match(/^#!s[0-9]+$/)) {
- stopId = window.location.hash.substr(3);
- } else if(window.location.hash.match(/^#!p[0-9]+$/)) {
- stopPointId = window.location.hash.substr(3);
- }
-
- if(tramId) {
- vehicleId = tramIdToVehicleId(tramId);
+ vehicleId = depotIdToVehicleId(window.location.hash.substr(2));
+ } else if(window.location.hash.match(/^#!v-?[0-9]+$/)) {
+ vehicleId = 't' + window.location.hash.substr(3);
+ } else if(window.location.hash.match(/^#![tb]-?[0-9]+$/)) {
+ vehicleId = window.location.hash.substr(2);
+ } else if(window.location.hash.match(/^#![sp]-?[0-9]+$/)) {
+ stopId = window.location.hash.substr(2,1) + 't' + window.location.hash.substr(3);
+ } else if(window.location.hash.match(/^#![sp][tb]-?[0-9]+$/)) {
+ stopId = window.location.hash.substr(2);
}
if(vehicleId) {
- feature = vehicles_source.getFeatureById('v' + vehicleId);
+ feature = vehicles_source[vehicleId.substr(0, 1)].getFeatureById(vehicleId);
} else if(stopId) {
- feature = stops_source.getFeatureById('s' + stopId);
- } else if(stopPointId) {
- feature = stop_points_source.getFeatureById('p' + stopPointId);
+ feature = stops_source[stopId.substr(0,2)].getFeatureById(stopId);
}
featureClicked(feature);
@@ -562,48 +755,18 @@
var c1 = ol.proj.transform(c1, 'EPSG:3857', 'EPSG:4326');
var c2 = ol.proj.transform(c2, 'EPSG:3857', 'EPSG:4326');
- return map_sphere.haversineDistance(c1, c2);
+ return ol.sphere.getDistance(c1, c2);
}
function returnClosest(point, f1, f2) {
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() {
- if(!window.jQuery) {
- fail(lang.jquery_not_loaded);
- return;
- }
-
- $.ajaxSetup({
- dataType: 'json',
- timeout: 10000,
- });
-
- stops_source = new ol.source.Vector({
- features: [],
- });
- stops_layer = new ol.layer.Vector({
- source: stops_source,
- });
-
- stop_points_source = new ol.source.Vector({
- features: [],
- });
- stop_points_layer = new ol.layer.Vector({
- source: stop_points_source,
- visible: false,
- });
-
- vehicles_source = new ol.source.Vector({
- features: [],
- });
- vehicles_layer = new ol.layer.Vector({
- source: vehicles_source,
- });
+ panel = new Panel(document.getElementById('panel'));
route_source = new ol.source.Vector({
features: [],
@@ -615,20 +778,108 @@
}),
});
+ 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({
+ features: [],
+ });
+ stop_selected_layer = new ol.layer.Vector({
+ source: stop_selected_source,
+ visible: false,
+ });
+
+ ttss_types.forEach(function(type) {
+ vehicles_source[type] = new ol.source.Vector({
+ features: [],
+ });
+ vehicles_layer[type] = new ol.layer.Vector({
+ source: vehicles_source[type],
+ });
+ vehicles_last_update[type] = 0;
+ });
+
+ 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);
+
+ var layers = [
+ new ol.layer.Tile({
+ source: new ol.source.OSM(),
+ }),
+ route_layer,
+ geolocation_layer,
+ ];
+ stops_type.forEach(function(type) {
+ layers.push(stops_layer[type]);
+ });
+ layers.push(stop_selected_layer);
+ ttss_types.forEach(function(type) {
+ layers.push(vehicles_layer[type]);
+ });
map = new ol.Map({
target: 'map',
- layers: [
- new ol.layer.Tile({
- source: new ol.source.OSM()
- }),
- route_layer,
- stops_layer,
- stop_points_layer,
- vehicles_layer,
- ],
+ layers: layers,
view: new ol.View({
center: ol.proj.fromLonLat([19.94, 50.06]),
- zoom: 13
+ zoom: 14,
+ maxZoom: 19,
}),
controls: ol.control.defaults({
attributionOptions: ({
@@ -640,82 +891,21 @@
}),
new ol.control.Control({
element: fail_element,
- })
+ }),
+ new ol.control.Control({
+ element: document.getElementById('track'),
+ }),
]),
- loadTilesWhileAnimating: true,
+ loadTilesWhileAnimating: false,
});
- map_sphere = new ol.Sphere(6378137);
// Display popup on click
- map.on('singleclick', function(e) {
- var point = e.coordinate;
- var features = [];
- map.forEachFeatureAtPixel(e.pixel, function(feature) { if(feature.getId()) features.push(feature); });
-
- if(features.length > 1) {
- 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 'v':
- type = lang.type_vehicle + ' ' + feature.get('vehicle_type').num;
- break;
- case 's':
- type = lang.type_stop;
- break;
- case 'p':
- type = lang.type_stoppoint;
- 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_layer.getVisible()) {
- feature = returnClosest(point, feature, stops_source.getClosestFeatureToCoordinate(point));
- }
- if(stop_points_layer.getVisible()) {
- feature = returnClosest(point, feature, stop_points_source.getClosestFeatureToCoordinate(point));
- }
- if(vehicles_layer.getVisible()) {
- feature = returnClosest(point, feature, vehicles_source.getClosestFeatureToCoordinate(point));
- }
-
- if(getDistance(point, feature) > 200) {
- feature = null;
- }
- }
-
- featureClicked(feature);
- });
+ map.on('singleclick', mapClicked);
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);
@@ -724,23 +914,35 @@
});
// Change layer visibility on zoom
- map.getView().on('change:resolution', function(e) {
- stop_points_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(
- updateVehicles(),
- updateStops(),
- updateStopPoints()
- ).done(function() {
- hash();
+ var future_requests = [
+ updateVehicleInfo(),
+ ];
+ ttss_types.forEach(function(type) {
+ future_requests.push(updateVehicles(type));
});
+ stops_type.forEach(function(type) {
+ future_requests.push(updateStops(type.substr(0,1), type.substr(1,1)));
+ });
+ Deferred.all(future_requests).done(hash);
window.addEventListener('hashchange', hash);
setTimeout(function() {
- if(vehicles_xhr) vehicles_xhr.abort();
- if(vehicles_timer) clearTimeout(vehicles_timer);
+ if(trams_xhr) trams_xhr.abort();
+ if(trams_timer) clearTimeout(trams_timer);
+ if(buses_xhr) buses_xhr.abort();
+ if(buses_timer) clearTimeout(buses_timer);
fail(lang.error_refresh);
}, 1800000);
--
Gitblit v1.9.1