From 978f77a82328250542c2baa73bc96a383501a269 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Thu, 20 Jun 2019 19:54:48 +0000
Subject: [PATCH] Change logic determining whether the file on server was updated
---
parse.php | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/parse.php b/parse.php
index 3660f53..b517ae2 100644
--- a/parse.php
+++ b/parse.php
@@ -15,6 +15,24 @@
'result' => 'mapping_A.json',
'mapper' => 'numToTypeB',
],
+ 'tram' => [
+ 'gtfsrt' => 'ftp://ztp.krakow.pl/VehiclePositions_T.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',
+ ],
+ '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) {
@@ -40,13 +58,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!');
}
--
Gitblit v1.9.1