From 5e6cd7d2dd3a64def6b95d3b08ce6d3747d37242 Mon Sep 17 00:00:00 2001
From: Dustin Carlino <dabreegster@gmail.com>
Date: Fri, 17 May 2024 12:09:01 +0100
Subject: [PATCH] Use organized map subpaths

---
 web/package-lock.json        |  2 +-
 web/src/AmenityLayer.svelte  |  3 ++-
 web/src/App.svelte           |  3 ++-
 web/src/DebugMode.svelte     |  3 ++-
 web/src/IsochroneMode.svelte | 10 ++--------
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/web/package-lock.json b/web/package-lock.json
index a0d9844..80e7750 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -3479,7 +3479,7 @@
     },
     "node_modules/svelte-utils": {
       "version": "0.0.1",
-      "resolved": "git+ssh://git@github.com/a-b-street/svelte-utils.git#30b957ab66df79d1189162ec6c711ac3019ede20",
+      "resolved": "git+ssh://git@github.com/a-b-street/svelte-utils.git#a4bb9e110ff815a000554a9683215a9f704d9684",
       "dependencies": {
         "@maptiler/geocoding-control": "^1.2.2",
         "@turf/bbox": "^7.0.0-alpha.114",
diff --git a/web/src/AmenityLayer.svelte b/web/src/AmenityLayer.svelte
index 0a15654..4bfc57a 100644
--- a/web/src/AmenityLayer.svelte
+++ b/web/src/AmenityLayer.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { CircleLayer, hoverStateFilter } from "svelte-maplibre";
-  import { PropertiesTable, Popup, notNull } from "svelte-utils";
+  import { PropertiesTable, notNull } from "svelte-utils";
+  import { Popup } from "svelte-utils/map";
   import type { Feature, Point } from "geojson";
 
   export let hovered: Feature<Point> | null = null;
diff --git a/web/src/App.svelte b/web/src/App.svelte
index ce3bd2e..a5a1f71 100644
--- a/web/src/App.svelte
+++ b/web/src/App.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import "@picocss/pico/css/pico.jade.min.css";
-  import { Geocoder, notNull } from "svelte-utils";
+  import { notNull } from "svelte-utils";
+  import { Geocoder } from "svelte-utils/map";
   import type { Map } from "maplibre-gl";
   import { onMount } from "svelte";
   import { FillLayer, GeoJSON, MapLibre } from "svelte-maplibre";
diff --git a/web/src/DebugMode.svelte b/web/src/DebugMode.svelte
index 13d02a9..38614c8 100644
--- a/web/src/DebugMode.svelte
+++ b/web/src/DebugMode.svelte
@@ -4,7 +4,8 @@
   import SplitComponent from "./SplitComponent.svelte";
   import AmenityList from "./AmenityList.svelte";
   import AmenityLayer from "./AmenityLayer.svelte";
-  import { PropertiesTable, Popup, notNull } from "svelte-utils";
+  import { PropertiesTable, notNull } from "svelte-utils";
+  import { Popup } from "svelte-utils/map";
   import { mode, backend, type TravelMode, filterForMode } from "./stores";
   import { onMount } from "svelte";
   import type { FeatureCollection } from "geojson";
diff --git a/web/src/IsochroneMode.svelte b/web/src/IsochroneMode.svelte
index 679ee2c..faf896f 100644
--- a/web/src/IsochroneMode.svelte
+++ b/web/src/IsochroneMode.svelte
@@ -8,14 +8,8 @@
   import SplitComponent from "./SplitComponent.svelte";
   import { mode, backend, type TravelMode, filterForMode } from "./stores";
   import { PickTravelMode } from "./common";
-  import {
-    SequentialLegend,
-    Popup,
-    makeColorRamp,
-    isLine,
-    isPolygon,
-    notNull,
-  } from "svelte-utils";
+  import { SequentialLegend, notNull } from "svelte-utils";
+  import { Popup, makeColorRamp, isLine, isPolygon } from "svelte-utils/map";
   import { onMount } from "svelte";
 
   let travelMode: TravelMode = "foot";