From 978f77a82328250542c2baa73bc96a383501a269 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Thu, 20 Jun 2019 19:54:48 +0000
Subject: [PATCH] Change logic determining whether the file on server was updated
---
lib/mapper.php | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/mapper.php b/lib/mapper.php
index 453db3f..1eeb1d2 100644
--- a/lib/mapper.php
+++ b/lib/mapper.php
@@ -126,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