Refactor Geocoder

a-b-street · Apr 27, 2024 · 59fc900 · 59fc900
1 parent c02e5e5
commit 59fc900
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 45 deletions.
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -30,7 +30,6 @@
     "vite-plugin-wasm-pack": "^0.1.12"
   },
   "dependencies": {
-    "@maptiler/geocoding-control": "^1.1.1",
     "@turf/bbox": "^6.5.0",
     "maplibre-draw-polygon": "github:dabreegster/maplibre-draw-polygon",
     "maplibre-gl": "^4.1.0",

diff --git a/web/src/common/Geocoder.svelte b/web/src/common/Geocoder.svelte
diff --git a/web/src/common/Map.svelte b/web/src/common/Map.svelte
@@ -3,6 +3,7 @@
   import type { Map, StyleSpecification } from "maplibre-gl";
   import { map as mapStore, basemap, maptilerApiKey } from "./store";
   import { PolygonToolLayer } from "maplibre-draw-polygon";
+  import { Geocoder } from "svelte-utils";
 
   let map: Map;
   let loaded = false;
@@ -39,6 +40,7 @@
       <ScaleControl />
       <NavigationControl position="bottom-right" visualizePitch />
       <PolygonToolLayer />
+      <Geocoder {map} apiKey={maptilerApiKey} />
       <slot />
     {/if}
   </MapLibre>

diff --git a/web/src/common/index.ts b/web/src/common/index.ts
@@ -1,5 +1,4 @@
 export { default as BasemapPicker } from "./BasemapPicker.svelte";
-export { default as Geocoder } from "./Geocoder.svelte";
 export { default as Layout } from "./Layout.svelte";
 export { default as Map } from "./Map.svelte";
 export { default as StreetView } from "./StreetView.svelte";

diff --git a/web/src/lane-editor/App.svelte b/web/src/lane-editor/App.svelte
@@ -6,7 +6,7 @@
   import init from "osm2streets-js";
   import { onMount } from "svelte";
   import AppSwitcher from "../AppSwitcher.svelte";
-  import { Geocoder, Layout, Map } from "../common";
+  import { Layout, Map } from "../common";
   import ImportControls from "../common/import/ImportControls.svelte";
   import EditWayControls from "./EditWayControls.svelte";
   import RenderBoundary from "../common/layers/RenderBoundary.svelte";
@@ -96,7 +96,6 @@
           />
         </GeoJSON>
       </div>
-      <Geocoder />
     </Map>
   </div>
 </Layout>
diff --git a/web/src/street-explorer/App.svelte b/web/src/street-explorer/App.svelte
@@ -8,7 +8,6 @@
     StreetView,
     ThemePicker,
     BasemapPicker,
-    Geocoder,
     Layout,
     Map,
   } from "../common";
@@ -106,7 +105,6 @@
         <ThemePicker />
         <StreetView />
       </div>
-      <Geocoder />
     </Map>
   </div>
 </Layout>