From 86e6f6d9c9c0340d32fb9fbf93fdc938bef75bcf Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sun, 20 Jun 2021 20:01:20 +0000
Subject: [PATCH] Update bus types: DN001, PA100-PA101, BR564-BR568, PR767-PR768, PR777

---
 lib/Mapper.php |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/lib/Mapper.php b/lib/Mapper.php
index a36b4ef..7f0e701 100644
--- a/lib/Mapper.php
+++ b/lib/Mapper.php
@@ -4,6 +4,7 @@
 class Mapper {
 	private $ttssDate = NULL;
 	private $ttssTrips = [];
+	private $ttssVehicleToTrip = [];
 	private $gtfsrtDate = NULL;
 	private $gtfsrtTrips = [];
 	private $logger = NULL;
@@ -35,18 +36,15 @@
 			if(!isset($vehicle->latitude) || !$vehicle->latitude) continue;
 			if(!isset($vehicle->longitude) || !$vehicle->longitude) continue;
 			list($line, $direction) = explode(' ', $vehicle->name, 2);
-			foreach($this->specialNames as $specialName) {
-				if(substr($vehicle->name, -strlen($specialName)) == $specialName) {
-					continue;
-				}
-			}
-			$this->ttssTrips[(string)$vehicle->tripId] = [
+			$trip = [
 				'id' => (string)$vehicle->id,
 				'line' => $line,
 				'direction' => $direction,
 				'latitude' => (float)$vehicle->latitude / 3600000.0,
 				'longitude' => (float)$vehicle->longitude / 3600000.0,
 			];
+			$this->ttssTrips[(string)$vehicle->tripId] = $trip;
+			$this->ttssVehicleToTrip[(string)$vehicle->id] = $trip;
 		}
 		ksort($this->ttssTrips);
 	}
@@ -57,6 +55,18 @@
 	
 	public function getTTSSTrips() {
 		return $this->ttssTrips;
+	}
+	
+	public function getTTSSVehicleToTrip() {
+		return $this->ttssVehicleToTrip;
+	}
+	
+	public function getTTSSTrip($id) {
+		return $this->ttssTrips[$id] ?? NULL;
+	}
+	
+	public function getTTSSVehicleTrip($id) {
+		return $this->ttssVehicleToTrip[$id] ?? NULL;
 	}
 	
 	public function loadGTFSRT($file) {
@@ -130,7 +140,7 @@
 		return $bestOffset;
 	}
 	
-	public function mapUsingOffset($offset) {
+	public function mapVehicleIdsUsingOffset($offset) {
 		$result = [];
 		foreach($this->gtfsrtTrips as $gtfsTripId => $gtfsTrip) {
 			$ttssTripId = $gtfsTripId + $offset;

--
Gitblit v1.9.1