diff --git a/backend/src/graph.rs b/backend/src/graph.rs index 1507447..d85d794 100644 --- a/backend/src/graph.rs +++ b/backend/src/graph.rs @@ -86,7 +86,7 @@ pub struct Intersection { impl Graph { /// Returns a GeoJSON string. Just shows the full network and amenities - pub fn render(&self) -> Result { + pub fn render_debug(&self) -> Result { let mut features = Vec::new(); for r in &self.roads { diff --git a/backend/src/lib.rs b/backend/src/lib.rs index f364216..e34e3be 100644 --- a/backend/src/lib.rs +++ b/backend/src/lib.rs @@ -54,9 +54,9 @@ impl MapModel { } /// Returns a GeoJSON string. Just shows the full network - #[wasm_bindgen()] - pub fn render(&self) -> Result { - self.graph.render().map_err(err_to_js) + #[wasm_bindgen(js_name = renderDebug)] + pub fn render_debug(&self) -> Result { + self.graph.render_debug().map_err(err_to_js) } /// Return a polygon covering the world, minus a hole for the boundary, in WGS84 diff --git a/web/src/DebugMode.svelte b/web/src/DebugMode.svelte index c4d103d..892a309 100644 --- a/web/src/DebugMode.svelte +++ b/web/src/DebugMode.svelte @@ -15,7 +15,7 @@ let gj: FeatureCollection | null = null; onMount(async () => { - gj = await $backend!.render(); + gj = await $backend!.renderDebug(); }); diff --git a/web/src/IsochroneMode.svelte b/web/src/IsochroneMode.svelte index 8ecb292..4c9d972 100644 --- a/web/src/IsochroneMode.svelte +++ b/web/src/IsochroneMode.svelte @@ -6,9 +6,9 @@ import type { FeatureCollection } from "geojson"; import { GeoJSON, FillLayer, LineLayer, Marker } from "svelte-maplibre"; import { SplitComponent } from "svelte-utils/two_column_layout"; - import { mode, backend, type TravelMode, filterForMode } from "./stores"; + import { mode, backend, type TravelMode } from "./stores"; import PickTravelMode from "./PickTravelMode.svelte"; - import { SequentialLegend, notNull } from "svelte-utils"; + import { SequentialLegend } from "svelte-utils"; import { Popup, makeColorRamp, isLine, isPolygon } from "svelte-utils/map"; import { onMount } from "svelte"; @@ -110,19 +110,6 @@ {/if}
- {#await notNull($backend).render() then data} - - - - {/await} - {#if start} X {/if} diff --git a/web/src/RouteMode.svelte b/web/src/RouteMode.svelte index a7364c1..8446c04 100644 --- a/web/src/RouteMode.svelte +++ b/web/src/RouteMode.svelte @@ -2,9 +2,8 @@ import type { MapMouseEvent } from "maplibre-gl"; import { MapEvents, GeoJSON, LineLayer, Marker } from "svelte-maplibre"; import { SplitComponent } from "svelte-utils/two_column_layout"; - import { mode, backend, type TravelMode, filterForMode } from "./stores"; + import { mode, backend, type TravelMode } from "./stores"; import PickTravelMode from "./PickTravelMode.svelte"; - import { notNull } from "svelte-utils"; import { constructMatchExpression } from "svelte-utils/map"; import { onMount } from "svelte"; import type { FeatureCollection } from "geojson"; @@ -79,19 +78,6 @@
- {#await notNull($backend).render() then data} - - - - {/await} - {#if start} A {/if} diff --git a/web/src/worker.ts b/web/src/worker.ts index 7f58d7b..fd57316 100644 --- a/web/src/worker.ts +++ b/web/src/worker.ts @@ -54,12 +54,12 @@ export class Backend { return JSON.parse(this.inner.getInvertedBoundary()); } - render(): FeatureCollection { + renderDebug(): FeatureCollection { if (!this.inner) { throw new Error("Backend used without a file loaded"); } - return JSON.parse(this.inner.render()); + return JSON.parse(this.inner.renderDebug()); } isochrone(req: {