felixwalberg · ruuzia · Apr 24, 2024 · Apr 24, 2024 · Apr 24, 2024
diff --git a/app.py b/app.py
@@ -2,21 +2,20 @@
 import requests
 import json
 
-app = Flask(__name__)
+app = Flask(__name__, static_folder='public', static_url_path='')
 
 GMT_VEHICLES_URL = "https://maps.trilliumtransit.com/gtfsmap-realtime/feed/ccta-vt-us/vehicles"
 CAT_VEHICLES_URL = "https://feeds.transloc.com/3/vehicle_statuses?agencies=603&include_arrivals=true"
 # Arrivals must be queried with individual stopcodes
 GMT_ARRIVALS_URL = "https://maps.trilliumtransit.com/gtfsmap-realtime/feed/ccta-vt-us/arrivals?stopCode="
 GMT_ROUTES_URL = "https://gtfs-api.trilliumtransit.com/gtfs-api/routes/by-feed/ccta-vt-us"
 GMT_STOPS_URL = "https://gtfs-api.trilliumtransit.com/gtfs-api/stops/by-feed/ccta-vt-us/route-id/19137,19139,13496,13497,13498,3190,3191,7458,11182,7455,74419,74409,74410,74411,19141,74418,74413,3175,74412,3153,3176,3167,3177,3181,3168,3183,3197,3194,19140,3195,3196,3186,7335,74414,74415,3171,3172,3174,3188,74416,74417,3163,3164,3165,19138,32941,32942,11183,19143,19142,19144,19145,"
-STOP_DATA = "static/routes.json"
+STOP_DATA = "public/routes.json"
 
 DAVIS_CENTER_GMT_STOPCODE = "805489"
 UHEIGHT_STOPCODE = "805490"
 MED_STOPCODE = "805757"
 
-
 @app.route("/", methods=["GET"])
 def home():
     return render_template("map.html")

