From c57bed6e3c5ae889c591c533d1cee93f5a761c9f Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Thu, 31 Jan 2019 03:01:24 +0000
Subject: [PATCH] Add special labels to mark non-passenger bus trips
---
map.js | 297 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 206 insertions(+), 91 deletions(-)
diff --git a/map.js b/map.js
index b543fb4..a4f4001 100644
--- a/map.js
+++ b/map.js
@@ -1,12 +1,23 @@
-//var ttss_base = 'http://www.ttss.krakow.pl/internetservice';
-var ttss_base = 'proxy.php';
+//var ttss_trams_base = 'http://www.ttss.krakow.pl/internetservice';
+var ttss_trams_base = 'proxy_tram.php';
+//var ttss_buses_base = 'http://91.223.13.70/internetservice';
+var ttss_buses_base = 'proxy_bus.php';
var ttss_refresh = 10000; // 10 seconds
+var ttss_position_type = 'CORRECTED';
-var vehicles_xhr = null;
-var vehicles_timer = null;
-var vehicles_last_update = 0;
-var vehicles_source = null;
-var vehicles_layer = null;
+var trams_xhr = null;
+var trams_timer = null;
+var trams_last_update = 0;
+var trams_source = null;
+var trams_layer = null;
+
+var buses_xhr = null;
+var buses_timer = null;
+var buses_last_update = 0;
+var buses_source = null;
+var buses_layer = null;
+
+var vehicles_info = {};
var stops_xhr = null;
var stops_source = null;
@@ -23,7 +34,6 @@
var route_layer = null;
var map = null;
-var map_sphere = null;
var popup_element = document.getElementById('popup');
var popup_close_callback;
var fail_element = document.getElementById('fail');
@@ -68,26 +78,30 @@
var color_type = 'black';
if(vehicle.get('vehicle_type')) {
switch(vehicle.get('vehicle_type').low) {
- case 0:
+ case '0':
color_type = 'orange';
break;
- case 1:
- color_type = 'blue';
- break;
- case 2:
+ case '1':
+ 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({
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',
@@ -98,16 +112,21 @@
}
function styleStop(stop, selected) {
- var fill = 'orange';
- var stroke = 'red';
+ var fill = '#FA0';
+ var stroke = '#B70';
+ var stroke_selected = '#F00';
var stroke_width = 1;
var radius = 3;
+
+ if(stop.get('category') == 'bus') {
+ fill = '#07F';
+ stroke = '#05B';
+ }
if(selected == 2) {
radius = 5;
} else if(selected) {
- fill = 'red';
- stroke = '#900';
+ stroke = stroke_selected;
stroke_width = 2;
radius = 5;
}
@@ -128,7 +147,8 @@
var style = null;
switch(feature.getId().substr(0, 1)) {
- case 'v':
+ case 't':
+ case 'b':
style = styleVehicle(feature, selected);
break;
@@ -151,26 +171,25 @@
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 updateTrams() {
+ if(trams_timer) clearTimeout(trams_timer);
+ if(trams_xhr) trams_xhr.abort();
+ trams_xhr = $.get(
+ ttss_trams_base + '/geoserviceDispatcher/services/vehicleinfo/vehicles'
+ + '?positionType=' + ttss_position_type
+ '&colorType=ROUTE_BASED'
- + '&lastUpdate=' + encodeURIComponent(vehicles_last_update)
+ + '&lastUpdate=' + encodeURIComponent(trams_last_update)
).done(function(data) {
- vehicles_last_update = data.lastUpdate;
+ trams_last_update = 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);
+ var vehicle_feature = trams_source.getFeatureById('t' + vehicle.id);
if(vehicle.isDeleted) {
if(vehicle_feature) {
- vehicles_source.removeFeature(vehicle_feature);
- if(feature_clicked.getId() == vehicle_feature.getId()) {
+ trams_source.removeFeature(vehicle_feature);
+ if(feature_clicked && feature_clicked.getId() === vehicle_feature.getId()) {
featureClicked();
}
}
@@ -185,31 +204,85 @@
}
vehicle.geometry = getGeometry(vehicle);
- vehicle.vehicle_type = parseVehicle(vehicle.id);
+ vehicle.vehicle_type = parseVehicle('t' + vehicle.id);
if(!vehicle_feature) {
vehicle_feature = new ol.Feature(vehicle);
- vehicle_feature.setId('v' + vehicle.id);
+ vehicle_feature.setId('t' + vehicle.id);
styleFeature(vehicle_feature);
- vehicles_source.addFeature(vehicle_feature);
+ trams_source.addFeature(vehicle_feature);
+ } else {
+ vehicle_feature.setProperties(vehicle);
+ vehicle_feature.getStyle().getImage().setRotation(Math.PI * parseFloat(vehicle.heading ? vehicle.heading : 0) / 180.0);
+ }
+ }
+
+ trams_timer = setTimeout(function() {
+ updateTrams();
+ }, ttss_refresh);
+ }).fail(fail_ajax);
+
+ return trams_xhr;
+}
+
+function updateBuses() {
+ if(buses_timer) clearTimeout(buses_timer);
+ if(buses_xhr) buses_xhr.abort();
+
+ buses_xhr = $.get(
+ ttss_buses_base + '/geoserviceDispatcher/services/vehicleinfo/vehicles'
+ + '?positionType=' + ttss_position_type
+ + '&colorType=ROUTE_BASED'
+ + '&lastUpdate=' + encodeURIComponent(buses_last_update)
+ ).done(function(data) {
+ buses_last_update = data.lastUpdate;
+
+ for(var i = 0; i < data.vehicles.length; i++) {
+ var vehicle = data.vehicles[i];
+
+ var vehicle_feature = buses_source.getFeatureById('b' + vehicle.id);
+ if(vehicle.isDeleted) {
+ if(vehicle_feature) {
+ buses_source.removeFeature(vehicle_feature);
+ if(feature_clicked && feature_clicked.getId() === vehicle_feature.getId()) {
+ featureClicked();
+ }
+ }
+ continue;
+ }
+
+ 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);
+ if(special_directions[vehicle.direction]) {
+ vehicle.line = special_directions[vehicle.direction];
+ }
+
+ vehicle.geometry = getGeometry(vehicle);
+ vehicle.vehicle_type = parseVehicle('b' + vehicle.id);
+
+ if(!vehicle_feature) {
+ vehicle_feature = new ol.Feature(vehicle);
+ vehicle_feature.setId('b' + vehicle.id);
+
+ styleFeature(vehicle_feature);
+ buses_source.addFeature(vehicle_feature);
} else {
vehicle_feature.setProperties(vehicle);
vehicle_feature.getStyle().getImage().setRotation(Math.PI * parseFloat(vehicle.heading) / 180.0);
}
}
- vehicles_timer = setTimeout(function() {
- updateVehicles();
+ buses_timer = setTimeout(function() {
+ updateBuses();
}, ttss_refresh);
}).fail(fail_ajax);
- return vehicles_xhr;
+ return buses_xhr;
}
function updateStopSource(stops, prefix, source) {
- source.clear();
-
for(var i = 0; i < stops.length; i++) {
var stop = stops[i];
@@ -225,36 +298,43 @@
}
}
-function updateStops() {
+function updateStops(base, suffix) {
return $.get(
- ttss_base + '/geoserviceDispatcher/services/stopinfo/stops'
+ base + '/geoserviceDispatcher/services/stopinfo/stops'
+ '?left=-648000000'
+ '&bottom=-324000000'
+ '&right=648000000'
+ '&top=324000000'
).done(function(data) {
- updateStopSource(data.stops, 's', stops_source);
+ updateStopSource(data.stops, 's' + suffix, stops_source);
}).fail(fail_ajax);
}
-function updateStopPoints() {
+function updateStopPoints(base, suffix) {
return $.get(
- ttss_base + '/geoserviceDispatcher/services/stopinfo/stopPoints'
+ base + '/geoserviceDispatcher/services/stopinfo/stopPoints'
+ '?left=-648000000'
+ '&bottom=-324000000'
+ '&right=648000000'
+ '&top=324000000'
).done(function(data) {
- updateStopSource(data.stopPoints, 'p', stop_points_source);
+ updateStopSource(data.stopPoints, 'p' + suffix, stop_points_source);
}).fail(fail_ajax);
}
-function vehicleTable(tripId, table, vehicleId) {
+function vehicleTable(tripId, table, featureId) {
if(feature_xhr) feature_xhr.abort();
if(feature_timer) clearTimeout(feature_timer);
+ var url = ttss_trams_base;
+ if(featureId.startsWith('b')) {
+ url = ttss_buses_base;
+ }
+
+ var vehicleId = featureId.substr(1);
+
feature_xhr = $.get(
- ttss_base + '/services/tripInfo/tripPassages'
+ url + '/services/tripInfo/tripPassages'
+ '?tripId=' + encodeURIComponent(tripId)
+ '&mode=departure'
).done(function(data) {
@@ -289,12 +369,12 @@
table.appendChild(tr);
}
- feature_timer = setTimeout(function() { vehicleTable(tripId, table); }, ttss_refresh);
+ feature_timer = setTimeout(function() { vehicleTable(tripId, table, featureId); }, ttss_refresh);
if(!vehicleId) return;
feature_xhr = $.get(
- ttss_base + '/geoserviceDispatcher/services/pathinfo/vehicle'
+ url + '/geoserviceDispatcher/services/pathinfo/vehicle'
+ '?id=' + encodeURIComponent(vehicleId)
).done(function(data) {
if(!data || !data.paths || !data.paths[0] || !data.paths[0].wayPoints) return;
@@ -316,12 +396,17 @@
}).fail(fail_ajax_popup);
}
-function stopTable(stopType, stopId, table) {
+function stopTable(stopType, stopId, table, featureId) {
if(feature_xhr) feature_xhr.abort();
if(feature_timer) clearTimeout(feature_timer);
+ var url = ttss_trams_base;
+ if(featureId.substr(1,1) == 'b') {
+ url = ttss_buses_base;
+ }
+
feature_xhr = $.get(
- ttss_base + '/services/passageInfo/stopPassages/' + stopType
+ url + '/services/passageInfo/stopPassages/' + stopType
+ '?' + stopType + '=' + encodeURIComponent(stopId)
+ '&mode=departure'
).done(function(data) {
@@ -365,7 +450,7 @@
table.appendChild(tr);
}
- feature_timer = setTimeout(function() { stopTable(stopType, stopId, table); }, ttss_refresh);
+ feature_timer = setTimeout(function() { stopTable(stopType, stopId, table, featureId); }, ttss_refresh);
}).fail(fail_ajax_popup);
}
@@ -419,23 +504,24 @@
table.appendChild(tbody);
switch(feature.getId().substr(0, 1)) {
- case 'v':
+ case 't':
+ case 'b':
type = lang.type_vehicle;
-
- if(!feature.get('vehicle_type')) {
- break;
- }
var span = displayVehicle(feature.get('vehicle_type'));
additional = document.createElement('p');
- setText(additional, span.title);
+ 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.get('tripId'), tbody, feature.get('id'));
+ vehicleTable(feature.get('tripId'), tbody, feature.getId());
break;
case 's':
type = lang.type_stop;
@@ -445,7 +531,7 @@
addElementWithText(thead, 'th', lang.header_time);
addElementWithText(thead, 'th', lang.header_delay);
- stopTable('stop', feature.get('shortName'), tbody);
+ stopTable('stop', feature.get('shortName'), tbody, feature.getId());
break;
case 'p':
type = lang.type_stoppoint;
@@ -468,7 +554,7 @@
addElementWithText(thead, 'th', lang.header_time);
addElementWithText(thead, 'th', lang.header_delay);
- stopTable('stopPoint', feature.get('stopPoint'), tbody);
+ stopTable('stopPoint', feature.get('stopPoint'), tbody, feature.getId());
break;
}
@@ -517,32 +603,41 @@
return;
}
- var tramId = null;
+ var depotId = null;
- var vehicleId = null;
+ var tramId = null;
+ var busId = 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));
+ depotId = parseInt(window.location.hash.substr(3));
} 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);
+ depotId = parseInt(window.location.hash.substr(4));
+ } else if(window.location.hash.match(/^#!v-?[0-9]+$/)) {
+ tramId = window.location.hash.substr(3);
+ } else if(window.location.hash.match(/^#!t-?[0-9]+$/)) {
+ tramId = window.location.hash.substr(3);
+ } else if(window.location.hash.match(/^#!b-?[0-9]+$/)) {
+ busId = 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]+$/)) {
+ } else if(window.location.hash.match(/^#!p-?[0-9]+$/)) {
stopPointId = window.location.hash.substr(3);
+ } else if(window.location.hash == '#!RAW') {
+ ttss_position_type = 'RAW';
+ }
+
+ if(depotId) {
+ tramId = tramIdToVehicleId(depotId);
}
if(tramId) {
- vehicleId = tramIdToVehicleId(tramId);
- }
-
- if(vehicleId) {
- feature = vehicles_source.getFeatureById('v' + vehicleId);
+ feature = trams_source.getFeatureById('t' + tramId);
+ } else if(busId) {
+ feature = buses_source.getFeatureById('b' + busId);
} else if(stopId) {
feature = stops_source.getFeatureById('s' + stopId);
} else if(stopPointId) {
@@ -562,7 +657,7 @@
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) {
@@ -598,11 +693,18 @@
visible: false,
});
- vehicles_source = new ol.source.Vector({
+ trams_source = new ol.source.Vector({
features: [],
});
- vehicles_layer = new ol.layer.Vector({
- source: vehicles_source,
+ trams_layer = new ol.layer.Vector({
+ source: trams_source,
+ });
+
+ buses_source = new ol.source.Vector({
+ features: [],
+ });
+ buses_layer = new ol.layer.Vector({
+ source: buses_source,
});
route_source = new ol.source.Vector({
@@ -624,7 +726,8 @@
route_layer,
stops_layer,
stop_points_layer,
- vehicles_layer,
+ buses_layer,
+ trams_layer,
],
view: new ol.View({
center: ol.proj.fromLonLat([19.94, 50.06]),
@@ -644,7 +747,6 @@
]),
loadTilesWhileAnimating: true,
});
- map_sphere = new ol.Sphere(6378137);
// Display popup on click
map.on('singleclick', function(e) {
@@ -669,8 +771,12 @@
var type = '';
switch(feature.getId().substr(0, 1)) {
- case 'v':
- type = lang.type_vehicle + ' ' + feature.get('vehicle_type').num;
+ case 't':
+ case 'b':
+ type = lang.type_vehicle;
+ if(feature.get('vehicle_type').num) {
+ type += ' ' + feature.get('vehicle_type').num;
+ }
break;
case 's':
type = lang.type_stop;
@@ -700,8 +806,11 @@
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(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) > 200) {
@@ -715,7 +824,7 @@
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);
@@ -729,9 +838,13 @@
});
$.when(
- updateVehicles(),
- updateStops(),
- updateStopPoints()
+ updateVehicleInfo(),
+ updateTrams(),
+ updateBuses(),
+ updateStops(ttss_trams_base, 't'),
+ updateStops(ttss_buses_base, 'b'),
+ updateStopPoints(ttss_trams_base, 't'),
+ updateStopPoints(ttss_buses_base, 'b'),
).done(function() {
hash();
});
@@ -739,8 +852,10 @@
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