From eafc1c0e3a6e25b88d427a6f72385299d23c4d44 Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Tue, 29 Jan 2019 14:10:11 +0000 Subject: [PATCH] Show buses on map --- map.js | 229 ++++++++++++++++++++-------- proxy_tram.php | 117 ++++++++++++++ proxy_bus.php | 117 ++++++++++++++ 3 files changed, 398 insertions(+), 65 deletions(-) diff --git a/map.js b/map.js index 2b9a038..10be16a 100644 --- a/map.js +++ b/map.js @@ -1,13 +1,22 @@ -//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; @@ -134,7 +143,8 @@ var style = null; switch(feature.getId().substr(0, 1)) { - case 'v': + case 't': + case 'b': style = styleVehicle(feature, selected); break; @@ -157,25 +167,24 @@ 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' +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); + trams_source.removeFeature(vehicle_feature); if(feature_clicked && feature_clicked.getId() === vehicle_feature.getId()) { featureClicked(); } @@ -195,27 +204,81 @@ 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); } } - vehicles_timer = setTimeout(function() { - updateVehicles(); + trams_timer = setTimeout(function() { + updateTrams(); }, ttss_refresh); }).fail(fail_ajax); - return vehicles_xhr; + 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(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); + } + } + + buses_timer = setTimeout(function() { + updateBuses(); + }, ttss_refresh); + }).fail(fail_ajax); + + return buses_xhr; } function updateStopSource(stops, prefix, source) { - source.clear(); - for(var i = 0; i < stops.length; i++) { var stop = stops[i]; @@ -231,36 +294,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) { @@ -295,12 +365,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; @@ -322,12 +392,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) { @@ -371,7 +446,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); } @@ -425,7 +500,8 @@ table.appendChild(tbody); switch(feature.getId().substr(0, 1)) { - case 'v': + case 't': + case 'b': type = lang.type_vehicle; var span = displayVehicle(feature.get('vehicle_type')); @@ -441,7 +517,7 @@ 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; @@ -451,7 +527,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; @@ -474,7 +550,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; } @@ -523,21 +599,26 @@ 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)); + depotId = 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]+$/)) { + 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]+$/)) { stopPointId = window.location.hash.substr(3); @@ -545,12 +626,14 @@ ttss_position_type = 'RAW'; } - if(tramId) { - vehicleId = tramIdToVehicleId(tramId); + if(depotId) { + tramId = tramIdToVehicleId(depotId); } - if(vehicleId) { - feature = vehicles_source.getFeatureById('v' + vehicleId); + if(tramId) { + 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) { @@ -606,11 +689,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({ @@ -632,7 +722,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]), @@ -676,7 +767,8 @@ var type = ''; switch(feature.getId().substr(0, 1)) { - case 'v': + case 't': + case 'b': type = lang.type_vehicle; if(feature.get('vehicle_type').num) { type += ' ' + feature.get('vehicle_type').num; @@ -710,8 +802,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) { @@ -739,10 +834,12 @@ }); $.when( - updateVehicleInfo(), - updateVehicles(), - updateStops(), - updateStopPoints() + 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(); }); @@ -750,8 +847,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); diff --git a/proxy_bus.php b/proxy_bus.php new file mode 100644 index 0000000..75b2367 --- /dev/null +++ b/proxy_bus.php @@ -0,0 +1,117 @@ +<?php +function is_number($str) { + $str = (string)$str; + + return + ctype_digit($str) + OR + ( + substr($str, 0, 1) == '-' + AND + ctype_digit(substr($str, 1)) + ); +} + +$base_proxy = 'http://91.223.13.70/internetservice'; +$method = [ + '/services/lookup/autocomplete/json' => [ + 'query' => function() { return TRUE; }, + ], + '/services/passageInfo/stopPassages/stop' => [ + 'stop' => 'ctype_alnum', + 'mode' => function($mode) { return in_array($mode, ['arrival', 'departure']); }, + #'startTime' => 'ctype_digit', + #'timeFrame' => 'ctype_digit', + ], + '/services/passageInfo/stopPassages/stopPoint' => [ + 'stopPoint' => 'is_number', + 'mode' => function($mode) { return in_array($mode, ['arrival', 'departure']); }, + #'startTime' => 'ctype_digit', + #'timeFrame' => 'ctype_digit', + ], + '/services/tripInfo/tripPassages' => [ + 'tripId' => 'ctype_digit', + 'mode' => function($mode) { return in_array($mode, ['arrival', 'departure']); }, + #'vehicleId' => 'ctype_digit', + ], + '/services/routeInfo/routeStops' => [ + 'routeId' => 'ctype_alnum', + ], + '/services/stopInfo/stop' => [ + 'stop' => 'is_number', + ], + '/services/stopInfo/stopPoint' => [ + 'stopPoint' => 'is_number', + ], + + '/geoserviceDispatcher/services/stopinfo/stops' => [ + 'left' => 'is_number', + 'bottom' => 'is_number', + 'right' => 'is_number', + 'top' => 'is_number', + ], + '/geoserviceDispatcher/services/stopinfo/stopPoints' => [ + 'left' => 'is_number', + 'bottom' => 'is_number', + 'right' => 'is_number', + 'top' => 'is_number', + ], + '/geoserviceDispatcher/services/pathinfo/route' => [ + 'id' => 'is_number', + 'direction' => 'is_number', + ], + '/geoserviceDispatcher/services/pathinfo/vehicle' => [ + 'id' => 'is_number', + ], + '/geoserviceDispatcher/services/vehicleinfo/vehicles' => [ + 'lastUpdate' => 'ctype_digit', + 'positionType' => function($type) { return in_array($type, ['CORRECTED']); }, + 'colorType' => function($type) { return in_array($type, ['ROUTE_BASED']); }, + ], +]; +$rewrite = [ + '/lookup/autocomplete/json' => '/services/lookup/autocomplete/json', + '/passageInfo/stopPassages/stop' => '/services/passageInfo/stopPassages/stop', + '/routeInfo/routeStops' => '/services/routeInfo/routeStops', + '/internetservice/geoserviceDispatcher/services/pathinfo/vehicle' => '/geoserviceDispatcher/services/pathinfo/vehicle', +]; + +$path = $_SERVER['PATH_INFO']; + +if(isset($rewrite[$path])) { + $path = $rewrite[$path]; +} + +if(!isset($method[$path])) { + header('HTTP/1.1 403 Forbidden'); + die('Forbidden'); +} + +$parameters = []; + +foreach($method[$path] as $name => $filter) { + if(!isset($_GET[$name])) { + header('HTTP/1.1 403 Forbidden'); + die('Parameter '.$name.' is required'); + } + + if(!$filter($_GET[$name])) { + header('HTTP/1.1 403 Forbidden'); + die('Parameter '.$name.' has invalid value'); + } + + $parameters[$name] = $_GET[$name]; +} + +$result = @file_get_contents($base_proxy . $path . '?' . http_build_query($parameters)); +if(!$result OR $http_response_header[0] != 'HTTP/1.1 200 OK') { + header('HTTP/1.1 503 Service Unavailable'); + if(isset($http_response_header[0])) { + die($http_response_header[0]); + } else { + die('Unknown error'); + } +} + +header('Content-Type: application/json'); +echo $result; diff --git a/proxy_tram.php b/proxy_tram.php new file mode 100644 index 0000000..f24d447 --- /dev/null +++ b/proxy_tram.php @@ -0,0 +1,117 @@ +<?php +function is_number($str) { + $str = (string)$str; + + return + ctype_digit($str) + OR + ( + substr($str, 0, 1) == '-' + AND + ctype_digit(substr($str, 1)) + ); +} + +$base_proxy = 'http://www.ttss.krakow.pl/internetservice'; +$method = [ + '/services/lookup/autocomplete/json' => [ + 'query' => function() { return TRUE; }, + ], + '/services/passageInfo/stopPassages/stop' => [ + 'stop' => 'ctype_alnum', + 'mode' => function($mode) { return in_array($mode, ['arrival', 'departure']); }, + #'startTime' => 'ctype_digit', + #'timeFrame' => 'ctype_digit', + ], + '/services/passageInfo/stopPassages/stopPoint' => [ + 'stopPoint' => 'is_number', + 'mode' => function($mode) { return in_array($mode, ['arrival', 'departure']); }, + #'startTime' => 'ctype_digit', + #'timeFrame' => 'ctype_digit', + ], + '/services/tripInfo/tripPassages' => [ + 'tripId' => 'ctype_digit', + 'mode' => function($mode) { return in_array($mode, ['arrival', 'departure']); }, + #'vehicleId' => 'ctype_digit', + ], + '/services/routeInfo/routeStops' => [ + 'routeId' => 'ctype_alnum', + ], + '/services/stopInfo/stop' => [ + 'stop' => 'is_number', + ], + '/services/stopInfo/stopPoint' => [ + 'stopPoint' => 'is_number', + ], + + '/geoserviceDispatcher/services/stopinfo/stops' => [ + 'left' => 'is_number', + 'bottom' => 'is_number', + 'right' => 'is_number', + 'top' => 'is_number', + ], + '/geoserviceDispatcher/services/stopinfo/stopPoints' => [ + 'left' => 'is_number', + 'bottom' => 'is_number', + 'right' => 'is_number', + 'top' => 'is_number', + ], + '/geoserviceDispatcher/services/pathinfo/route' => [ + 'id' => 'is_number', + 'direction' => 'is_number', + ], + '/geoserviceDispatcher/services/pathinfo/vehicle' => [ + 'id' => 'is_number', + ], + '/geoserviceDispatcher/services/vehicleinfo/vehicles' => [ + 'lastUpdate' => 'ctype_digit', + 'positionType' => function($type) { return in_array($type, ['CORRECTED']); }, + 'colorType' => function($type) { return in_array($type, ['ROUTE_BASED']); }, + ], +]; +$rewrite = [ + '/lookup/autocomplete/json' => '/services/lookup/autocomplete/json', + '/passageInfo/stopPassages/stop' => '/services/passageInfo/stopPassages/stop', + '/routeInfo/routeStops' => '/services/routeInfo/routeStops', + '/internetservice/geoserviceDispatcher/services/pathinfo/vehicle' => '/geoserviceDispatcher/services/pathinfo/vehicle', +]; + +$path = $_SERVER['PATH_INFO']; + +if(isset($rewrite[$path])) { + $path = $rewrite[$path]; +} + +if(!isset($method[$path])) { + header('HTTP/1.1 403 Forbidden'); + die('Forbidden'); +} + +$parameters = []; + +foreach($method[$path] as $name => $filter) { + if(!isset($_GET[$name])) { + header('HTTP/1.1 403 Forbidden'); + die('Parameter '.$name.' is required'); + } + + if(!$filter($_GET[$name])) { + header('HTTP/1.1 403 Forbidden'); + die('Parameter '.$name.' has invalid value'); + } + + $parameters[$name] = $_GET[$name]; +} + +$result = @file_get_contents($base_proxy . $path . '?' . http_build_query($parameters)); +if(!$result OR $http_response_header[0] != 'HTTP/1.1 200 OK') { + header('HTTP/1.1 503 Service Unavailable'); + if(isset($http_response_header[0])) { + die($http_response_header[0]); + } else { + die('Unknown error'); + } +} + +header('Content-Type: application/json'); +echo $result; -- Gitblit v1.9.1