From 7c2d04008df30360e5d9a2a53f42d77fa10757ea Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Sat, 17 Aug 2024 20:08:50 +0000 Subject: [PATCH] Implement a timeout on fetch request --- config.php | 26 +++++++------------------- 1 files changed, 7 insertions(+), 19 deletions(-) diff --git a/config.php b/config.php index 7dd7aff..44f6fbc 100644 --- a/config.php +++ b/config.php @@ -1,46 +1,34 @@ <?php -$tramTypes = new TramTypes(); $sources = [ 'bus' => [ - 'gtfsrt' => 'ftp://ztp.krakow.pl/VehiclePositions_A.pb', + 'gtfsrt' => 'http://gtfs.ztp.krakow.pl/VehiclePositions_A.pb', 'gtfsrt_file' => 'VehiclePositions_A.pb', 'ttss' => 'http://ttss.mpk.krakow.pl/internetservice/geoserviceDispatcher/services/vehicleinfo/vehicles', 'ttss_file' => 'vehicles_A.json', 'database' => 'mapping_A.sqlite3', 'result' => 'mapping_A.json', 'result_vehicles' => 'vehicles_A.html', - 'mapper' => new BusTypes(), + 'vehicle_types' => new BusTypes(), 'prefix' => 'b', ], 'tram' => [ - 'gtfsrt' => 'ftp://ztp.krakow.pl/VehiclePositions_T.pb', + 'gtfsrt' => 'http://gtfs.ztp.krakow.pl/VehiclePositions_T.pb', 'gtfsrt_file' => 'VehiclePositions_T.pb', - 'ttss' => 'http://www.ttss.krakow.pl/internetservice/geoserviceDispatcher/services/vehicleinfo/vehicles', + 'ttss' => 'http://www.ttss.krakow.pl/internetservice/geoserviceDispatcher/services/vehicleinfo/vehicles?positionType=CORRECTED', 'ttss_file' => 'vehicles_T.json', 'database' => 'mapping_T.sqlite3', 'result' => 'mapping_T.json', 'result_vehicles' => 'vehicles_T.html', - 'mapper' => $tramTypes, + 'vehicle_types' => new TramTypes(), 'prefix' => 't', ], - 'tram2' => [ - 'gtfsrt' => 'ftp://ztp.krakow.pl/VehiclePositions.pb', - 'gtfsrt_file' => 'VehiclePositions_T.pb', - 'ttss' => 'http://www.ttss.krakow.pl/internetservice/geoserviceDispatcher/services/vehicleinfo/vehicles', - 'ttss_file' => 'vehicles_T.json', - 'database' => 'mapping_T.sqlite3', - 'result' => 'mapping_T.json', - 'result_vehicles' => 'vehicles_T.html', - 'mapper' => $tramTypes, - 'prefix' => 't', - ], -]; +]; foreach($sources as $name => &$source) { foreach(['gtfsrt_file', 'ttss_file', 'database', 'result', 'result_vehicles'] as $field) { $source[$field] = __DIR__.'/data/'.$source[$field]; } - + $source['result_temp'] = $source['result'].'.tmp'; $source['result_vehicles_temp'] = $source['result_vehicles'].'.tmp'; } -- Gitblit v1.9.1