filter lat lng = 0 in staticmapcservice

bassmaster187 · Jun 28, 2024 · 40cb921 · 40cb921
1 parent 0b94386
commit 40cb921
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/TeslaLogger/StaticMapService.cs b/TeslaLogger/StaticMapService.cs
@@ -237,17 +237,19 @@ private static DataTable TripToCoords(TripRequest request)
             if (CarID != int.MinValue && CarID > 0)
             {
                 using (MySqlDataAdapter da = new MySqlDataAdapter(@"
-SELECT
-  lat,
-  lng
-FROM
-  pos
-WHERE
-  CarID = @CarID
-  AND id >= @startID
-  AND id <= @endID
-ORDER BY
-  Datum", DBHelper.DBConnectionstring))
+                    SELECT
+                      lat,
+                      lng
+                    FROM
+                      pos
+                    WHERE
+                      CarID = @CarID
+                      AND id >= @startID
+                      AND id <= @endID
+                      AND lat <> 0
+                      AND lng <> 0
+                    ORDER BY
+                      Datum", DBHelper.DBConnectionstring))
                 {
                     da.SelectCommand.Parameters.AddWithValue("@CarID", CarID);
                     da.SelectCommand.Parameters.AddWithValue("@startID", request.StartPosID);

diff --git a/TeslaLogger/WebServer.cs b/TeslaLogger/WebServer.cs
@@ -1749,6 +1749,7 @@ private static void GetStaticMap(HttpListenerRequest request, HttpListenerRespon
             int endPosID = 0;
             int width = 240;
             int height = 0;
+            int carid = 1;
             StaticMapProvider.MapMode mode = StaticMapProvider.MapMode.Regular;
             if (request.QueryString.HasKeys())
             {
@@ -1777,6 +1778,10 @@ private static void GetStaticMap(HttpListenerRequest request, HttpListenerRespon
                         case "type":
                             // TODO
                             break;
+                        case "carid":
+                            _ = int.TryParse(request.QueryString.GetValues(key)[0], out carid);
+                            break;
+
                         default:
                             break;
                     }
@@ -1806,7 +1811,7 @@ private static void GetStaticMap(HttpListenerRequest request, HttpListenerRespon
                     else
                     {
                         // order static map generation
-                        StaticMapService.GetSingleton().Enqueue(1, startPosID, endPosID, width, height, mode, StaticMapProvider.MapSpecial.None);
+                        StaticMapService.GetSingleton().Enqueue(carid, startPosID, endPosID, width, height, mode, StaticMapProvider.MapSpecial.None);
                         // wait
                         for (int i = 0; i < 30; i++)
                         {