From 93f124949a7cc213c6258c44501500caf96d1152 Mon Sep 17 00:00:00 2001
From: Per Qvarforth <per@qvarforth.se>
Date: Sun, 30 Jan 2022 13:20:40 +0100
Subject: [PATCH] added missing part of trail chart

---
 .../repositories/packetrepository.class.php   | 35 ++++++-------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/htdocs/includes/repositories/packetrepository.class.php b/htdocs/includes/repositories/packetrepository.class.php
index a91511e..d61909d 100644
--- a/htdocs/includes/repositories/packetrepository.class.php
+++ b/htdocs/includes/repositories/packetrepository.class.php
@@ -148,15 +148,14 @@ class PacketRepository extends ModelRepository
      * Get latest packet data list by station id  (useful for creating a chart)
      *
      * @param  int   $stationId
-     * @param  int   $startTimestamp
-     * @param  int   $endTimestamp
+     * @param  int   $numberOfHours
      * @param  array $columns
      * @return Array
      */
-    public function getLatestDataListByStationId($stationId, $startTimestamp, $endTimestamp, $columns)
+    public function getLatestDataListByStationId($stationId, $numberOfHours, $columns)
     {
         $result = Array();
-        if (!isInt($stationId) || !isInt($startTimestamp) || !isInt($endTimestamp)) {
+        if (!isInt($stationId) || !isInt($numberOfHours)) {
             return $result;
         }
 
@@ -165,27 +164,13 @@ class PacketRepository extends ModelRepository
             $columns[] = 'timestamp';
         }
 
-        if ($endTimestamp < time()-60) {
-            // Fetching old values
-            $sql = 'select ' . implode(',', $columns) . ', position_timestamp from packet
-                where station_id = ?
-                    and timestamp >= ?
-                    and (timestamp <= ? or (position_timestamp is not null and position_timestamp <= ?))
-                    and (speed is not null or altitude is not null)
-                    and map_id in (1,12,5,7,9)
-                order by timestamp';
-            $arg = [$stationId, $startTimestamp, $endTimestamp, $endTimestamp];
-        } else {
-            // Fetching recent values
-            $sql = 'select ' . implode(',', $columns) . ', position_timestamp from packet
-                where station_id = ?
-                    and timestamp >= ?
-                    and timestamp <= ?
-                    and (speed is not null or altitude is not null)
-                    and map_id in (1,12,5,7,9)
-                order by timestamp';
-            $arg = [$stationId, $startTimestamp, $endTimestamp];
-        }
+        $sql = 'select ' . implode(',', $columns) . ', position_timestamp from packet
+            where station_id = ?
+                and timestamp >= ?
+                and (speed is not null or altitude is not null)
+                and map_id in (1,12,5,7,9)
+            order by timestamp';
+        $arg = [$stationId, time() - $numberOfHours*60*60];
 
         $pdo = PDOConnection::getInstance();
         $stmt = $pdo->prepareAndExec($sql, $arg);