From 8b6250cb5db8d1bb17902d45f08a2e929e8e0afd Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Sun, 23 Apr 2017 22:40:51 +0000 Subject: [PATCH] Add stop departures and vehicle route to pane --- proxy.php | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 deletions(-) diff --git a/proxy.php b/proxy.php index dad3670..9962f91 100644 --- a/proxy.php +++ b/proxy.php @@ -1,4 +1,17 @@ <?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' => [ @@ -7,6 +20,14 @@ '/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', @@ -14,7 +35,38 @@ #'vehicleId' => 'ctype_digit', ], '/services/routeInfo/routeStops' => [ - 'routeId' => 'ctype_alnum' + '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 = [ -- Gitblit v1.9.1