From fe8ee65deda6790f6fd7abc9f88ca58c44e49368 Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Fri, 21 Jun 2019 11:25:55 +0000 Subject: [PATCH] Add LICENSE and README.md --- lib/mapper.php | 60 ++++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 36 insertions(+), 24 deletions(-) diff --git a/lib/mapper.php b/lib/mapper.php index a993f4c..1eeb1d2 100644 --- a/lib/mapper.php +++ b/lib/mapper.php @@ -5,8 +5,10 @@ use transit_realtime\FeedMessage; class Mapper { - private $jsonTrips = []; - private $gtfsTrips = []; + private $ttssDate = NULL; + private $ttssTrips = []; + private $gtfsrtDate = NULL; + private $gtfsrtTrips = []; private $logger = NULL; private $specialNames = [ @@ -27,8 +29,9 @@ } public function loadTTSS($file) { - $json = json_decode(file_get_contents($file)); - foreach($json->vehicles as $vehicle) { + $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; if(!isset($vehicle->name) || !$vehicle->name) continue; @@ -39,26 +42,31 @@ continue; } } - $this->jsonTrips[(int)$vehicle->tripId] = [ + $this->ttssTrips[(int)$vehicle->tripId] = [ 'id' => $vehicle->id, 'latitude' => (float)$vehicle->latitude / 3600000.0, 'longitude' => (float)$vehicle->longitude / 3600000.0, ]; } - ksort($this->jsonTrips); + ksort($this->ttssTrips); } - public function loadGTFS($file) { + 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(); $vehicle = $vehiclePosition->getVehicle(); $trip = $vehiclePosition->getTrip(); $tripId = $trip->getTripId(); - $this->gtfsTrips[self::convertTripId($tripId)] = [ + $this->gtfsrtTrips[self::convertTripId($tripId)] = [ 'id' => $entity->getId(), 'num' => $vehicle->getLicensePlate(), 'tripId' => $tripId, @@ -66,21 +74,25 @@ 'longitude' => $position->getLongitude(), ]; } - ksort($this->gtfsTrips); + ksort($this->gtfsrtTrips); + } + + public function getGTFSRTDate() { + return $this->gtfsrtDate; } public function findOffset() { - if(count($this->jsonTrips) == 0 || count($this->gtfsTrips) == 0) { + if(count($this->ttssTrips) == 0 || count($this->gtfsrtTrips) == 0) { return NULL; } - $jsonTripIds = array_keys($this->jsonTrips); - $gtfsTripIds = array_keys($this->gtfsTrips); + $ttssTripIds = array_keys($this->ttssTrips); + $gtfsTripIds = array_keys($this->gtfsrtTrips); $possibleOffsets = []; - for($i = 0; $i < count($this->jsonTrips); $i++) { - for($j = 0; $j < count($this->gtfsTrips); $j++) { - $possibleOffsets[$jsonTripIds[$i] - $gtfsTripIds[$j]] = TRUE; + for($i = 0; $i < count($this->ttssTrips); $i++) { + for($j = 0; $j < count($this->gtfsrtTrips); $j++) { + $possibleOffsets[$ttssTripIds[$i] - $gtfsTripIds[$j]] = TRUE; } } $possibleOffsets = array_keys($possibleOffsets); @@ -94,7 +106,7 @@ foreach($gtfsTripIds as $tripId) { $tripId += $offset; - if(isset($this->jsonTrips[$tripId])) { + if(isset($this->ttssTrips[$tripId])) { $matched++; } } @@ -114,23 +126,23 @@ return $bestOffset; } - public function getMapping($offset) { + public function mapUsingOffset($offset, $mapper) { $result = []; - foreach($this->gtfsTrips as $gtfsTripId => $gtfsTrip) { - $jsonTripId = $gtfsTripId + $offset; - if(isset($this->jsonTrips[$jsonTripId])) { - $data = numToTypeB($gtfsTrip['id']); + foreach($this->gtfsrtTrips as $gtfsTripId => $gtfsTrip) { + $ttssTripId = $gtfsTripId + $offset; + if(isset($this->ttssTrips[$ttssTripId])) { + $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 //$this->logger->warn('Got '.$num.', database has '.$data['num']); } - $result[$this->jsonTrips[$jsonTripId]['id']] = $data; + $result[$this->ttssTrips[$ttssTripId]['id']] = $data; } } return $result; -- Gitblit v1.9.1