Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update visited to include only valid coordinates #1061

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update visited to include only valid coordinates #1061

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions TeslaLogger/Grafana/Visited.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('<b>',address, '</b><br>Date: ',pos.datum, '<br>Duration: ', TIMESTAMPDIFF(MINUTE, StartDate, EndDate) ,'min<br>Charged: ',charging.charge_energy_added, 'kWh<br>Max Power:', max_charger_power, 'kW<br><a href=\"d/BHhxFeZRz/laden?orgId=1&from=', UNIX_TIMESTAMP(StartDate)*1000,'&to=',UNIX_TIMESTAMP(EndDate)*1000,'&var-Car=',chargingstate.CarID,'\">[CHARGING]</a><br><a href=\"d/TSmNYvRRk/ladehistorie?orgId=1&var-Car=',chargingstate.CarID,'&var-Textfilter=',address,'&from=now-2y&to=now\">[CHARGINGHISTORY]</a>') 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('<b>',address, '</b><br>Date: ',pos.datum, '<br>Duration: ', TIMESTAMPDIFF(MINUTE, StartDate, EndDate) ,'min<br>Charged: ',charging.charge_energy_added, 'kWh<br>Max Power:', max_charger_power, 'kW<br><a href=\"d/BHhxFeZRz/laden?orgId=1&from=', UNIX_TIMESTAMP(StartDate)*1000,'&to=',UNIX_TIMESTAMP(EndDate)*1000,'&var-Car=',chargingstate.CarID,'\">[CHARGING]</a><br><a href=\"d/TSmNYvRRk/ladehistorie?orgId=1&var-Car=',chargingstate.CarID,'&var-Textfilter=',address,'&from=now-2y&to=now\">[CHARGINGHISTORY]</a>') 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('<b>',address, '</b><br>Date: ',pos.datum, '<br>Duration: ', TIMESTAMPDIFF(MINUTE, StartDate, EndDate) ,'min<br>Charged: ',charging.charge_energy_added, 'kWh<br>Max Power:', max_charger_power, 'kW<br><a href=\"d/BHhxFeZRz/laden?orgId=1&from=', UNIX_TIMESTAMP(StartDate)*1000,'&to=',UNIX_TIMESTAMP(EndDate)*1000,'&var-Car=',chargingstate.CarID,'\">[CHARGING]</a><br><a href=\"d/TSmNYvRRk/ladehistorie?orgId=1&var-Car=',chargingstate.CarID,'&var-Textfilter=',address,'&from=now-2y&to=now\">[CHARGINGHISTORY]</a>') 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('<b>',address, '</b><br>Date: ',pos.datum, '<br>Duration: ', TIMESTAMPDIFF(MINUTE, StartDate, EndDate) ,'min<br>Charged: ',charging.charge_energy_added, 'kWh<br>Max Power:', max_charger_power, 'kW<br><a href=\"d/BHhxFeZRz/laden?orgId=1&from=', UNIX_TIMESTAMP(StartDate)*1000,'&to=',UNIX_TIMESTAMP(EndDate)*1000,'&var-Car=',chargingstate.CarID,'\">[CHARGING]</a><br><a href=\"d/TSmNYvRRk/ladehistorie?orgId=1&var-Car=',chargingstate.CarID,'&var-Textfilter=',address,'&from=now-2y&to=now\">[CHARGINGHISTORY]</a>') 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": [
[
Expand Down Expand Up @@ -196,4 +196,4 @@
"uid": "RG_DxSmgk",
"version": 2,
"weekStart": ""
}
}