add datahub

vatger · Dec 9, 2023 · fef37dd · fef37dd
1 parent dd4d5de
commit fef37dd
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 60 deletions.
diff --git a/data/edff_allstations.csv b/data/edff_allstations.csv
diff --git a/data/edff_minstations.csv b/data/edff_minstations.csv
diff --git a/data/edff_weekly.json b/data/edff_weekly.json
diff --git a/data/edll_allstations.csv b/data/edll_allstations.csv
diff --git a/data/edll_minstations.csv b/data/edll_minstations.csv
diff --git a/data/edll_weekly.json b/data/edll_weekly.json
diff --git a/datahub.class.php b/datahub.class.php
@@ -1,4 +1,5 @@
 <?php
+include_once("conf.php");
 
 class Datahub
 {

diff --git a/public/edff/index.php b/public/edff/index.php
@@ -9,10 +9,12 @@
     $MASTER_DATE->add(new DateInterval('P7D'));
 }
 
-$weeklyBookings = Datahub::get_weekly_data('edff');
+$key = 'edff';
 
-$min_stations = Datahub::get_stations_data('edff', true);
-$main_stations = Datahub::get_stations_data('edff', false);
+$weeklyBookings = Datahub::get_weekly_data($key);
+
+$min_stations = Datahub::get_stations_data($key, true);
+$main_stations = Datahub::get_stations_data($key, false);
 
 
 $booked_stations = DataManager::get_matched_station_array_bookings(clone $MASTER_DATE, 7, $main_stations);

diff --git a/public/edll/index.php b/public/edll/index.php
@@ -1,28 +1,23 @@
 <?php
-require_once ("../../conf.php");
+require_once("../../conf.php");
 require_once(_BASE_PATH_ . "datamanager.class.php");
+require_once(_BASE_PATH_ . "datahub.class.php");
 require_once(_BASE_PATH_ . "imagerenderer.class.php");
 
 $MASTER_DATE = new DateTime();
 if (isset($_GET['nextWeek'])) {
     $MASTER_DATE->add(new DateInterval('P7D'));
 }
 
+$key = 'edll';
 
-$stationsFile = fopen(_DATA_PATH_ . "edll_allstations.csv", "r") or die("Unable to open allstations file!");
-$minStationsFile = fopen(_DATA_PATH_ . "edll_minstations.csv", "r") or die("Unable to open minstations file!");
-$allStationsString = fgets($stationsFile);
-$minStationsString = fgets($minStationsFile);
+$weeklyBookings = Datahub::get_weekly_data($key);
 
+$min_stations = Datahub::get_stations_data($key, true);
+$main_stations = Datahub::get_stations_data($key, false);
 
-$bookingsString = file_get_contents(_DATA_PATH_ . "edll_weekly.json") or die("Unable to open weekly file!");
-$weeklyBookings = json_decode($bookingsString);
 
-
-$min_stations = explode(',',$minStationsString);
-$main_stations =  explode(',',$allStationsString);
-
-$booked_stations = DataManager::get_matched_station_array_bookings(clone $MASTER_DATE,7 , $main_stations);
+$booked_stations = DataManager::get_matched_station_array_bookings(clone $MASTER_DATE, 7, $main_stations);
 
 $img = ImageRenderer::render($min_stations, $main_stations, $booked_stations, $MASTER_DATE, $weeklyBookings);
 

diff --git a/public/edmm/index.php b/public/edmm/index.php
@@ -1,28 +1,23 @@
 <?php
-require_once ("../../conf.php");
+require_once("../../conf.php");
 require_once(_BASE_PATH_ . "datamanager.class.php");
+require_once(_BASE_PATH_ . "datahub.class.php");
 require_once(_BASE_PATH_ . "imagerenderer.class.php");
 
 $MASTER_DATE = new DateTime();
 if (isset($_GET['nextWeek'])) {
     $MASTER_DATE->add(new DateInterval('P7D'));
 }
 
+$key = 'edmm';
 
-$stationsFile = fopen(_DATA_PATH_ . "edmm_allstations.csv", "r") or die("Unable to open allstations file!");
-$minStationsFile = fopen(_DATA_PATH_ . "edmm_minstations.csv", "r") or die("Unable to open minstations file!");
-$allStationsString = fgets($stationsFile);
-$minStationsString = fgets($minStationsFile);
+$weeklyBookings = Datahub::get_weekly_data($key);
 
+$min_stations = Datahub::get_stations_data($key, true);
+$main_stations = Datahub::get_stations_data($key, false);
 
-$bookingsString = file_get_contents(_DATA_PATH_ . "edmm_weekly.json") or die("Unable to open weekly file!");
-$weeklyBookings = json_decode($bookingsString);
 
-
-$min_stations = explode(',',$minStationsString);
-$main_stations =  explode(',',$allStationsString);
-
-$booked_stations = DataManager::get_matched_station_array_bookings(clone $MASTER_DATE,7 , $main_stations);
+$booked_stations = DataManager::get_matched_station_array_bookings(clone $MASTER_DATE, 7, $main_stations);
 
 $img = ImageRenderer::render($min_stations, $main_stations, $booked_stations, $MASTER_DATE, $weeklyBookings);