Include huts in places

Author: fallaciousreasoning

src/components/MapSearch.svelte

@@ -1,10 +1,10 @@
 <script lang="ts">
-  import geocode from '../search/geocode'
-  import { createEventDispatcher, tick } from 'svelte'
+  import { createEventDispatcher } from 'svelte'
   import { getOlContext } from '../ol/Map.svelte'
-  import MapControl from './MapControl.svelte'
-  import grow from '../transitions/grow'
+  import geocode from '../search/geocode'
   import type { Place } from '../search/places'
+  import grow from '../transitions/grow'
+  import MapControl from './MapControl.svelte'
 
   const dispatcher = createEventDispatcher()
   const { map } = getOlContext()

src/layers/FeatureLayers.svelte

@@ -1,14 +1,9 @@
 <script lang="ts">
+  import ClusterLayer from '../ol/ClusterLayer.svelte'
   import { getOlContext } from '../ol/Map.svelte'
-  import { onMount, tick } from 'svelte'
   import { enableZoomToCluster } from '../utils/zoomToFeature'
-  import ClusterLayer from '../ol/ClusterLayer.svelte'
-  import huts from './huts'
-  import liveWeather from './LiveWeather.svelte'
-  import VectorLayer from '../ol/VectorLayer.svelte'
-  import VectorSource from 'ol/source/Vector'
-  import onMountTick from '../utils/onMountTick'
   import LiveWeather from './LiveWeather.svelte'
+  import huts from './huts'
   import mountains from './mountains'
 
   const { map } = getOlContext()

src/layers/huts.ts

@@ -1,8 +1,8 @@
 import Feature from 'ol/Feature';
 import Point from 'ol/geom/Point';
 import { fromLonLat } from 'ol/proj';
-import GeoJSON from 'ol/format/GeoJSON';
-import { Style, Circle, Stroke, Fill, Text } from 'ol/style';
+import { Circle, Fill, Stroke, Style, Text } from 'ol/style';
+import type { Place } from '../search/places';
 import fragment from '../stores/fragment';
 
 const styleCache = {};
@@ -33,10 +33,17 @@ export default {
         }
         return styleCache[size];
     },
-    getFeatures: async () => {
+    getData: async () => {
         const url = "/data/huts.json"
         const response = await fetch(url);
         const data = await response.json() as any[];
+        for (const hut of data) {
+            hut.place = 'hut'
+        }
+        return data as Place[]
+    },
+    async getFeatures() {
+        const data = await this.getData()
         return data.map(hut => {
             const coords = fromLonLat([hut.lon, hut.lat]);
             const feature = new Feature(new Point(coords));

src/search/places.ts

@@ -1,4 +1,6 @@
-const url = '/data/places.json'
+import huts from '../layers/huts'
+
+const placesUrl = '/data/places.json'
 
 export interface Place {
     name: string,
@@ -9,9 +11,16 @@ export interface Place {
 
 let placesPromise: Promise<Place[]>;
 
+const makePlacesPromise = async (sources: (() => Promise<Place[]>)[]) => {
+    return Promise.all(sources.map(s => s())).then(r => r.flat())
+}
+
 export const getPlaces = () => {
     if (!placesPromise) {
-        placesPromise = fetch(url).then(r => r.json())
+        placesPromise = makePlacesPromise([
+            () => fetch(placesUrl).then(r => r.json() as Promise<Place[]>),
+            huts.getData
+        ])
     }
     return placesPromise
 }