From ea2e9b41b3b1eace8e99d6e2672ffffb07665e04 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Fri, 21 Jun 2019 11:46:18 +0000
Subject: [PATCH] Add regenerate.php to recreate JSON files in case of manual changes

---
 parse.php |   37 ++-----------------------------------
 1 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/parse.php b/parse.php
index 9e66121..148962d 100644
--- a/parse.php
+++ b/parse.php
@@ -1,47 +1,14 @@
 <?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/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) {

--
Gitblit v1.9.1