From 9970fbd17d1a67efad67f3dafaa07730f83210b5 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Mon, 17 Jun 2019 15:48:12 +0000
Subject: [PATCH] Add mapping function as Mapper::mapUsingOffset() parameter
---
lib/mapper.php | 4 ++--
parse.php | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/lib/mapper.php b/lib/mapper.php
index 453db3f..65987a4 100644
--- a/lib/mapper.php
+++ b/lib/mapper.php
@@ -126,12 +126,12 @@
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 = [
diff --git a/parse.php b/parse.php
index 419ee15..3660f53 100644
--- a/parse.php
+++ b/parse.php
@@ -13,6 +13,7 @@
'ttss_file' => 'vehicles_A.json',
'database' => 'mapping_A.sqlite3',
'result' => 'mapping_A.json',
+ 'mapper' => 'numToTypeB',
],
];
@@ -58,7 +59,7 @@
}
$logger->info('Got offset '.$offset.', creating mapping...');
- $mapping = $mapper->mapUsingOffset($offset);
+ $mapping = $mapper->mapUsingOffset($offset, $source['mapper']);
$logger->info('Checking the data for correctness...');
$weight = count($mapping);
--
Gitblit v1.9.1