From 6aa16289a02219a8539c2114436fa279caf35375 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Wed, 22 Jan 2020 12:12:30 +0000
Subject: [PATCH] Add Stadler Tango RY825-859 to the repository
---
parse.php | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/parse.php b/parse.php
index 148962d..3252150 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();
@@ -76,18 +72,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 = Output::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...');
+
+ 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