From b7e2fb226ef53ba56efa2214d6090c625218a693 Mon Sep 17 00:00:00 2001 From: steven Date: Wed, 26 Mar 2025 23:19:04 -0400 Subject: [PATCH] show bus and passenger count in layerControl --- app.py | 20 ++++++++------------ templates/map.html | 36 +++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/app.py b/app.py index ceb3da0..a8a5418 100644 --- a/app.py +++ b/app.py @@ -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 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=Flask(__name__) +app.config['CACHE_TYPE']='SimpleCache' +cache=Cache(app) @app.route("/") def index(): @@ -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() diff --git a/templates/map.html b/templates/map.html index 8dd1dbd..99545c6 100644 --- a/templates/map.html +++ b/templates/map.html @@ -5,7 +5,7 @@ - + @@ -14,35 +14,37 @@