oops

cmd/main.go

@@ -257,6 +257,37 @@ func vehicleHandler(mode string) http.HandlerFunc {
 	}
 }
 
+func tripHandler(w http.ResponseWriter, r *http.Request) {
+	rows, err := scheduleDb.Query(`SELECT shapes.shape_pt_lat, shapes.shape_pt_lon FROM shapes INNER JOIN trips ON trips.shape_id = shapes.shape_id WHERE trips.trip_id = ? ORDER BY shapes.shape_pt_sequence ASC`, r.PathValue("trip"))
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	var points [][]float64
+
+	for rows.Next() {
+		var lat float64
+		var lon float64
+		err = rows.Scan(&lat, &lon)
+		if err != nil {
+			break
+		}
+
+		points = append(points, []float64{lat, lon})
+	}
+
+	if len(points) == 0 {
+		w.WriteHeader(http.StatusNotFound)
+		return
+	}
+
+	w.Header().Add("Content-Type", "application/json")
+
+	response, _ := json.Marshal(map[string]any{"shape": points})
+	w.Write(response)
+}
+
 func main() {
 	fmt.Println("Opening database...")
 
@@ -275,6 +306,7 @@ func main() {
 
 	http.HandleFunc("/api", vehicleHandler(""))
 	http.HandleFunc("/api.json", vehicleHandler("json"))
+	http.HandleFunc("/api/trips/{trip}", tripHandler)
 
 	port := "3000"
 	if portEnv, ok := os.LookupEnv("PORT"); ok {

static/index.html

@@ -300,6 +300,6 @@
       </div>
     </div>
 
-    <script type="module" src="/js/main.js?v=10"></script>
+    <script type="module" src="/js/main.js?v=11"></script>
   </body>
 </html>

static/js/main.js

@@ -91,11 +91,15 @@ const brtLayer = L.layerGroup().addTo(map);
 const traxLayer = L.layerGroup().addTo(map);
 const frontRunnerLayer = L.layerGroup().addTo(map);
 
-L.polyline(shapes.blueLine, { color: "#004a97", zIndexOffset: 10 }).addTo(map);
+const railLayer = L.layerGroup().addTo(map);
-L.polyline(shapes.redLine, { color: "#be2036", zIndexOffset: 10 }).addTo(map);
+
-L.polyline(shapes.greenLine, { color: "#2eb566", zIndexOffset: 10 }).addTo(map);
+const currentRouteLayer = L.layerGroup().addTo(map);
-L.polyline(shapes.sLine, { color: "#77777a", zIndexOffset: 10 }).addTo(map);
+
-L.polyline(shapes.frontRunner, { color: "#c227b9", zIndexOffset: 10 }).addTo(map);
+L.polyline(shapes.blueLine, { color: "#004a97", zIndexOffset: 10 }).addTo(railLayer);
+L.polyline(shapes.redLine, { color: "#be2036", zIndexOffset: 10 }).addTo(railLayer);
+L.polyline(shapes.greenLine, { color: "#2eb566", zIndexOffset: 10 }).addTo(railLayer);
+L.polyline(shapes.sLine, { color: "#77777a", zIndexOffset: 10 }).addTo(railLayer);
+L.polyline(shapes.frontRunner, { color: "#c227b9", zIndexOffset: 10 }).addTo(railLayer);
 
 // render stations
 for (const station of stations) {
@@ -240,6 +244,18 @@ function vehiclePopupContent(vehicle) {
   return content
 }
 
+const tripShapeCache = new Map();
+
+async function getTripShape(tripId) {
+  if (tripShapeCache.has(tripId)) {
+    return tripShapeCache.get(tripId);
+  } else {
+    const data = await fetch(`/api/trips/${tripId}`).then(r => r.json());
+    tripShapeCache.set(tripId, data.shape);
+    return data.shape;
+  }
+}
+
 function renderVehicle(vehicle) {
   return L.marker([vehicle.lat, vehicle.lon], {
           zIndexOffset:
@@ -248,7 +264,20 @@ function renderVehicle(vehicle) {
               ? 4000
               : 3000,
           icon: renderVehicleIcon(vehicle),
-        }).bindPopup(vehiclePopupContent(vehicle));
+  }).bindPopup(vehiclePopupContent(vehicle)).on("popupopen", () => {
+    getTripShape(vehicle.trip_id).then(shape => {
+      console.log(shape)
+      for (const layer of railLayer.getLayers()) {
+        layer.setStyle({ opacity: 0.2 });
+      }
+      L.polyline(shape, { color: `#${vehicle.route.color}`, zIndexOffset: 10 }).addTo(currentRouteLayer);
+    })
+  }).on("popupclose", () => {
+    for (const layer of railLayer.getLayers()) {
+      layer.setStyle({ opacity: 1.0 });
+    }
+    currentRouteLayer.clearLayers();
+  });
 }
 
 async function reload() {