show bus and passenger count in layerControl
This commit is contained in:
parent
cbbf56feed
commit
b7e2fb226e
2 changed files with 27 additions and 29 deletions
14
app.py
14
app.py
|
@ -1,15 +1,11 @@
|
|||
from flask import Flask, jsonify, render_template, send_from_directory
|
||||
from flask import Flask,render_template,send_from_directory
|
||||
from flask_caching import Cache
|
||||
import requests
|
||||
|
||||
app=Flask(__name__)
|
||||
|
||||
app.config['CACHE_TYPE']='SimpleCache'
|
||||
cache=Cache(app)
|
||||
|
||||
data=requests.get("https://tarc.rideralerts.com/InfoPoint/rest/Routes/GetVisibleRoutes").json()
|
||||
routes=",".join(str(r.get('RouteId')) for r in data)
|
||||
|
||||
@app.route("/")
|
||||
def index():
|
||||
return render_template("map.html")
|
||||
|
@ -18,11 +14,11 @@ def index():
|
|||
def favicon():
|
||||
return send_from_directory(app.static_folder,"bus.svg")
|
||||
|
||||
@app.route('/tarc.csv')
|
||||
data=requests.get("https://tarc.rideralerts.com/InfoPoint/rest/Routes/GetVisibleRoutes").json()
|
||||
routes=",".join(str(r.get('RouteId')) for r in data)
|
||||
|
||||
@app.route("/tarc.csv")
|
||||
@cache.cached(timeout=5)
|
||||
def tarc():
|
||||
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']},{v['LastUpdated'][6:16]}" for v in d)
|
||||
|
||||
if __name__ == '__main__':
|
||||
app.run()
|
||||
|
|
|
@ -14,35 +14,37 @@
|
|||
<body>
|
||||
<div id="map"></div>
|
||||
<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.2,-85.75],zoom:13,layers:[L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png")]});
|
||||
let layerControl=L.control.layers().addTo(map);
|
||||
let busLayers={};busMarkers={};
|
||||
let busLayers={},busMarkers={};
|
||||
function updateMap(){
|
||||
let routes={};
|
||||
fetch("tarc.csv").then(response=>response.text()).then(data=>{
|
||||
if(data=="")return;
|
||||
let newRoute=false;
|
||||
data.split("\n").forEach(line=>{
|
||||
let [lat,lng,r,id,p,d,s,t]=line.split(",");
|
||||
let 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(id in busMarkers){
|
||||
busMarkers[id].setLatLng([lat,lng]).bindPopup(info)
|
||||
}else{
|
||||
p=parseInt(p);
|
||||
t=new Date(t*1000).toLocaleTimeString('en-US',{hour12:false});
|
||||
if(!busLayers[r]){busLayers[r]=L.layerGroup().addTo(map)}
|
||||
busMarkers[id]=L.marker([lat,lng]).bindPopup(info).addTo(busLayers[r]);
|
||||
newRoute=true
|
||||
}
|
||||
if(!busMarkers[id]){busMarkers[id]=L.marker([0,0]).addTo(busLayers[r])}
|
||||
if(!routes[r]){routes[r]=[0,0]}
|
||||
routes[r][0]++;
|
||||
routes[r][1]+=p;
|
||||
busMarkers[id].setLatLng([lat,lng]).bindPopup(`<b>Route ${r}</b><br>#${id}<br>${p} riders<br>${d}<br>${s}mph<br>${t}`)
|
||||
})
|
||||
if(newRoute){
|
||||
map.removeControl(layerControl);
|
||||
layerControl=L.control.layers(null,busLayers).addTo(map)
|
||||
let overlayLayers={};
|
||||
for(let r in routes){
|
||||
overlayLayers[`${r} (${routes[r][0]} vehicle(s) with ${routes[r][1]} riders)`]=busLayers[r]
|
||||
}
|
||||
layerControl.remove();
|
||||
layerControl=L.control.layers(null,overlayLayers,{collapsed:false}).addTo(map);
|
||||
setTimeout(updateMap,6000)
|
||||
})
|
||||
}
|
||||
updateMap();
|
||||
|
||||
let locationMarker=L.marker([0,0]),locationRadius=L.circle([0,0]).bringToBack();
|
||||
let locationLayer=L.layerGroup([locationMarker,locationRadius]).addTo(map);
|
||||
let locationMarker=L.marker([0,0]).addTo(map);
|
||||
let locationRadius=L.circle([0,0]).addTo(map).bringToBack();
|
||||
map.locate({watch:true});
|
||||
map.on("locationfound",e=>{
|
||||
locationMarker.setLatLng(e.latlng).bindPopup("<b>You</b> at<br>"+new Date().toLocaleTimeString());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue