Refactor Geocoder

a-b-street · Apr 27, 2024 · c3cb831 · c3cb831
1 parent 98d1d5e
commit c3cb831
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 36 deletions.
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -28,7 +28,6 @@
     "vite-plugin-wasm-pack": "0.1.11"
   },
   "dependencies": {
-    "@maptiler/geocoding-control": "^1.2.2",
     "@picocss/pico": "^2.0.3",
     "maplibre-draw-polygon": "github:dabreegster/maplibre-draw-polygon",
     "svelte-maplibre": "^0.8.1",

diff --git a/web/src/App.svelte b/web/src/App.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
   import "@picocss/pico/css/pico.jade.min.css";
   import init, { MapModel } from "backend";
+  import { Geocoder } from "svelte-utils";
   import type { Map } from "maplibre-gl";
   import { onMount } from "svelte";
   import { FillLayer, GeoJSON, MapLibre } from "svelte-maplibre";
-  import { Geocoder, Layout } from "./common";
+  import { Layout } from "./common";
   import { PolygonToolLayer } from "maplibre-draw-polygon";
   import DebugMode from "./DebugMode.svelte";
   import IsochroneMode from "./IsochroneMode.svelte";
@@ -77,7 +78,7 @@
       hash
       bind:map
     >
-      <Geocoder />
+      <Geocoder {map} apiKey={maptilerApiKey} />
       <div bind:this={mapDiv} />
 
       <PolygonToolLayer />

diff --git a/web/src/common/Geocoder.svelte b/web/src/common/Geocoder.svelte
diff --git a/web/src/common/index.ts b/web/src/common/index.ts
@@ -4,7 +4,6 @@ import type {
   ExpressionSpecification,
 } from "maplibre-gl";
 
-export { default as Geocoder } from "./Geocoder.svelte";
 export { default as Layout } from "./Layout.svelte";
 export { default as Modal } from "./Modal.svelte";
 export { default as OverpassSelector } from "./OverpassSelector.svelte";