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 |   75 ++++++++++---------------------------
 1 files changed, 20 insertions(+), 55 deletions(-)

diff --git a/parse.php b/parse.php
index c9cde1d..b26114c 100644
--- a/parse.php
+++ b/parse.php
@@ -1,48 +1,19 @@
 <?php
-require_once(__DIR__.'/lib/database.php');
-require_once(__DIR__.'/lib/fetch.php');
-require_once(__DIR__.'/lib/mapper.php');
-
-$logger = new Monolog\Logger('Parse changes');
-
-$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.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__.'/vendor/autoload.php');
+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']);
+		$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();
@@ -68,7 +39,7 @@
 		}
 		
 		$logger->info('Got offset '.$offset.', creating mapping...');
-		$mapping = $mapper->mapUsingOffset($offset, $source['mapper']);
+		$mapping = $mapper->mapUsingOffset($offset);
 		
 		$logger->info('Checking the data for correctness...');
 		$weight = count($mapping);
@@ -77,11 +48,11 @@
 		$incorrect = 0;
 		$old = 0;
 		$maxWeight = 0;
-		foreach($mapping as $id => $vehicle) {
+		foreach($mapping as $id => $num) {
 			$dbVehicle = $db->getById($id);
 			if($dbVehicle) {
-				$maxWeight = max($maxWeight, $dbVehicle['weight']);
-				if((int)substr($vehicle['num'], 2) == (int)$dbVehicle['num']) {
+				$maxWeight = max($maxWeight, (int)$dbVehicle['weight']);
+				if($num === $dbVehicle['num']) {
 					$correct += 1;
 				} else {
 					$incorrect += 1;
@@ -89,36 +60,30 @@
 				continue;
 			}
 			
-			$dbVehicle = $db->getByNum($vehicle['num']);
-			if($dbVehicle && $dbVehicle['id'] != $id) {
+			$dbVehicle = $db->getByNum($num);
+			if($dbVehicle && $dbVehicle['id'] !== $id) {
 				$old += 1;
 			}
 		}
+
 		$logger->info('Weight: '.$weight.', correct: '.$correct.', incorrect: '.$incorrect.', old: '.$old);
 		
-		$previousMapping = NULL;
 		if($incorrect > $correct && $maxWeight > $weight) {
 			throw new Exception('Ignoring result due to better data already present');
-		} elseif($old > $correct) {
-			$logger->warn('Replacing DB data with the new mapping');
-			$db->clear();
-		} else {
-			$previousMapping = @json_decode(@file_get_contents($source['result']), TRUE);
 		}
+		
+		
+		$logger->info('Creating mapping...');
 		
 		$db->addMapping($mapping);
 		
-		if(is_array($previousMapping)) {
-			$logger->info('Merging previous data with current mapping');
-			$mapping = $mapping + $previousMapping;
-			ksort($mapping);
-		}
+		$finalMapping = Output::createMapping($db, $source['mapper'], $source);
 		
-		$json = json_encode($mapping);
-		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...');
+		
+		Output::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