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

show bus and passenger count in layerControl

Browse source
This commit is contained in:
steven 2025-03-26 23:19:04 -04:00
parent cbbf56feed
commit b7e2fb226e
2 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app.py
View file

@ -1,14 +1,10 @@
from flask import Flask, jsonify, render_template, send_from_directory from flask import Flask,render_template,send_from_directory
from flask_caching import Cache from flask_caching import Cache
import requests import requests
app = Flask(__name__) app=Flask(__name__)
app.config['CACHE_TYPE']='SimpleCache'
app.config['CACHE_TYPE'] = 'SimpleCache' cache=Cache(app)
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("/") @app.route("/")
def index(): def index():
@ -18,11 +14,11 @@ def index():
def favicon(): def favicon():
return send_from_directory(app.static_folder,"bus.svg") 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) @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']},{v['LastUpdated'][6:16]}" 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__':
app.run()

36
templates/map.html
View file

@ -5,7 +5,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta content="TARC Routes" property="og:title"> <meta content="TARC Routes" property="og:title">
<meta content='https://tarc.stevenalexander.org/bus.svg' property='og:image'> <meta content='https://tarc.stevenalexander.org/bus.svg' property='og:image'>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="icon" type="image/x-icon" href="/bus.svg"> <link rel="icon" type="image/x-icon" href="/bus.svg">
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script> <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js" integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" crossorigin="" /> <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" crossorigin="" />
@ -14,35 +14,37 @@
<body> <body>
<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.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 layerControl=L.control.layers().addTo(map);
let busLayers={};busMarkers={}; let busLayers={},busMarkers={};
function updateMap(){ function updateMap(){
let routes={};
fetch("tarc.csv").then(response=>response.text()).then(data=>{ fetch("tarc.csv").then(response=>response.text()).then(data=>{
if(data=="")return; if(data=="")return;
let newRoute=false;
data.split("\n").forEach(line=>{ data.split("\n").forEach(line=>{
let [lat,lng,r,id,p,d,s,t]=line.split(","); 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})}`; p=parseInt(p);
if(id in busMarkers){ t=new Date(t*1000).toLocaleTimeString('en-US',{hour12:false});
busMarkers[id].setLatLng([lat,lng]).bindPopup(info) if(!busLayers[r]){busLayers[r]=L.layerGroup().addTo(map)}
}else{ if(!busMarkers[id]){busMarkers[id]=L.marker([0,0]).addTo(busLayers[r])}
if(!busLayers[r]){busLayers[r]=L.layerGroup().addTo(map)} if(!routes[r]){routes[r]=[0,0]}
busMarkers[id]=L.marker([lat,lng]).bindPopup(info).addTo(busLayers[r]); routes[r][0]++;
newRoute=true 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){ let overlayLayers={};
map.removeControl(layerControl); for(let r in routes){
layerControl=L.control.layers(null,busLayers).addTo(map) 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) setTimeout(updateMap,6000)
}) })
} }
updateMap(); updateMap();
let locationMarker=L.marker([0,0]),locationRadius=L.circle([0,0]).bringToBack(); let locationMarker=L.marker([0,0]).addTo(map);
let locationLayer=L.layerGroup([locationMarker,locationRadius]).addTo(map); let locationRadius=L.circle([0,0]).addTo(map).bringToBack();
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());