Refactor Geocoder

a-b-street · Apr 27, 2024 · b577d9d · b577d9d
1 parent 64e2c2b
commit b577d9d
Show file tree

Hide file tree

Showing 5 changed files with 10 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",
     "@turf/along": "^6.5.0",
     "maplibre-draw-polygon": "github:dabreegster/maplibre-draw-polygon",

diff --git a/web/src/App.svelte b/web/src/App.svelte
@@ -9,9 +9,9 @@
   import initRouteSnapper from "route-snapper";
   import { onMount } from "svelte";
   import { FillLayer, GeoJSON, MapLibre } from "svelte-maplibre";
+  import { Geocoder } from "svelte-utils";
   import {
     DisableInteractiveLayers,
-    Geocoder,
     Layout,
     layerId,
     StreetView,
@@ -143,7 +143,7 @@
         },
       ]}
     >
-      <Geocoder />
+      <Geocoder {map} apiKey={maptilerApiKey} />
       <div bind:this={mapDiv} />
       {#if $mode.mode == "title"}
         <TitleMode {wasmReady} />

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
@@ -6,7 +6,6 @@ import type {
 
 export { default as BasemapPicker } from "./BasemapPicker.svelte";
 export { default as DisableInteractiveLayers } from "./DisableInteractiveLayers.svelte";
-export { default as Geocoder } from "./Geocoder.svelte";
 export { default as Layout } from "./Layout.svelte";
 export { default as Link } from "./Link.svelte";
 export { default as Modal } from "./Modal.svelte";