steven/tarc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

keep popup when bus moves

Browse source
This commit is contained in:
steven 2025-03-25 17:18:11 -04:00
parent e4bd7da77f
commit 8c2a4ee19b
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app.py
View file

@ -22,7 +22,7 @@ def favicon():
@cache.cached(timeout=5) @cache.cached(timeout=5)
def tarc(): def tarc():
d=requests.get("https://tarc.rideralerts.com/InfoPoint/rest/Vehicles/GetAllVehiclesForRoutes?routeIDs="+routes).json() d=requests.get("https://tarc.rideralerts.com/InfoPoint/rest/Vehicles/GetAllVehiclesForRoutes?routeIDs="+routes).json()
return "\n".join(f"{v['Latitude']},{v['Longitude']},{v['RouteId']},{v['Name']},{v['OnBoard']},{v['DirectionLong']},{v['Speed']}" for v in d) return "\n".join(f"{v['Latitude']},{v['Longitude']},{v['RouteId']},{v['Name']},{v['OnBoard']},{v['DirectionLong']},{v['Speed']},{v['LastUpdated'][6:16]}" for v in d)
if __name__ == '__main__': if __name__ == '__main__':
app.run() app.run()

20
templates/map.html
View file

@ -15,25 +15,27 @@
<div id="map"></div> <div id="map"></div>
<script> <script>
let map=L.map("map",{center:[38.21,-85.75],zoom:13,layers:[L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png")]}); let map=L.map("map",{center:[38.21,-85.75],zoom:13,layers:[L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png")]});
let busMarkers=L.layerGroup().addTo(map); let busMarkers=new Map();
function updateMap() { function updateMap(){
fetch("tarc.csv").then(response=>response.text()).then(data=>{ fetch("tarc.csv").then(response=>response.text()).then(data=>{
if (data == "") return; if(data=="")return;
busMarkers.clearLayers();
data.split("\n").forEach(line=>{ data.split("\n").forEach(line=>{
var [lat,lng,r,id,p,d,s]=line.split(","); const [lat,lng,r,id,p,d,s,t]=line.split(",");
L.marker([lat,lng]).bindPopup(`<b>Route ${r}</b><br>#${id}<br>${p} on board<br>${d}<br>@${s}mph`).addTo(busMarkers) const info=`<b>Route ${r}</b><br>#${id}<br>${p} riders<br>${d}<br>${s}mph<br>${new Date(t*1000).toLocaleTimeString('en-US',{hour12:false})}`
if(busMarkers.has(id)){busMarkers.get(id).setLatLng([lat,lng]).bindPopup(info)
}else{busMarkers.set(id,L.marker([lat,lng]).bindPopup(info).addTo(map))}
}) })
}) })
setTimeout(updateMap,5000);
} }
setInterval(updateMap,5000); updateMap();
let locationMarker=L.marker([0,0]),locationRadius=L.circle([0,0]); let locationMarker=L.marker([0,0]),locationRadius=L.circle([0,0]).bringToBack();
let locationLayer=L.layerGroup([locationMarker,locationRadius]).addTo(map); let locationLayer=L.layerGroup([locationMarker,locationRadius]).addTo(map);
map.locate({watch:true}); map.locate({watch:true});
map.on("locationfound",e=>{ map.on("locationfound",e=>{
locationMarker.setLatLng(e.latlng).bindPopup("<b>You</b> at<br>"+new Date().toLocaleTimeString()); locationMarker.setLatLng(e.latlng).bindPopup("<b>You</b> at<br>"+new Date().toLocaleTimeString());
locationRadius.setLatLng(e.latlng).setRadius(e.accuracy/2).bringToBack() locationRadius.setLatLng(e.latlng).setRadius(e.accuracy/2)
}); });
</script> </script>
</body> </body>