diff --git a/static/images/bluecircle.png → public/images/bluecircle.png b/static/images/bluecircle.png → public/images/bluecircle.png
diff --git a/static/images/bus1.png → public/images/bus1.png b/static/images/bus1.png → public/images/bus1.png
diff --git a/static/images/catbus.png → public/images/catbus.png b/static/images/catbus.png → public/images/catbus.png
diff --git a/static/images/gmtbus.png → public/images/gmtbus.png b/static/images/gmtbus.png → public/images/gmtbus.png
diff --git a/static/images/greencircle.png → public/images/greencircle.png b/static/images/greencircle.png → public/images/greencircle.png
diff --git a/static/images/redcircle.png → public/images/redcircle.png b/static/images/redcircle.png → public/images/redcircle.png
diff --git a/static/images/redcircle2.png → public/images/redcircle2.png b/static/images/redcircle2.png → public/images/redcircle2.png
diff --git a/...leaflet-routing-machine-3.2.12/.gitignore → ...leaflet-routing-machine-3.2.12/.gitignore b/...leaflet-routing-machine-3.2.12/.gitignore → ...leaflet-routing-machine-3.2.12/.gitignore
diff --git a/.../leaflet-routing-machine-3.2.12/.jshintrc → .../leaflet-routing-machine-3.2.12/.jshintrc b/.../leaflet-routing-machine-3.2.12/.jshintrc → .../leaflet-routing-machine-3.2.12/.jshintrc
diff --git a/...leaflet-routing-machine-3.2.12/.npmignore → ...leaflet-routing-machine-3.2.12/.npmignore b/...leaflet-routing-machine-3.2.12/.npmignore → ...leaflet-routing-machine-3.2.12/.npmignore
diff --git a/...eaflet-routing-machine-3.2.12/.travis.yml → ...eaflet-routing-machine-3.2.12/.travis.yml b/...eaflet-routing-machine-3.2.12/.travis.yml → ...eaflet-routing-machine-3.2.12/.travis.yml
diff --git a/...aflet-routing-machine-3.2.12/CHANGELOG.md → ...aflet-routing-machine-3.2.12/CHANGELOG.md b/...aflet-routing-machine-3.2.12/CHANGELOG.md → ...aflet-routing-machine-3.2.12/CHANGELOG.md
diff --git a/...-routing-machine-3.2.12/ISSUE_TEMPLATE.md → ...-routing-machine-3.2.12/ISSUE_TEMPLATE.md b/...-routing-machine-3.2.12/ISSUE_TEMPLATE.md → ...-routing-machine-3.2.12/ISSUE_TEMPLATE.md
diff --git a/...leaflet-routing-machine-3.2.12/LICENSE.md → ...leaflet-routing-machine-3.2.12/LICENSE.md b/...leaflet-routing-machine-3.2.12/LICENSE.md → ...leaflet-routing-machine-3.2.12/LICENSE.md
diff --git a/.../leaflet-routing-machine-3.2.12/README.md → .../leaflet-routing-machine-3.2.12/README.md b/.../leaflet-routing-machine-3.2.12/README.md → .../leaflet-routing-machine-3.2.12/README.md
diff --git a/...leaflet-routing-machine-3.2.12/bower.json → ...leaflet-routing-machine-3.2.12/bower.json b/...leaflet-routing-machine-3.2.12/bower.json → ...leaflet-routing-machine-3.2.12/bower.json
diff --git a/...e-3.2.12/dist/leaflet-routing-machine.css → ...e-3.2.12/dist/leaflet-routing-machine.css b/...e-3.2.12/dist/leaflet-routing-machine.css → ...e-3.2.12/dist/leaflet-routing-machine.css
diff --git a/...ine-3.2.12/dist/leaflet.routing.icons.png → ...ine-3.2.12/dist/leaflet.routing.icons.png b/...ine-3.2.12/dist/leaflet.routing.icons.png → ...ine-3.2.12/dist/leaflet.routing.icons.png
diff --git a/...ine-3.2.12/dist/leaflet.routing.icons.svg → ...ine-3.2.12/dist/leaflet.routing.icons.svg b/...ine-3.2.12/dist/leaflet.routing.icons.svg → ...ine-3.2.12/dist/leaflet.routing.icons.svg
diff --git a/...ting-machine-3.2.12/dist/routing-icon.png → ...ting-machine-3.2.12/dist/routing-icon.png b/...ting-machine-3.2.12/dist/routing-icon.png → ...ting-machine-3.2.12/dist/routing-icon.png
diff --git a/...chine-3.2.12/examples/Control.Geocoder.js → ...chine-3.2.12/examples/Control.Geocoder.js b/...chine-3.2.12/examples/Control.Geocoder.js → ...chine-3.2.12/examples/Control.Geocoder.js
diff --git a/...routing-machine-3.2.12/examples/config.js → ...routing-machine-3.2.12/examples/config.js b/...routing-machine-3.2.12/examples/config.js → ...routing-machine-3.2.12/examples/config.js
diff --git a/...routing-machine-3.2.12/examples/index.css → ...routing-machine-3.2.12/examples/index.css b/...routing-machine-3.2.12/examples/index.css → ...routing-machine-3.2.12/examples/index.css
diff --git a/...outing-machine-3.2.12/examples/index.html → ...outing-machine-3.2.12/examples/index.html b/...outing-machine-3.2.12/examples/index.html → ...outing-machine-3.2.12/examples/index.html
diff --git a/...-routing-machine-3.2.12/examples/index.js → ...-routing-machine-3.2.12/examples/index.js b/...-routing-machine-3.2.12/examples/index.js → ...-routing-machine-3.2.12/examples/index.js
diff --git a/...ng-machine-3.2.12/examples/localized.html → ...ng-machine-3.2.12/examples/localized.html b/...ng-machine-3.2.12/examples/localized.html → ...ng-machine-3.2.12/examples/localized.html
diff --git a/...ting-machine-3.2.12/examples/localized.js → ...ting-machine-3.2.12/examples/localized.js b/...ting-machine-3.2.12/examples/localized.js → ...ting-machine-3.2.12/examples/localized.js
diff --git a/...uting-machine-3.2.12/examples/mapbox.html → ...uting-machine-3.2.12/examples/mapbox.html b/...uting-machine-3.2.12/examples/mapbox.html → ...uting-machine-3.2.12/examples/mapbox.html
diff --git a/...routing-machine-3.2.12/examples/mapbox.js → ...routing-machine-3.2.12/examples/mapbox.js b/...routing-machine-3.2.12/examples/mapbox.js → ...routing-machine-3.2.12/examples/mapbox.js
diff --git a/...-routing-machine-3.2.12/package-lock.json → ...-routing-machine-3.2.12/package-lock.json b/...-routing-machine-3.2.12/package-lock.json → ...-routing-machine-3.2.12/package-lock.json
diff --git a/...aflet-routing-machine-3.2.12/package.json → ...aflet-routing-machine-3.2.12/package.json b/...aflet-routing-machine-3.2.12/package.json → ...aflet-routing-machine-3.2.12/package.json
diff --git a/...routing-machine-3.2.12/scripts/publish.sh → ...routing-machine-3.2.12/scripts/publish.sh b/...routing-machine-3.2.12/scripts/publish.sh → ...routing-machine-3.2.12/scripts/publish.sh
diff --git a/...outing-machine-3.2.12/src/autocomplete.js → ...outing-machine-3.2.12/src/autocomplete.js b/...outing-machine-3.2.12/src/autocomplete.js → ...outing-machine-3.2.12/src/autocomplete.js
diff --git a/...let-routing-machine-3.2.12/src/control.js → ...let-routing-machine-3.2.12/src/control.js b/...let-routing-machine-3.2.12/src/control.js → ...let-routing-machine-3.2.12/src/control.js
diff --git a/...uting-machine-3.2.12/src/error-control.js → ...uting-machine-3.2.12/src/error-control.js b/...uting-machine-3.2.12/src/error-control.js → ...uting-machine-3.2.12/src/error-control.js
diff --git a/...t-routing-machine-3.2.12/src/formatter.js → ...t-routing-machine-3.2.12/src/formatter.js b/...t-routing-machine-3.2.12/src/formatter.js → ...t-routing-machine-3.2.12/src/formatter.js
diff --git a/...ng-machine-3.2.12/src/geocoder-element.js → ...ng-machine-3.2.12/src/geocoder-element.js b/...ng-machine-3.2.12/src/geocoder-element.js → ...ng-machine-3.2.12/src/geocoder-element.js
diff --git a/...aflet-routing-machine-3.2.12/src/index.js → ...aflet-routing-machine-3.2.12/src/index.js b/...aflet-routing-machine-3.2.12/src/index.js → ...aflet-routing-machine-3.2.12/src/index.js
diff --git a/...g-machine-3.2.12/src/itinerary-builder.js → ...g-machine-3.2.12/src/itinerary-builder.js b/...g-machine-3.2.12/src/itinerary-builder.js → ...g-machine-3.2.12/src/itinerary-builder.js
diff --git a/...t-routing-machine-3.2.12/src/itinerary.js → ...t-routing-machine-3.2.12/src/itinerary.js b/...t-routing-machine-3.2.12/src/itinerary.js → ...t-routing-machine-3.2.12/src/itinerary.js
diff --git a/...eaflet-routing-machine-3.2.12/src/line.js → ...eaflet-routing-machine-3.2.12/src/line.js b/...eaflet-routing-machine-3.2.12/src/line.js → ...eaflet-routing-machine-3.2.12/src/line.js
diff --git a/...outing-machine-3.2.12/src/localization.js → ...outing-machine-3.2.12/src/localization.js b/...outing-machine-3.2.12/src/localization.js → ...outing-machine-3.2.12/src/localization.js
diff --git a/...flet-routing-machine-3.2.12/src/mapbox.js → ...flet-routing-machine-3.2.12/src/mapbox.js b/...flet-routing-machine-3.2.12/src/mapbox.js → ...flet-routing-machine-3.2.12/src/mapbox.js
diff --git a/...let-routing-machine-3.2.12/src/osrm-v1.js → ...let-routing-machine-3.2.12/src/osrm-v1.js b/...let-routing-machine-3.2.12/src/osrm-v1.js → ...let-routing-machine-3.2.12/src/osrm-v1.js
diff --git a/...eaflet-routing-machine-3.2.12/src/plan.js → ...eaflet-routing-machine-3.2.12/src/plan.js b/...eaflet-routing-machine-3.2.12/src/plan.js → ...eaflet-routing-machine-3.2.12/src/plan.js
diff --git a/...et-routing-machine-3.2.12/src/waypoint.js → ...et-routing-machine-3.2.12/src/waypoint.js b/...et-routing-machine-3.2.12/src/waypoint.js → ...et-routing-machine-3.2.12/src/waypoint.js
diff --git a/...uting-machine-3.2.12/test/SpecRunner.html → ...uting-machine-3.2.12/test/SpecRunner.html b/...uting-machine-3.2.12/test/SpecRunner.html → ...uting-machine-3.2.12/test/SpecRunner.html
diff --git a/...ine-3.2.12/test/lib/jasmine-2.0.0/boot.js → ...ine-3.2.12/test/lib/jasmine-2.0.0/boot.js b/...ine-3.2.12/test/lib/jasmine-2.0.0/boot.js → ...ine-3.2.12/test/lib/jasmine-2.0.0/boot.js
diff --git a/...-3.2.12/test/lib/jasmine-2.0.0/console.js → ...-3.2.12/test/lib/jasmine-2.0.0/console.js b/...-3.2.12/test/lib/jasmine-2.0.0/console.js → ...-3.2.12/test/lib/jasmine-2.0.0/console.js
diff --git a/...12/test/lib/jasmine-2.0.0/jasmine-html.js → ...12/test/lib/jasmine-2.0.0/jasmine-html.js b/...12/test/lib/jasmine-2.0.0/jasmine-html.js → ...12/test/lib/jasmine-2.0.0/jasmine-html.js
diff --git a/...3.2.12/test/lib/jasmine-2.0.0/jasmine.css → ...3.2.12/test/lib/jasmine-2.0.0/jasmine.css b/...3.2.12/test/lib/jasmine-2.0.0/jasmine.css → ...3.2.12/test/lib/jasmine-2.0.0/jasmine.css
diff --git a/...-3.2.12/test/lib/jasmine-2.0.0/jasmine.js → ...-3.2.12/test/lib/jasmine-2.0.0/jasmine.js b/...-3.2.12/test/lib/jasmine-2.0.0/jasmine.js → ...-3.2.12/test/lib/jasmine-2.0.0/jasmine.js
diff --git a/...est/lib/jasmine-2.0.0/jasmine_favicon.png → ...est/lib/jasmine-2.0.0/jasmine_favicon.png b/...est/lib/jasmine-2.0.0/jasmine_favicon.png → ...est/lib/jasmine-2.0.0/jasmine_favicon.png
diff --git a/...achine-3.2.12/test/spec/formatter-spec.js → ...achine-3.2.12/test/spec/formatter-spec.js b/...achine-3.2.12/test/spec/formatter-spec.js → ...achine-3.2.12/test/spec/formatter-spec.js
diff --git a/...g-machine-3.2.12/test/spec/osrmv1-spec.js → ...g-machine-3.2.12/test/spec/osrmv1-spec.js b/...g-machine-3.2.12/test/spec/osrmv1-spec.js → ...g-machine-3.2.12/test/spec/osrmv1-spec.js
diff --git a/static/leaflet/images/layers-2x.png → public/leaflet/images/layers-2x.png b/static/leaflet/images/layers-2x.png → public/leaflet/images/layers-2x.png
@@ -80,4 +80,4 @@ setInterval(() => {
 
 setInterval(() => {
     buses();
-}, 1000)
+}, 30*1000)
@@ -10,31 +10,31 @@ attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreet
 
 // Custom icons
 var gmtbus = L.icon({
-    iconUrl: '../static/images/gmtbus.png',
+    iconUrl: '../images/gmtbus.png',
     iconSize:     [72, 80], // size of the icon
     shadowSize:   [50, 64], // size of the shadow
     iconAnchor:   [0, 20], // point of the icon which will correspond to marker's location
     shadowAnchor: [4, 62],  // the same for the shadow
     popupAnchor:  [-3, -76] // point from which the popup should open relative to the iconAnchor
 });
 var catbus = L.icon({
-    iconUrl: '../static/images/catbus.png',
+    iconUrl: '../images/catbus.png',
     iconSize:     [90, 100], // size of the icon
     shadowSize:   [50, 64], // size of the shadow
     iconAnchor:   [0, 20], // point of the icon which will correspond to marker's location
     shadowAnchor: [4, 62],  // the same for the shadow
     popupAnchor:  [-3, -76] // point from which the popup should open relative to the iconAnchor
 });
 var busStop = L.icon({
-    iconUrl: '../static/images/redcircle2.png',
+    iconUrl: '../images/redcircle2.png',
     iconSize:     [10, 10], // size of the icon
     shadowSize:   [50, 64], // size of the shadow
     iconAnchor:   [0, 8], // point of the icon which will correspond to marker's location
     shadowAnchor: [4, 62],  // the same for the shadow
     popupAnchor:  [0, 0] // point from which the popup should open relative to the iconAnchor
 });
 var busStop2 = L.icon({
-    iconUrl: '../static/images/bluecircle.png',
+    iconUrl: '../images/bluecircle.png',
     iconSize:     [10, 10], // size of the icon
     shadowSize:   [50, 64], // size of the shadow
     iconAnchor:   [0, 8], // point of the icon which will correspond to marker's location