From 08514a8ed6a4e7f543078a19271cb0546532e35d Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Mon, 02 Nov 2020 00:15:43 +0000
Subject: [PATCH] [map] New API approach
---
map.js | 672 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 389 insertions(+), 283 deletions(-)
diff --git a/map.js b/map.js
index 5752841..0a616a7 100644
--- a/map.js
+++ b/map.js
@@ -1,7 +1,7 @@
'use strict';
-var ttss_refresh = 10000; // 10 seconds
-var ttss_position_type = 'RAW';
+var api_refresh = 10000; // 10 seconds
+var api_url = 'http://127.0.0.1:8081';
var geolocation = null;
var geolocation_set = 0;
@@ -11,15 +11,9 @@
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 = {};
+var hash = null;
-var vehicles_info = {};
-
-var stops_xhr = null;
var stops_ignored = ['131', '744', '1263', '3039'];
var stops_style = {
'sb': new ol.style.Style({
@@ -59,7 +53,6 @@
var stop_selected_source = null;
var stop_selected_layer = null;
-var feature_clicked = null;
var feature_xhr = null;
var feature_timer = null;
var path_xhr = null;
@@ -75,19 +68,17 @@
var fail_element = document.getElementById('fail');
var fail_text = document.querySelector('#fail span');
-var ignore_hashchange = false;
-
function Panel(element) {
this._element = element;
this._element.classList.add('panel');
- this._hide = addParaWithText(this._element, '▶');
+ this._hide = addElementWithText(this._element, 'a', '▶');
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 = addElementWithText(this._element, 'a', '×');
this._close.title = lang.action_close;
this._close.className = 'close';
this._close.addEventListener('click', this.close.bind(this));
@@ -128,7 +119,9 @@
fail: function(message) {
addParaWithText(this._content, message).className = 'error';
},
- show: function(contents, closeCallback) {
+ show: function(contents, closeCallback, hashValue) {
+ hash.set(hashValue ? hashValue : '');
+
this._runCallback();
this.closeCallback = closeCallback;
@@ -212,10 +205,7 @@
this.timeout = setTimeout(this.find.bind(this), 100);
},
open: function(panel) {
- ignore_hashchange = true;
- window.location.hash = '#!f';
-
- panel.show(this.div, this.close.bind(this));
+ panel.show(this.div, this.close.bind(this), 'f');
this.input.focus();
},
close: function() {
@@ -223,6 +213,210 @@
},
};
+function Vehicles(prefix) {
+ this.prefix = prefix;
+ this.source = new ol.source.Vector({
+ features: [],
+ });
+ this.layer = new ol.layer.Vector({
+ source: this.source,
+ });
+}
+Vehicles.prototype = {
+ prefix: '',
+
+ layer: null,
+ source: null,
+
+ lastUpdate: 0,
+ xhr: null,
+ es: null,
+
+ selectedFeatureId: null,
+ deselectCallback: null,
+
+ style: function(feature, clicked) {
+ var color_type = 'black';
+
+ var vehicleType = feature.get('type');
+ if(vehicleType) {
+ switch(vehicleType.low) {
+ case 0:
+ color_type = 'orange';
+ break;
+ case 1:
+ case 2:
+ color_type = 'green';
+ break;
+ }
+ }
+
+ var fill = '#B70';
+ if(this.prefix === 'b') {
+ fill = '#05B';
+ }
+ if(clicked) {
+ fill = '#922';
+ }
+
+ var image = '<svg xmlns="http://www.w3.org/2000/svg" width="20" height="30"><polygon points="10,0 20,23 0,23" style="fill:'+fill+';stroke:'+color_type+';stroke-width:3"/></svg>';
+
+ feature.setStyle(new ol.style.Style({
+ image: new ol.style.Icon({
+ src: 'data:image/svg+xml;base64,' + btoa(image),
+ imgSize: [20,30],
+ rotation: Math.PI * feature.get('angle') / 180.0,
+ }),
+ text: new ol.style.Text({
+ font: 'bold 10px sans-serif',
+ // TODO: special directions
+ // vehicle.line = vehicle.name.substr(0, vehicle_name_space);
+ // vehicle.direction = normalizeName(vehicle.name.substr(vehicle_name_space+1));
+ // if(special_directions[vehicle.direction]) {
+ // vehicle.line = special_directions[vehicle.direction];
+ // }
+ text: feature.get('line'),
+ fill: new ol.style.Fill({color: 'white'}),
+ }),
+ }));
+ },
+ select: function(feature) {
+ if(feature instanceof ol.Feature) {
+ feature = feature.getId();
+ }
+ feature = this.source.getFeatureById(feature);
+ if(!feature) {
+ this.deselect();
+ return;
+ }
+ this.style(feature, true);
+
+ this.selectedFeatureId = feature.getId();
+ },
+ deselect: function() {
+ if(!this.selectedFeatureId) return false;
+ var feature = this.source.getFeatureById(this.selectedFeatureId);
+ this.style(feature);
+ this.selectedFeatureId = null;
+ },
+
+ typesUpdated: function() {
+ this.source.forEachFeature(function (feature) {
+ this.style(feature);
+ }.bind(this));
+ },
+
+ _newFeature: function(id, data) {
+ var feature = new ol.Feature(data);
+ feature.set('_', 'v' + this.prefix);
+ feature.setId(id);
+ feature.setGeometry(getGeometryFeature(feature));
+ this.style(feature);
+ return feature;
+ },
+ _updateFeature: function(feature, vehicle) {
+ Object.keys(vehicle).forEach(function (key) {
+ feature.set(key, deepMerge(feature.get(key), vehicle[key]));
+ if(key === 'lon' || key === 'lat') {
+ feature.setGeometry(getGeometryFeature(feature));
+ } else if(key === 'angle') {
+ feature.getStyle().getImage().setRotation(Math.PI * parseFloat(vehicle.angle ? vehicle.angle : 0) / 180.0);
+ } else if(key === 'line') {
+ // TODO: Special directions
+ feature.getStyle().getText().setText(vehicle.line);
+ }
+ });
+ },
+ _removeFeature: function(feature) {
+ if(!feature) return;
+ this.source.removeFeature(feature);
+ if(this.selectedFeatureId === feature.getId()) {
+ this.deselect();
+ }
+ },
+ loadFullData: function(data) {
+ var self = this;
+ var features = [];
+ for(var id in data) {
+ var feature = this.source.getFeatureById(id);
+ if(feature) {
+ this._updateFeature(feature, data[id]);
+ } else {
+ features.push(this._newFeature(id, data[id]));
+ }
+ }
+ this.source.addFeatures(features);
+ this.source.forEachFeature(function(feature) {
+ if(!data[feature.getId()]) {
+ self._removeFeature(feature);
+ }
+ });
+
+ if(this.selectedFeatureId) {
+ this.select(this.selectedFeatureId);
+ }
+ },
+ loadDiffData: function(data) {
+ for(var id in data) {
+ var feature = this.source.getFeatureById(id);
+ var vehicle = data[id];
+
+ if(vehicle === null) {
+ this._removeFeature(feature);
+ } else if(feature) {
+ this._updateFeature(feature, vehicle);
+ } else {
+ this.source.addFeature(this._newFeature(id, data[id]));
+ }
+ }
+ },
+
+ fetch: function() {
+ var self = this;
+ var result = this.fetchXhr();
+
+ // TODO: updates (EventSource)
+ // TODO: error ahandling (reconnect)
+ // TODO: error handling (indicator)
+
+ return result;
+ },
+ fetchXhr: function() {
+ var self = this;
+ this.xhr = $.get(
+ api_url + '/positions/?type=' + this.prefix + '&last=' + this.lastUpdate
+ ).done(function(data) {
+ try {
+ if(data['type'] == 'full') {
+ self.loadFullData(data['pos']);
+ } else {
+ self.loadDiffData(data['pos']);
+ }
+ self.lastUpdate = data['last'];
+ setTimeout(self.fetchXhr.bind(self), api_refresh);
+ } catch(e) {
+ console.log(e);
+ throw e;
+ }
+ }).fail(this.failXhr.bind(this));
+ return this.xhr;
+ },
+
+ failXhr: function(result) {
+ // abort() is not a failure
+ if(result.readyState === 0) return;
+
+ if(result.status === 0) {
+ fail(lang.error_request_failed_connectivity, result);
+ } else if(result.status === 304) {
+ fail(lang.error_request_failed_no_data, result);
+ } else if(result.statusText) {
+ fail(lang.error_request_failed_status.replace('$status', result.statusText), result);
+ } else {
+ fail(lang.error_request_failed, result);
+ }
+ },
+};
function fail(msg) {
setText(fail_text, msg);
@@ -250,51 +444,20 @@
fail_ajax_generic(data, panel.fail.bind(panel));
}
+function getGeometryFeature(feature) {
+ return getGeometryPair([feature.get('lon'), feature.get('lat')]);
+}
+function getGeometryPair(pair) {
+ return new ol.geom.Point(ol.proj.fromLonLat(pair));
+}
function getGeometry(object) {
- return new ol.geom.Point(ol.proj.fromLonLat([object.longitude / 3600000.0, object.latitude / 3600000.0]));
+ return getGeometryPair([object.longitude / 3600000.0, object.latitude / 3600000.0]);
}
-function styleVehicle(vehicle, selected) {
- var color_type = 'black';
- if(vehicle.get('vehicle_type')) {
- switch(vehicle.get('vehicle_type').low) {
- case 0:
- color_type = 'orange';
- break;
- case 1:
- case 2:
- color_type = 'green';
- break;
- }
- }
-
- var fill = '#B70';
- if(vehicle.getId().startsWith('b')) {
- fill = '#05B';
- }
- if(selected) {
- fill = '#922';
- }
-
- 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>';
-
- 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') ? 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 markStops(stops, ttss_type, routeStyle) {
+function markStops(stops, featureSource, routeStyle) {
stop_selected_source.clear();
- var style = stops_layer['s' + ttss_type].getStyle().clone();
+ var style = stops_layer['s' + featureSource].getStyle().clone();
if(routeStyle) {
style.getImage().setRadius(5);
@@ -311,8 +474,7 @@
if(stops[i].getId) {
feature = stops[i];
} else {
- prefix = stops[i].substr(0,2);
- feature = stops_source[prefix].getFeatureById(stops[i]);
+ feature = stops_source['s' + featureSource].getFeatureById(stops[i]);
}
if(feature) {
stop_selected_source.addFeature(feature);
@@ -325,105 +487,35 @@
function unstyleSelectedFeatures() {
stop_selected_source.clear();
route_source.clear();
- if(feature_clicked && ttss_types.includes(feature_clicked.getId().substr(0, 1))) {
- styleVehicle(feature_clicked);
- }
-}
-
-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[prefix])
- ).done(function(data) {
- 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[prefix].getFeatureById(prefix + vehicle.id);
- if(vehicle.isDeleted || !vehicle.latitude || !vehicle.longitude) {
- if(vehicle_feature) {
- vehicles_source[prefix].removeFeature(vehicle_feature);
- if(feature_clicked && feature_clicked.getId() === vehicle_feature.getId()) {
- panel.close();
- }
- }
- continue;
- }
-
- var vehicle_name_space = vehicle.name.indexOf(' ');
- vehicle.line = vehicle.name.substr(0, vehicle_name_space);
- 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(prefix + vehicle.id);
-
- if(!vehicle_feature) {
- vehicle_feature = new ol.Feature(vehicle);
- vehicle_feature.setId(prefix + vehicle.id);
-
- styleVehicle(vehicle_feature);
- vehicles_source[prefix].addFeature(vehicle_feature);
- } 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);
- }
- }
-
- vehicles_timer[prefix] = setTimeout(function() {
- updateVehicles(prefix);
- }, ttss_refresh);
- }).fail(fail_ajax);
-
- return vehicles_xhr[prefix];
+ ttss_types.forEach(function(type) {
+ vehicles[type].deselect();
+ });
}
function updateStopSource(stops, prefix) {
- var source = stops_source[prefix];
- var mapping = stops_mapping[prefix];
var stop;
for(var i = 0; i < stops.length; i++) {
stop = stops[i];
- if(stop.category == 'other') continue;
- if(stops_ignored.includes(stop.shortName)) continue;
+ var feature = new ol.Feature(stop);
+ feature.setId(stop.id);
+ feature.setGeometry(getGeometryFeature(feature));
- stop.geometry = getGeometry(stop);
- var stop_feature = new ol.Feature(stop);
-
- if(prefix.startsWith('p')) {
- mapping[stop.stopPoint] = stop_feature;
+ if(feature.get('parent') === null) {
+ feature.set('_', 's' + prefix);
+ stops_source['s' + prefix].addFeature(feature);
} else {
- mapping[stop.shortName] = stop_feature;
+ feature.set('_', 'p' + prefix);
+ stops_source['p' + prefix].addFeature(feature);
}
-
- stop_feature.setId(prefix + stop.id);
-
- source.addFeature(stop_feature);
}
}
-function updateStops(stop_type, ttss_type) {
- var methods = {
- 's': 'stops',
- 'p': 'stopPoints',
- };
+function updateStops(ttss_type) {
return $.get(
- ttss_urls[ttss_type] + '/geoserviceDispatcher/services/stopinfo/' + methods[stop_type]
- + '?left=-648000000'
- + '&bottom=-324000000'
- + '&right=648000000'
- + '&top=324000000'
+ api_url + '/stops/?type=' + ttss_type
).done(function(data) {
- updateStopSource(data[methods[stop_type]], stop_type + ttss_type);
+ updateStopSource(data, ttss_type);
}).fail(fail_ajax);
}
@@ -461,41 +553,34 @@
if(feature_xhr) feature_xhr.abort();
if(feature_timer) clearTimeout(feature_timer);
- var featureId = feature.getId();
- var ttss_type = featureId.substr(0, 1);
+ var featureDiscriminator = feature.get('_');
+ var featureType = featureDiscriminator.substr(0, 1);
+ var featureSource = featureDiscriminator.substr(1, 1);
+ var featureStatus = feature.get('status');
feature_xhr = $.get(
- ttss_urls[ttss_type] + '/services/tripInfo/tripPassages'
- + '?tripId=' + encodeURIComponent(feature.get('tripId'))
- + '&mode=departure'
+ api_url + '/trip/?type=' + featureSource + '&id=' + feature.get('trip')
).done(function(data) {
- if(typeof data.old === "undefined" || typeof data.actual === "undefined") {
- return;
- }
-
deleteChildren(table);
- var all_departures = data.old.concat(data.actual);
var tr;
var stopsToMark = [];
- for(var i = 0, il = all_departures.length; i < il; i++) {
+ for(var i = 0, il = data.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));
+ addCellWithText(tr, data[i].time);
+ addCellWithText(tr, (i+1) + '. ' + normalizeName(data[i].name));
- if(i >= data.old.length) {
- stopsToMark.push('s' + ttss_type + all_departures[i].stop.id);
- }
+ stopsToMark.push(data[i].stop);
- if(i < data.old.length) {
+ if(data[i].seq < feature.get('seq')) {
tr.className = 'active';
- } else if(all_departures[i].status === 'STOPPING') {
+ } else if(data[i].seq == feature.get('seq') && featureStatus < 2) {
tr.className = 'success';
}
table.appendChild(tr);
}
- if(all_departures.length === 0) {
+ if(data.length === 0) {
tr = document.createElement('tr');
table.appendChild(tr);
tr = addCellWithText(tr, lang.no_data);
@@ -503,21 +588,23 @@
tr.className = 'active';
}
- markStops(stopsToMark, ttss_type, true);
+ markStops(stopsToMark, featureSource, true);
- feature_timer = setTimeout(function() { vehicleTable(feature, table); }, ttss_refresh);
+ feature_timer = setTimeout(function() { vehicleTable(feature, table); }, api_refresh);
}).fail(fail_ajax_popup);
return feature_xhr;
}
-function stopTable(stopType, stopId, table, ttss_type) {
+function stopTable(feature, table) {
if(feature_xhr) feature_xhr.abort();
if(feature_timer) clearTimeout(feature_timer);
+ var featureDiscriminator = feature.get('_');
+ var featureType = featureDiscriminator.substr(0, 1);
+ var featureSource = featureDiscriminator.substr(1, 1);
+
feature_xhr = $.get(
- ttss_urls[ttss_type] + '/services/passageInfo/stopPassages/' + stopType
- + '?' + stopType + '=' + encodeURIComponent(stopId)
- + '&mode=departure'
+ api_url + '/stop/?type=' + featureSource + '&id=' + feature.getId()
).done(function(data) {
deleteChildren(table);
@@ -527,7 +614,7 @@
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);
+ //vehicle = vehicles_info.getParsed(all_departures[i].vehicleId);
dir_cell.appendChild(displayVehicle(vehicle));
status = parseStatus(all_departures[i]);
status_cell = addCellWithText(tr, status);
@@ -549,13 +636,15 @@
table.appendChild(tr);
}
- feature_timer = setTimeout(function() { stopTable(stopType, stopId, table, ttss_type); }, ttss_refresh);
+ feature_timer = setTimeout(function() { stopTable(feature, table); }, api_refresh);
}).fail(fail_ajax_popup);
return feature_xhr;
}
function featureClicked(feature) {
- if(feature && !feature.getId()) return;
+ if(!feature || !feature.getId() || !feature.get('_')) {
+ feature = null;
+ }
unstyleSelectedFeatures();
@@ -564,9 +653,13 @@
return;
}
+ var featureDiscriminator = feature.get('_');
+ var featureType = featureDiscriminator.substr(0, 1);
+ var featureSource = featureDiscriminator.substr(1, 1);
+
var div = document.createElement('div');
- var name = normalizeName(feature.get('name'));
+ var name = normalizeName(feature.get('name') ? feature.get('name') : feature.get('line') + ' ' + feature.get('dir'));
var additional;
var table = document.createElement('table');
var thead = document.createElement('thead');
@@ -576,24 +669,20 @@
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];
+ var typeName = lang.types[featureDiscriminator];
if(typeof typeName === 'undefined') {
typeName = '';
}
// Location
- if(type == 'l') {
+ if(featureType == 'l') {
tabular_data = false;
name = typeName;
typeName = '';
}
// Vehicle
- else if(ttss_types.includes(type)) {
- styleVehicle(feature, true);
-
- var span = displayVehicle(feature.get('vehicle_type'));
+ else if(featureType == 'v') {
+ var span = displayVehicle(feature.get('type'));
additional = document.createElement('p');
if(span.title) {
@@ -607,42 +696,41 @@
addElementWithText(thead, 'th', lang.header_stop);
vehicleTable(feature, tbody);
- vehiclePath(feature);
+ //vehiclePath(feature);
}
// Stop or stop point
- else if(['s', 'p'].includes(type)) {
- var ttss_type = feature.getId().substr(1, 1);
- if(type == 's') {
+ else if(['s', 'p'].includes(featureType)) {
+ if(featureType == 's') {
var second_type = lang.departures_for_buses;
- var mapping = stops_mapping['sb'];
+ var source = stops_source['sb'];
- if(ttss_type == 'b') {
+ if(featureSource == 'b') {
second_type = lang.departures_for_trams;
- mapping = stops_mapping['st'];
+ source = stops_source['st'];
}
- stopTable('stop', feature.get('shortName'), tbody, ttss_type);
+ stopTable(feature, tbody);
- if(mapping[feature.get('shortName')]) {
+ var second = source.getFeatureById(feature.get('id'));
+ if(second) {
additional = document.createElement('p');
additional.className = 'small';
addElementWithText(additional, 'a', second_type).addEventListener(
'click',
function() {
- featureClicked(mapping[feature.get('shortName')]);
+ featureClicked(second);
}
);
}
} else {
- stopTable('stopPoint', feature.get('stopPoint'), tbody, ttss_type);
+ stopTable(feature, tbody);
additional = document.createElement('p');
additional.className = 'small';
addElementWithText(additional, 'a', lang.departures_for_stop).addEventListener(
'click',
function() {
- var mapping = stops_mapping['s' + ttss_type];
- featureClicked(mapping[feature.get('shortName')]);
+ featureClicked(stops_source['s' + featureSource].getFeatureById(feature.get('parent')));
}
);
}
@@ -651,8 +739,6 @@
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;
@@ -674,7 +760,7 @@
})}, 10);
};
showOnMapElement.addEventListener('click', showOnMapFunction);
- showOnMapElement.className = 'icon-pin addon-icon';
+ showOnMapElement.className = 'icon icon-pin';
showOnMapElement.title = lang.show_on_map;
if(additional) {
@@ -683,27 +769,23 @@
if(tabular_data) {
div.appendChild(table);
- ignore_hashchange = true;
- window.location.hash = '#!' + feature.getId();
}
showOnMapFunction();
panel.show(div, function() {
- if(!ignore_hashchange) {
- ignore_hashchange = true;
- window.location.hash = '';
-
- unstyleSelectedFeatures();
- feature_clicked = null;
-
- if(path_xhr) path_xhr.abort();
- if(feature_xhr) feature_xhr.abort();
- if(feature_timer) clearTimeout(feature_timer);
- }
- });
+ unstyleSelectedFeatures();
+
+ if(path_xhr) path_xhr.abort();
+ if(feature_xhr) feature_xhr.abort();
+ if(feature_timer) clearTimeout(feature_timer);
+ }, tabular_data ? featureDiscriminator + feature.getId() : '');
- feature_clicked = feature;
+ if(featureType == 'v') {
+ vehicles[featureSource].select(feature);
+ } else if(['s', 'p'].includes(featureType)) {
+ markStops([feature], featureSource);
+ }
}
function listFeatures(features) {
@@ -716,7 +798,7 @@
addParaWithText(div, lang.select_feature);
- var feature, p, a, full_type, typeName;
+ var feature, p, a, featureDiscriminator, typeName;
for(var i = 0; i < features.length; i++) {
feature = features[i];
@@ -727,18 +809,18 @@
featureClicked(feature);
}}(feature));
- full_type = feature.getId().match(/^[a-z]+/)[0];
- typeName = lang.types[full_type];
+ featureDiscriminator = feature.get('_');
+ typeName = lang.types[featureDiscriminator];
if(typeof typeName === 'undefined') {
typeName = '';
}
- if(feature.get('vehicle_type')) {
- typeName += ' ' + feature.get('vehicle_type').num;
+ if(feature.get('type')) {
+ typeName += ' ' + feature.get('type').num;
}
addElementWithText(a, 'span', typeName).className = 'small';
a.appendChild(document.createTextNode(' '));
- addElementWithText(a, 'span', normalizeName(feature.get('name')));
+ addElementWithText(a, 'span', normalizeName(feature.get('name') ? feature.get('name') : feature.get('line') + ' ' + feature.get('dir')));
div.appendChild(p);
}
@@ -768,8 +850,8 @@
}
});
ttss_types.forEach(function(type) {
- if(vehicles_layer[type].getVisible()) {
- feature = returnClosest(point, feature, vehicles_source[type].getClosestFeatureToCoordinate(point));
+ if(vehicles[type].layer.getVisible()) {
+ feature = returnClosest(point, feature, vehicles[type].source.getClosestFeatureToCoordinate(point));
}
});
@@ -806,44 +888,72 @@
}
}
-
-function hash() {
- if(ignore_hashchange) {
- ignore_hashchange = false;
- return;
- }
-
- var feature = null;
- var vehicleId = null;
- var stopId = null;
-
- if(window.location.hash.match(/^#!t[0-9]{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}$/)) {
- 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);
- } else if(window.location.hash.match(/^#!f$/)) {
- find.open(panel);
- return;
- }
-
- if(vehicleId) {
- feature = vehicles_source[vehicleId.substr(0, 1)].getFeatureById(vehicleId);
- } else if(stopId) {
- feature = stops_source[stopId.substr(0,2)].getFeatureById(stopId);
- }
-
- featureClicked(feature);
+function Hash() {
}
+Hash.prototype = {
+ _ignoreChange: false,
+
+ _set: function(id) {
+ var value = '#!' + id;
+ if(value !== window.location.hash) {
+ window.location.hash = value;
+ return true;
+ }
+ return false;
+ },
+ _updateOld: function() {
+ if(window.location.hash.match(/^#![bt][0-9]{3}$/)) {
+ this.go('v' + window.location.hash.substr(2));
+ } else if(window.location.hash.match(/^#![RHrh][A-Za-z][0-9]{3}$/)) {
+ this.go('vt'+ window.location.hash.substr(4));
+ } else if(window.location.hash.match(/^#![BDPbdp][A-Za-z][0-9]{3}$/)) {
+ this.go('vb'+ window.location.hash.substr(4));
+ }
+ },
+ ready: function() {
+ this._updateOld();
+ this.changed();
+ window.addEventListener('hashchange', this.changed.bind(this), false);
+ },
+ go: function(id) {
+ this._ignoreChange = false;
+ return this._set(id);
+ },
+ set: function(id) {
+ this._ignoreChange = true;
+ return this._set(id);
+ },
+ changed: function() {
+ if(this._ignoreChange) {
+ this._ignoreChange = false;
+ return false;
+ }
+
+ var feature = null;
+ var source = null;
+ var vehicleId = null;
+ var stopId = null;
+
+ if(window.location.hash.match(/^#!v[tb][0-9]+$/)) {
+ vehicleId = window.location.hash.substr(3);
+ } else if(window.location.hash.match(/^#![sp][tb][0-9a-z_]+$/)) {
+ stopId = window.location.hash.substr(2);
+ } else if(window.location.hash.match(/^#!f$/)) {
+ find.open(panel);
+ return;
+ }
+
+ if(vehicleId) {
+ feature = vehicles[vehicleId.substr(0,1)].source.getFeatureById(vehicleId.substr(1));
+ } else if(stopId) {
+ feature = stops_source[stopId.substr(0,2)].getFeatureById(stopId.substr(2));
+ }
+
+ featureClicked(feature);
+
+ return true;
+ },
+};
function getDistance(c1, c2) {
if(c1.getGeometry) {
@@ -853,8 +963,8 @@
c2 = c2.getGeometry().getCoordinates();
}
- var c1 = ol.proj.transform(c1, 'EPSG:3857', 'EPSG:4326');
- var c2 = ol.proj.transform(c2, 'EPSG:3857', 'EPSG:4326');
+ c1 = ol.proj.transform(c1, 'EPSG:3857', 'EPSG:4326');
+ c2 = ol.proj.transform(c2, 'EPSG:3857', 'EPSG:4326');
return ol.sphere.getDistance(c1, c2);
}
@@ -870,6 +980,7 @@
find = new Find();
route_source = new ol.source.Vector({
+ attributions: [lang.help_data_attribution],
features: [],
});
route_layer = new ol.layer.Vector({
@@ -900,17 +1011,8 @@
});
ttss_types.forEach(function(type) {
- vehicles_source[type] = new ol.source.Vector({
- features: [],
- });
- vehicles_layer[type] = new ol.layer.Vector({
- source: vehicles_source[type],
- renderMode: 'image',
- });
- vehicles_last_update[type] = 0;
+ vehicles[type] = new Vehicles(type);
});
-
- ol.style.IconImageCache.shared.setSize(512);
geolocation_feature = new ol.Feature({
name: '',
@@ -962,10 +1064,17 @@
geolocation_button.addEventListener('click', trackingToggle);
document.getElementById('find').addEventListener('click', find.open.bind(find, panel));
-
+
+ var pixelRatio = ol.has.DEVICE_PIXEL_RATIO > 1 ? 2 : 1;
var layers = [
new ol.layer.Tile({
- source: new ol.source.OSM(),
+ source: new ol.source.XYZ({
+ attributions: [ol.source.OSM.ATTRIBUTION],
+ url: 'https://tiles.ttss.pl/x' + pixelRatio + '/{z}/{x}/{y}.png',
+ maxZoom: 19,
+ tilePixelRatio: pixelRatio,
+ opaque: false,
+ }),
}),
route_layer,
geolocation_layer,
@@ -975,7 +1084,7 @@
});
layers.push(stop_selected_layer);
ttss_types.forEach(function(type) {
- layers.push(vehicles_layer[type]);
+ layers.push(vehicles[type].layer);
});
map = new ol.Map({
target: 'map',
@@ -984,6 +1093,7 @@
center: ol.proj.fromLonLat([19.94, 50.06]),
zoom: 14,
maxZoom: 19,
+ constrainResolution: true,
}),
controls: ol.control.defaults({
attributionOptions: ({
@@ -1029,18 +1139,14 @@
map.getView().on('change:resolution', change_resolution);
change_resolution();
- var future_requests = [
- updateVehicleInfo(),
- ];
+ var future_requests = [];
ttss_types.forEach(function(type) {
- future_requests.push(updateVehicles(type));
+ future_requests.push(vehicles[type].fetch());
+ future_requests.push(updateStops(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);
+ hash = new Hash();
+ Deferred.all(future_requests).done(hash.ready.bind(hash));
setTimeout(function() {
ttss_types.forEach(function(type) {
--
Gitblit v1.9.1