From 2bac868d6e5421e78b4aeaead798cec9e6d3041f Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Tue, 18 Jun 2019 07:57:44 +0000
Subject: [PATCH] Add '??' prefix when using GTFS vehicle ID
---
parse.php | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/parse.php b/parse.php
index 419ee15..c9cde1d 100644
--- a/parse.php
+++ b/parse.php
@@ -13,6 +13,16 @@
'ttss_file' => 'vehicles_A.json',
'database' => 'mapping_A.sqlite3',
'result' => 'mapping_A.json',
+ 'mapper' => 'numToTypeB',
+ ],
+ 'tram' => [
+ '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',
],
];
@@ -39,13 +49,13 @@
$mapper->loadTTSS($source['ttss_file']);
$timeDifference = time() - $mapper->getTTSSDate();
- if(abs($timeDifference) > 60) {
+ if(abs($timeDifference) > 120) {
throw new Exception('TTSS timestamp difference ('.$timeDifference.'s) is too high, aborting!');
}
$mapper->loadGTFSRT($source['gtfsrt_file']);
$timeDifference = time() - $mapper->getGTFSRTDate();
- if(abs($timeDifference) > 60) {
+ if(abs($timeDifference) > 120) {
throw new Exception('GTFSRT timestamp difference ('.$timeDifference.'s) is too high, aborting!');
}
@@ -58,7 +68,7 @@
}
$logger->info('Got offset '.$offset.', creating mapping...');
- $mapping = $mapper->mapUsingOffset($offset);
+ $mapping = $mapper->mapUsingOffset($offset, $source['mapper']);
$logger->info('Checking the data for correctness...');
$weight = count($mapping);
--
Gitblit v1.9.1