From bcd661488de087afab096c18aa55eda42e8c5226 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sun, 30 Jun 2019 21:59:01 +0000
Subject: [PATCH] Move functions into classes to make them autoloader-compatibile
---
config.php | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/config.php b/config.php
index 2982b7e..7dd7aff 100644
--- a/config.php
+++ b/config.php
@@ -1,4 +1,5 @@
<?php
+$tramTypes = new TramTypes();
$sources = [
'bus' => [
'gtfsrt' => 'ftp://ztp.krakow.pl/VehiclePositions_A.pb',
@@ -7,7 +8,9 @@
'ttss_file' => 'vehicles_A.json',
'database' => 'mapping_A.sqlite3',
'result' => 'mapping_A.json',
- 'mapper' => 'numToTypeB',
+ 'result_vehicles' => 'vehicles_A.html',
+ 'mapper' => new BusTypes(),
+ 'prefix' => 'b',
],
'tram' => [
'gtfsrt' => 'ftp://ztp.krakow.pl/VehiclePositions_T.pb',
@@ -16,7 +19,9 @@
'ttss_file' => 'vehicles_T.json',
'database' => 'mapping_T.sqlite3',
'result' => 'mapping_T.json',
- 'mapper' => 'numToTypeT',
+ 'result_vehicles' => 'vehicles_T.html',
+ 'mapper' => $tramTypes,
+ 'prefix' => 't',
],
'tram2' => [
'gtfsrt' => 'ftp://ztp.krakow.pl/VehiclePositions.pb',
@@ -25,14 +30,18 @@
'ttss_file' => 'vehicles_T.json',
'database' => 'mapping_T.sqlite3',
'result' => 'mapping_T.json',
- 'mapper' => 'numToTypeT',
+ 'result_vehicles' => 'vehicles_T.html',
+ 'mapper' => $tramTypes,
+ 'prefix' => 't',
],
];
foreach($sources as $name => &$source) {
- foreach(['gtfsrt_file', 'ttss_file', 'database', 'result'] as $field) {
+ foreach(['gtfsrt_file', 'ttss_file', 'database', 'result', 'result_vehicles'] as $field) {
$source[$field] = __DIR__.'/data/'.$source[$field];
}
+
$source['result_temp'] = $source['result'].'.tmp';
+ $source['result_vehicles_temp'] = $source['result_vehicles'].'.tmp';
}
unset($source);
--
Gitblit v1.9.1