From df2ceeed93732415b6067ff6ffa6e07224eef78e Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sat, 22 Jun 2019 20:10:36 +0000
Subject: [PATCH] Update GT8 tram subtypes (additional partially low-floor trams)

---
 parse.php |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/parse.php b/parse.php
index 148962d..92acb04 100644
--- a/parse.php
+++ b/parse.php
@@ -3,6 +3,7 @@
 require_once(__DIR__.'/lib/database.php');
 require_once(__DIR__.'/lib/fetch.php');
 require_once(__DIR__.'/lib/mapper.php');
+require_once(__DIR__.'/lib/output.php');
 require_once(__DIR__.'/lib/vehicle_types.php');
 require_once(__DIR__.'/config.php');
 
@@ -76,18 +77,18 @@
 			throw new Exception('Ignoring result due to better data already present');
 		}
 		
+		
+		$logger->info('Creating mapping...');
+		
 		$db->addMapping($mapping);
 		
-		$jsonContent = [];
-		foreach($db->getAll() as $vehicle) {
-			$jsonContent[$vehicle['id']] = $source['mapper']($vehicle['num']);
-		}
+		$finalMapping = createMapping($db, $source['mapper'], $source);
 		
-		$json = json_encode($jsonContent);
-		if(!file_put_contents($source['result_temp'], $json)) {
-			throw new Exception('Result save failed');
-		}
-		rename($source['result_temp'], $source['result']);
+		
+		$logger->info('Creating vehicle list...');
+		
+		createVehiclesList($mapper->getTTSSTrips(), $finalMapping, $source);
+		
 		$logger->info('Finished');
 	} catch(Throwable $e) {
 		$logger->error($e->getMessage(), ['exception' => $e, 'exception_string' => (string)$e]);

--
Gitblit v1.9.1