From 0b6d2f4164b9d823fb2a49d9fb4e83242f695e09 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sun, 30 Jun 2019 21:59:01 +0000
Subject: [PATCH] Update README - include requirements and info on running composer

---
 parse.php |   22 ++++------------------
 1 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/parse.php b/parse.php
index ebd18cd..b26114c 100644
--- a/parse.php
+++ b/parse.php
@@ -1,24 +1,19 @@
 <?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');
 require_once(__DIR__.'/config.php');
 
 foreach($sources as $name => $source) {
 	$logger = new Monolog\Logger('fetch_'.$name);
 	try {
 		$logger->info('Fetching '.$name.' position data from FTP...');
-		$updated = ftp_fetch_if_newer($source['gtfsrt'], $source['gtfsrt_file']);
+		$updated = Fetch::ftp($source['gtfsrt'], $source['gtfsrt_file']);
 		if(!$updated) {
 			$logger->info('Nothing to do, remote file not newer than local one');
 			continue;
 		}
 		
 		$logger->info('Fetching '.$name.' position data from TTSS...');
-		fetch($source['ttss'], $source['ttss_file']);
+		Fetch::generic($source['ttss'], $source['ttss_file']);
 		
 		$logger->info('Loading data...');
 		$mapper = new Mapper();
@@ -82,21 +77,12 @@
 		
 		$db->addMapping($mapping);
 		
-		$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']);
+		$finalMapping = Output::createMapping($db, $source['mapper'], $source);
 		
 		
 		$logger->info('Creating vehicle list...');
 		
-		createVehiclesList($mapper->getTTSSTrips(), $jsonContent, $source);
+		Output::createVehiclesList($mapper->getTTSSTrips(), $finalMapping, $source);
 		
 		$logger->info('Finished');
 	} catch(Throwable $e) {

--
Gitblit v1.9.1