From 02a53d7b3ff661557e5c2902e8e924822cbe8d63 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Fri, 13 Nov 2020 11:16:12 +0000
Subject: [PATCH] Add bus DN006 (Solaris Urbino 18 III Electric)

---
 regenerate.php |   19 +++++--------------
 1 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/regenerate.php b/regenerate.php
index cd1186a..643a9f0 100644
--- a/regenerate.php
+++ b/regenerate.php
@@ -1,26 +1,17 @@
 <?php
 require_once(__DIR__.'/vendor/autoload.php');
-require_once(__DIR__.'/lib/database.php');
-require_once(__DIR__.'/lib/vehicle_types.php');
 require_once(__DIR__.'/config.php');
 
 foreach($sources as $name => $source) {
 	$logger = new Monolog\Logger('regenerate_'.$name);
 	try {
 		$logger->info('Regenerating '.$name.'...');
-		
 		$db = new Database($source['database']);
-		
-		$jsonContent = [];
-		foreach($db->getAll() as $vehicle) {
-			$jsonContent[$vehicle['id']] = $source['mapper']($vehicle['num']);
-		}
-		
-		$json = json_encode($jsonContent);
-		if(!file_put_contents($source['result_temp'], $json)) {
-			throw new Exception('Result save failed');
-		}
-		rename($source['result_temp'], $source['result']);
+		$mapper = new Mapper();
+		$mapper->loadTTSS($source['ttss_file']);
+		$output = new Output($db, $mapper, $source['vehicle_types']);
+		$fullMapping = $output->createMapping($source);
+		$output->createVehiclesList($fullMapping, $source);
 		$logger->info('Finished');
 	} catch(Throwable $e) {
 		$logger->error($e->getMessage(), ['exception' => $e, 'exception_string' => (string)$e]);

--
Gitblit v1.9.1