From bf4b8f1aadbe87edbae34368cc10d7b6e08ecbca Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Mon, 25 May 2020 15:16:53 +0000
Subject: [PATCH] Modify Stadler Tango depot assignment
---
parse.php | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/parse.php b/parse.php
index 148962d..c54f19d 100644
--- a/parse.php
+++ b/parse.php
@@ -1,23 +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/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']);
+ $logger->info('Fetching '.$name.' GTFS position data ...');
+ $updated = Fetch::auto($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']);
+ $logger->info('Fetching '.$name.' TTSS position data...');
+ Fetch::auto($source['ttss'], $source['ttss_file']);
$logger->info('Loading data...');
$mapper = new Mapper();
@@ -43,7 +39,7 @@
}
$logger->info('Got offset '.$offset.', creating mapping...');
- $mapping = $mapper->mapUsingOffset($offset);
+ $mapping = $mapper->mapVehicleIdsUsingOffset($offset);
$logger->info('Checking the data for correctness...');
$weight = count($mapping);
@@ -76,18 +72,18 @@
throw new Exception('Ignoring result due to better data already present');
}
- $db->addMapping($mapping);
+ $output = new Output($db, $mapper, $source['vehicle_types']);
- $jsonContent = [];
- foreach($db->getAll() as $vehicle) {
- $jsonContent[$vehicle['id']] = $source['mapper']($vehicle['num']);
- }
+ $logger->info('Saving mapping...');
- $json = json_encode($jsonContent);
- if(!file_put_contents($source['result_temp'], $json)) {
- throw new Exception('Result save failed');
- }
- rename($source['result_temp'], $source['result']);
+ $db->addMapping($mapping, $mapper);
+
+ $fullMapping = $output->createMapping($source);
+
+ $logger->info('Creating vehicle list...');
+
+ $output->createVehiclesList($fullMapping, $source);
+
$logger->info('Finished');
} catch(Throwable $e) {
$logger->error($e->getMessage(), ['exception' => $e, 'exception_string' => (string)$e]);
--
Gitblit v1.9.1