From 42f5b96640a2fe6986849f96228a80e294cf353e Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Mon, 17 Jun 2019 15:57:54 +0000
Subject: [PATCH] Do not output null if no vehicle number is present in GTFS
---
lib/mapper.php | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/lib/mapper.php b/lib/mapper.php
index 43dd085..3eb7912 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();
@@ -67,6 +75,10 @@
];
}
ksort($this->gtfsrtTrips);
+ }
+
+ public function getGTFSRTDate() {
+ return $this->gtfsrtDate;
}
public function findOffset() {
@@ -114,16 +126,16 @@
return $bestOffset;
}
- public function mapUsingOffset($offset) {
+ public function mapUsingOffset($offset, $mapper) {
$result = [];
foreach($this->gtfsrtTrips as $gtfsTripId => $gtfsTrip) {
$ttssTripId = $gtfsTripId + $offset;
if(isset($this->ttssTrips[$ttssTripId])) {
- $data = numToTypeB($gtfsTrip['id']);
+ $data = $mapper($gtfsTrip['id']);
$num = $gtfsTrip['num'];
if(!is_array($data) || !isset($data['num'])) {
$data = [
- 'num' => $num,
+ 'num' => $num ?: '',
'low' => 2,
];
} elseif($data['num'] != $num) {
--
Gitblit v1.9.1