From e789032f4d8bd45d6dd342155b6d839c9f6fff5d Mon Sep 17 00:00:00 2001
From: Naiki92 <44921964+Naiki92@users.noreply.github.com>
Date: Thu, 15 Jun 2023 13:39:08 +0200
Subject: [PATCH] Update `visited` to include only valid coordinates
---
TeslaLogger/Grafana/Visited.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/TeslaLogger/Grafana/Visited.json b/TeslaLogger/Grafana/Visited.json
index 212fa862e..e6a66838b 100644
--- a/TeslaLogger/Grafana/Visited.json
+++ b/TeslaLogger/Grafana/Visited.json
@@ -67,7 +67,7 @@
"group": [],
"metricColumn": "none",
"rawQuery": true,
- "rawSql": "SELECT\r\n avg(UNIX_TIMESTAMP(datum)) as time_sec,\r\n avg(lat),\r\n avg(lng),\r\n 0 as type,\r\n null as address, CarID\r\n FROM pos\r\n WHERE $__timeFilter(datum) and CarID in ($Car)\r\ngroup by CarID, UNIX_TIMESTAMP(datum) div 180\r\nUNION\r\n SELECT UNIX_TIMESTAMP(pos.datum) as time_sec, lat, lng, 1 as type, concat('',address, '
Date: ',pos.datum, '
Duration: ', TIMESTAMPDIFF(MINUTE, StartDate, EndDate) ,'min
Charged: ',charging.charge_energy_added, 'kWh
Max Power:', max_charger_power, 'kW
[CHARGING]
[CHARGINGHISTORY]') as address, chargingstate.CarID FROM chargingstate join charging on endchargingid = charging.id join pos on chargingstate.Pos = pos.id\r\n WHERE '$Charger' = 'ON' and $__timeFilter(pos.datum) and chargingstate.CarID in ($Car) and (fast_charger_brand = 'Tesla' or address like '%Supercharger%')\r\nUNION\r\n SELECT UNIX_TIMESTAMP(pos.datum) as time_sec, lat, lng, 2 as type, concat('',address, '
Date: ',pos.datum, '
Duration: ', TIMESTAMPDIFF(MINUTE, StartDate, EndDate) ,'min
Charged: ',charging.charge_energy_added, 'kWh
Max Power:', max_charger_power, 'kW
[CHARGING]
[CHARGINGHISTORY]') as address, chargingstate.CarID FROM chargingstate join charging on endchargingid = charging.id join pos on chargingstate.Pos = pos.id\r\n WHERE '$Charger' = 'ON' and $__timeFilter(pos.datum) and chargingstate.CarID in ($Car) \r\n and ((fast_charger_brand is not null && fast_charger_brand not in ('Tesla') and fast_charger_present = 1 and address not like '%supercharger%') \r\n or (fast_charger_present is null and max_charger_power > 25 and address not like '%supercharger%'))\r\n\r\n ORDER BY CarID, time_sec ASC",
+ "rawSql": "SELECT\r\n avg(UNIX_TIMESTAMP(datum)) as time_sec,\r\n avg(lat),\r\n avg(lng),\r\n 0 as type,\r\n null as address, CarID\r\n FROM pos\r\n WHERE $__timeFilter(datum) and CarID in ($Car) and lat BETWEEN -90 and 90 and lng BETWEEN -180 and 180\r\ngroup by CarID, UNIX_TIMESTAMP(datum) div 180\r\nUNION\r\n SELECT UNIX_TIMESTAMP(pos.datum) as time_sec, lat, lng, 1 as type, concat('',address, '
Date: ',pos.datum, '
Duration: ', TIMESTAMPDIFF(MINUTE, StartDate, EndDate) ,'min
Charged: ',charging.charge_energy_added, 'kWh
Max Power:', max_charger_power, 'kW
[CHARGING]
[CHARGINGHISTORY]') as address, chargingstate.CarID FROM chargingstate join charging on endchargingid = charging.id join pos on chargingstate.Pos = pos.id\r\n WHERE '$Charger' = 'ON' and $__timeFilter(pos.datum) and chargingstate.CarID in ($Car) and (fast_charger_brand = 'Tesla' or address like '%Supercharger%')\r\nUNION\r\n SELECT UNIX_TIMESTAMP(pos.datum) as time_sec, lat, lng, 2 as type, concat('',address, '
Date: ',pos.datum, '
Duration: ', TIMESTAMPDIFF(MINUTE, StartDate, EndDate) ,'min
Charged: ',charging.charge_energy_added, 'kWh
Max Power:', max_charger_power, 'kW
[CHARGING]
[CHARGINGHISTORY]') as address, chargingstate.CarID FROM chargingstate join charging on endchargingid = charging.id join pos on chargingstate.Pos = pos.id\r\n WHERE '$Charger' = 'ON' and $__timeFilter(pos.datum) and chargingstate.CarID in ($Car) \r\n and ((fast_charger_brand is not null && fast_charger_brand not in ('Tesla') and fast_charger_present = 1 and address not like '%supercharger%') \r\n or (fast_charger_present is null and max_charger_power > 25 and address not like '%supercharger%'))\r\n\r\n ORDER BY CarID, time_sec ASC",
"refId": "A",
"select": [
[
@@ -196,4 +196,4 @@
"uid": "RG_DxSmgk",
"version": 2,
"weekStart": ""
-}
\ No newline at end of file
+}