From 9419f76eae6a64f329c7fe4df2bf9c5a2ef94f93 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Tue, 23 Jul 2019 21:54:40 +0000
Subject: [PATCH] Allow to fetch GTFS data from sources other than FTP servers
---
parse.php | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/parse.php b/parse.php
index 3a81aa1..3252150 100644
--- a/parse.php
+++ b/parse.php
@@ -1,22 +1,19 @@
<?php
require_once(__DIR__.'/vendor/autoload.php');
-require_once(__DIR__.'/lib/fetch.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();
@@ -80,12 +77,12 @@
$db->addMapping($mapping);
- $finalMapping = createMapping($db, $source['mapper'], $source);
+ $finalMapping = Output::createMapping($db, $source['mapper'], $source);
$logger->info('Creating vehicle list...');
- createVehiclesList($mapper->getTTSSTrips(), $finalMapping, $source);
+ Output::createVehiclesList($mapper->getTTSSTrips(), $finalMapping, $source);
$logger->info('Finished');
} catch(Throwable $e) {
--
Gitblit v1.9.1