From 9afb6bced6e66683efe2ba570fccecbe754bfde7 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Mon, 10 Jun 2019 20:44:20 +0000
Subject: [PATCH] Check if data timestamps are recent before doing any DB changes
---
lib/mapper.php | 12 ++++++++++++
parse.php | 10 ++++++++++
2 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/lib/mapper.php b/lib/mapper.php
index 43dd085..453db3f 100644
--- a/lib/mapper.php
+++ b/lib/mapper.php
@@ -5,7 +5,9 @@
use transit_realtime\FeedMessage;
class Mapper {
+ private $ttssDate = NULL;
private $ttssTrips = [];
+ private $gtfsrtDate = NULL;
private $gtfsrtTrips = [];
private $logger = NULL;
@@ -28,6 +30,7 @@
public function loadTTSS($file) {
$ttss = json_decode(file_get_contents($file));
+ $this->ttssDate = $ttss->lastUpdate;
foreach($ttss->vehicles as $vehicle) {
if(isset($vehicle->isDeleted) && $vehicle->isDeleted) continue;
if(!isset($vehicle->tripId) || !$vehicle->tripId) continue;
@@ -48,10 +51,15 @@
ksort($this->ttssTrips);
}
+ public function getTTSSDate() {
+ return $this->ttssDate / 1000.0;
+ }
+
public function loadGTFSRT($file) {
$data = file_get_contents($file);
$feed = new FeedMessage();
$feed->parse($data);
+ $this->gtfsrtDate = $feed->header->timestamp;
foreach ($feed->getEntityList() as $entity) {
$vehiclePosition = $entity->getVehicle();
$position = $vehiclePosition->getPosition();
@@ -69,6 +77,10 @@
ksort($this->gtfsrtTrips);
}
+ public function getGTFSRTDate() {
+ return $this->gtfsrtDate;
+ }
+
public function findOffset() {
if(count($this->ttssTrips) == 0 || count($this->gtfsrtTrips) == 0) {
return NULL;
diff --git a/parse.php b/parse.php
index 94a59d9..b3014b8 100644
--- a/parse.php
+++ b/parse.php
@@ -36,8 +36,18 @@
$logger->info('Loading data...');
$mapper = new Mapper();
+
$mapper->loadTTSS($source['ttss_file']);
+ $timeDifference = time() - $mapper->getTTSSDate();
+ if(abs($timeDifference) > 60) {
+ 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) {
+ throw new Exception('GTFSRT timestamp difference ('.$timeDifference.'s) is too high, aborting!');
+ }
$db = new Database($source['database']);
--
Gitblit v1.9.1