From 288a26c12445d7fb4f4e4d11b760744632058383 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Tue, 18 Jun 2019 07:55:42 +0000
Subject: [PATCH] Use GTFS ID when vehicle license plate is not available
---
lib/mapper.php | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/lib/mapper.php b/lib/mapper.php
index 43dd085..afd2c44 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,17 +126,17 @@
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,
- 'low' => 2,
+ 'num' => $num ?: $gtfsTrip['id'],
+ 'low' => NULL,
];
} elseif($data['num'] != $num) {
// Ignore due to incorrect depot markings in the data
--
Gitblit v1.9.1