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 | 71 ++++++++---------------------------
1 files changed, 17 insertions(+), 54 deletions(-)
diff --git a/parse.php b/parse.php
index 9e66121..c54f19d 100644
--- a/parse.php
+++ b/parse.php
@@ -1,56 +1,19 @@
<?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');
-
-$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_T.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',
- ],
- 'tram2' => [
- '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']);
+ $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,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);
@@ -109,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