Make a backend call just for amenities

backend/src/graph.rs

@@ -105,6 +105,16 @@ impl Graph {
         Ok(out)
     }
 
+    pub fn render_amenities(&self) -> Result<String> {
+        let mut features = Vec::new();
+        for a in &self.amenities {
+            features.push(a.to_gj(&self.mercator));
+        }
+        let gj = GeoJson::from(features);
+        let out = serde_json::to_string(&gj)?;
+        Ok(out)
+    }
+
     /// Return a polygon covering the world, minus a hole for the boundary, in WGS84
     pub fn get_inverted_boundary(&self) -> Result<String> {
         let (boundary, _) = self.mercator.to_wgs84(&self.boundary_polygon).into_inner();

backend/src/lib.rs

@@ -65,6 +65,12 @@ impl MapModel {
         self.graph.render_debug().map_err(err_to_js)
     }
 
+    /// Returns a GeoJSON string showing all amenities
+    #[wasm_bindgen(js_name = renderAmenities)]
+    pub fn render_amenities(&self) -> Result<String, JsValue> {
+        self.graph.render_amenities().map_err(err_to_js)
+    }
+
     /// Return a polygon covering the world, minus a hole for the boundary, in WGS84
     #[wasm_bindgen(js_name = getInvertedBoundary)]
     pub fn get_inverted_boundary(&self) -> Result<String, JsValue> {

web/src/ScoreMode.svelte

@@ -149,7 +149,7 @@
       </GeoJSON>
     {/if}
 
-    {#await notNull($backend).renderDebug() then data}
+    {#await notNull($backend).renderAmenities() then data}
       <GeoJSON {data}>
         <SymbolLayer
           filter={["==", ["get", "amenity_kind"], "bicycle_parking"]}

web/src/common/PickAmenityKinds.svelte

@@ -10,15 +10,13 @@
   $: enabled = getEnabled(kinds);
 
   onMount(async () => {
-    let gj = await $backend!.renderDebug();
+    let gj = await $backend!.renderAmenities();
     for (let f of gj.features) {
-      let kind: string | undefined = f.properties!.amenity_kind;
-      if (kind) {
-        if (kinds.has(kind)) {
-          kinds.get(kind)!.num += 1;
-        } else {
-          kinds.set(kind, { enabled: false, num: 1 });
-        }
+      let kind = f.properties.amenity_kind;
+      if (kinds.has(kind)) {
+        kinds.get(kind)!.num += 1;
+      } else {
+        kinds.set(kind, { enabled: false, num: 1 });
       }
     }
 

web/src/worker.ts

@@ -1,6 +1,6 @@
 import * as Comlink from "comlink";
 import init, { MapModel } from "backend";
-import type { TravelMode, ScoreProps } from "./stores";
+import type { TravelMode, ScoreProps, Amenity } from "./stores";
 import type {
   Position,
   Feature,
@@ -68,6 +68,14 @@ export class Backend {
     return JSON.parse(this.inner.renderDebug());
   }
 
+  renderAmenities(): FeatureCollection<Point, Amenity> {
+    if (!this.inner) {
+      throw new Error("Backend used without a file loaded");
+    }
+
+    return JSON.parse(this.inner.renderAmenities());
+  }
+
   isochrone(req: {
     // TODO LngLatLike doesn't work?
     start: { lng: number; lat: number };