add datahub

vatger · Dec 10, 2023 · 116634b · 116634b
1 parent a3bde70
commit 116634b
Show file tree

Hide file tree

Showing 26 changed files with 37 additions and 247 deletions.
diff --git a/data/edbb_allstations.csv b/data/edbb_allstations.csv
diff --git a/data/edbb_minstations.csv b/data/edbb_minstations.csv
diff --git a/data/edbb_weekly.json b/data/edbb_weekly.json
diff --git a/data/edgg_allstations.csv b/data/edgg_allstations.csv
diff --git a/data/edgg_minstations.csv b/data/edgg_minstations.csv
diff --git a/data/edgg_weekly.json b/data/edgg_weekly.json
diff --git a/data/edmm_allstations.csv b/data/edmm_allstations.csv
diff --git a/data/edmm_minstations.csv b/data/edmm_minstations.csv
diff --git a/data/edmm_weekly.json b/data/edmm_weekly.json
diff --git a/data/edww_allstations.csv b/data/edww_allstations.csv
diff --git a/data/edww_fir_allstations.csv b/data/edww_fir_allstations.csv
diff --git a/data/edww_fir_minstations.csv b/data/edww_fir_minstations.csv
diff --git a/data/edww_fir_weekly.json b/data/edww_fir_weekly.json
diff --git a/data/edww_minstations.csv b/data/edww_minstations.csv
diff --git a/data/edww_weekly.json b/data/edww_weekly.json
diff --git a/data/event_allstations.csv b/data/event_allstations.csv
diff --git a/data/event_minstations.csv b/data/event_minstations.csv
diff --git a/helpers.php b/helpers.php
@@ -0,0 +1,24 @@
+<?php
+
+
+/**
+ * @param string $key
+ * @param DateTime $MASTER_DATE
+ * @return void
+ */
+function default_fir_render(string $key, DateTime $MASTER_DATE): void
+{
+    $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);
+
+    $img = ImageRenderer::render($min_stations, $main_stations, $booked_stations, $MASTER_DATE, $weeklyBookings);
+
+    header('Content-type: image/png');
+    imagepng($img);
+    imagedestroy($img);
+}
diff --git a/public/edbb/index.php b/public/edbb/index.php
diff --git a/public/edff/index.php b/public/edff/index.php
@@ -11,16 +11,4 @@
 
 $key = 'edff';
 
-$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);
-
-$img = ImageRenderer::render($min_stations, $main_stations, $booked_stations, $MASTER_DATE, $weeklyBookings);
-
-header('Content-type: image/png');
-imagepng($img);
-imagedestroy($img);
+default_fir_render($key, $MASTER_DATE);
diff --git a/public/edgg/index.php b/public/edgg/index.php
@@ -1,30 +1,15 @@
 <?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");
+require_once(_BASE_PATH_ . "helpers.php");
 
 $MASTER_DATE = new DateTime();
 if (isset($_GET['nextWeek'])) {
     $MASTER_DATE->add(new DateInterval('P7D'));
 }
 
+$key = 'edgg';
 
-$stationsFile = fopen(_DATA_PATH_ . "edgg_allstations.csv", "r") or die("Unable to open allstations file!");
-$minStationsFile = fopen(_DATA_PATH_ . "edgg_minstations.csv", "r") or die("Unable to open minstations file!");
-$allStationsString = fgets($stationsFile);
-$minStationsString = fgets($minStationsFile);
-
-
-$bookingsString = file_get_contents(_DATA_PATH_ . "edgg_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);
-
-$img = ImageRenderer::render($min_stations, $main_stations, $booked_stations, $MASTER_DATE, $weeklyBookings);
-
-header('Content-type: image/png');
-imagepng($img);
-imagedestroy($img);
+default_fir_render($key, $MASTER_DATE);
diff --git a/public/edll/index.php b/public/edll/index.php
@@ -11,16 +11,4 @@
 
 $key = 'edll';
 
-$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);
-
-$img = ImageRenderer::render($min_stations, $main_stations, $booked_stations, $MASTER_DATE, $weeklyBookings);
-
-header('Content-type: image/png');
-imagepng($img);
-imagedestroy($img);
+default_fir_render($key, $MASTER_DATE);
diff --git a/public/edmm/index.php b/public/edmm/index.php
@@ -3,6 +3,7 @@
 require_once(_BASE_PATH_ . "datamanager.class.php");
 require_once(_BASE_PATH_ . "datahub.class.php");
 require_once(_BASE_PATH_ . "imagerenderer.class.php");
+require_once(_BASE_PATH_ . "helpers.php");
 
 $MASTER_DATE = new DateTime();
 if (isset($_GET['nextWeek'])) {
@@ -11,16 +12,4 @@
 
 $key = 'edmm';
 
-$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);
-
-$img = ImageRenderer::render($min_stations, $main_stations, $booked_stations, $MASTER_DATE, $weeklyBookings);
-
-header('Content-type: image/png');
-imagepng($img);
-imagedestroy($img);
+default_fir_render($key, $MASTER_DATE);
diff --git a/public/edww/index.php b/public/edww/index.php
@@ -1,31 +1,14 @@
 <?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 = 'edww';
 
-$stationsFile = fopen(_DATA_PATH_ . "edww_allstations.csv", "r") or die("Unable to open allstations file!");
-$minStationsFile = fopen(_DATA_PATH_ . "edww_minstations.csv", "r") or die("Unable to open minstations file!");
-$allStationsString = fgets($stationsFile);
-$minStationsString = fgets($minStationsFile);
-
-
-$bookingsString = file_get_contents(_DATA_PATH_ . "edww_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);
-
-$img = ImageRenderer::render($min_stations, $main_stations, $booked_stations, $MASTER_DATE, $weeklyBookings);
-
-header('Content-type: image/png');
-imagepng($img);
-imagedestroy($img);
+default_fir_render($key, $MASTER_DATE);
diff --git a/public/edww_fir/index.php b/public/edww_fir/index.php
diff --git a/public/event/index.php b/public/event/index.php