From 8cde7c538ea1d0d8aa51bcb3f2482ae4f19713ad Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Mon, 24 Jul 2023 20:57:02 +0000
Subject: [PATCH] Move BH072-095 to BH410-433

---
 parse.php |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/parse.php b/parse.php
index 3252150..c54f19d 100644
--- a/parse.php
+++ b/parse.php
@@ -39,7 +39,7 @@
 		}
 		
 		$logger->info('Got offset '.$offset.', creating mapping...');
-		$mapping = $mapper->mapUsingOffset($offset);
+		$mapping = $mapper->mapVehicleIdsUsingOffset($offset);
 		
 		$logger->info('Checking the data for correctness...');
 		$weight = count($mapping);
@@ -72,17 +72,17 @@
 			throw new Exception('Ignoring result due to better data already present');
 		}
 		
+		$output = new Output($db, $mapper, $source['vehicle_types']);
 		
-		$logger->info('Creating mapping...');
+		$logger->info('Saving mapping...');
 		
-		$db->addMapping($mapping);
+		$db->addMapping($mapping, $mapper);
 		
-		$finalMapping = Output::createMapping($db, $source['mapper'], $source);
-		
+		$fullMapping = $output->createMapping($source);
 		
 		$logger->info('Creating vehicle list...');
 		
-		Output::createVehiclesList($mapper->getTTSSTrips(), $finalMapping, $source);
+		$output->createVehiclesList($fullMapping, $source);
 		
 		$logger->info('Finished');
 	} catch(Throwable $e) {

--
Gitblit v1.9.1