From a3d09166cbbe6f8c62ad56d8432f4bc6dff0ed5b Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sat, 22 Jun 2019 20:16:21 +0000
Subject: [PATCH] Add "Generated at" to tables with vehicle types

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

diff --git a/parse.php b/parse.php
index 9e66121..92acb04 100644
--- a/parse.php
+++ b/parse.php
@@ -1,47 +1,15 @@
 <?php
+require_once(__DIR__.'/vendor/autoload.php');
 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');
-
-$sources = [
-	'bus' => [
-		'gtfsrt' => 'ftp://ztp.krakow.pl/VehiclePositions_A.pb',
-		'gtfsrt_file' => 'VehiclePositions_A.pb',
-		'ttss' => 'http://ttss.mpk.krakow.pl/internetservice/geoserviceDispatcher/services/vehicleinfo/vehicles',
-		'ttss_file' => 'vehicles_A.json',
-		'database' => 'mapping_A.sqlite3',
-		'result' => 'mapping_A.json',
-		'mapper' => 'numToTypeB',
-	],
-	'tram' => [
-		'gtfsrt' => 'ftp://ztp.krakow.pl/VehiclePositions_T.pb',
-		'gtfsrt_file' => 'VehiclePositions_T.pb',
-		'ttss' => 'http://www.ttss.krakow.pl/internetservice/geoserviceDispatcher/services/vehicleinfo/vehicles',
-		'ttss_file' => 'vehicles_T.json',
-		'database' => 'mapping_T.sqlite3',
-		'result' => 'mapping_T.json',
-		'mapper' => 'numToTypeT',
-	],
-	'tram2' => [
-		'gtfsrt' => 'ftp://ztp.krakow.pl/VehiclePositions.pb',
-		'gtfsrt_file' => 'VehiclePositions_T.pb',
-		'ttss' => 'http://www.ttss.krakow.pl/internetservice/geoserviceDispatcher/services/vehicleinfo/vehicles',
-		'ttss_file' => 'vehicles_T.json',
-		'database' => 'mapping_T.sqlite3',
-		'result' => 'mapping_T.json',
-		'mapper' => 'numToTypeT',
-	],
-];
+require_once(__DIR__.'/config.php');
 
 foreach($sources as $name => $source) {
 	$logger = new Monolog\Logger('fetch_'.$name);
 	try {
-		foreach(['gtfsrt_file', 'ttss_file', 'database', 'result'] as $field) {
-			$source[$field] = __DIR__.'/data/'.$source[$field];
-		}
-		$source['result_temp'] = $source['result'].'.tmp';
-		
 		$logger->info('Fetching '.$name.' position data from FTP...');
 		$updated = ftp_fetch_if_newer($source['gtfsrt'], $source['gtfsrt_file']);
 		if(!$updated) {
@@ -109,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