From 3d1e543a6771b8c532ae90d06f5094790d7f39f1 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Tue, 28 Jan 2020 18:22:58 +0000
Subject: [PATCH] Put full vehicle number and link to the map in vehicles.html tpl
---
parse.php | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/parse.php b/parse.php
index 92acb04..c54f19d 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']);
+ $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();
@@ -44,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);
@@ -77,17 +72,17 @@
throw new Exception('Ignoring result due to better data already present');
}
+ $output = new Output($db, $mapper, $source['vehicle_types']);
- $logger->info('Creating mapping...');
+ $logger->info('Saving mapping...');
- $db->addMapping($mapping);
+ $db->addMapping($mapping, $mapper);
- $finalMapping = createMapping($db, $source['mapper'], $source);
-
+ $fullMapping = $output->createMapping($source);
$logger->info('Creating vehicle list...');
- createVehiclesList($mapper->getTTSSTrips(), $finalMapping, $source);
+ $output->createVehiclesList($fullMapping, $source);
$logger->info('Finished');
} catch(Throwable $e) {
--
Gitblit v1.9.1