From 3d1e543a6771b8c532ae90d06f5094790d7f39f1 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Tue, 28 Jan 2020 18:22:58 +0000
Subject: [PATCH] Put full vehicle number and link to the map in vehicles.html tpl
---
config.php | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/config.php b/config.php
index 2982b7e..3b1ce68 100644
--- a/config.php
+++ b/config.php
@@ -1,38 +1,35 @@
<?php
$sources = [
'bus' => [
- 'gtfsrt' => 'ftp://ztp.krakow.pl/VehiclePositions_A.pb',
+ 'gtfsrt' => 'ftp://zdmk.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',
- 'mapper' => 'numToTypeB',
+ 'result_vehicles' => 'vehicles_A.html',
+ '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',
- 'mapper' => 'numToTypeT',
+ 'result_vehicles' => 'vehicles_T.html',
+ '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',
- 'mapper' => 'numToTypeT',
- ],
-];
+];
foreach($sources as $name => &$source) {
- foreach(['gtfsrt_file', 'ttss_file', 'database', 'result'] as $field) {
+ 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';
}
unset($source);
--
Gitblit v1.9.1