From 6aa16289a02219a8539c2114436fa279caf35375 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Wed, 22 Jan 2020 12:12:30 +0000
Subject: [PATCH] Add Stadler Tango RY825-859 to the repository

---
 config.php |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/config.php b/config.php
index 2982b7e..3bb0f3a 100644
--- a/config.php
+++ b/config.php
@@ -1,38 +1,36 @@
 <?php
+$tramTypes = new TramTypes();
 $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',
+		'mapper' => new BusTypes(),
+		'prefix' => 'b',
 	],
 	'tram' => [
-		'gtfsrt' => 'ftp://ztp.krakow.pl/VehiclePositions_T.pb',
+		'gtfsrt' => 'ftp://zdmk.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',
+		'mapper' => $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