Include mountains

Author: fallaciousreasoning

src/layers/mountains.ts

@@ -1,10 +1,10 @@
 import Feature from 'ol/Feature';
 import Point from 'ol/geom/Point';
 import { fromLonLat } from 'ol/proj';
-import { Style, Circle, Stroke, Fill, Text } from 'ol/style';
+import { Circle, Fill, Stroke, Style, Text } from 'ol/style';
 
 import fragment from '../stores/fragment';
-import mountains, { Mountain, Mountains } from '../stores/mountains';
+import mountains, { type Mountains } from '../stores/mountains';
 
 const styleCache = {};
 
@@ -34,13 +34,16 @@ export default {
         }
         return styleCache[size];
     },
-    getFeatures: async () => {
+    getData: async () => {
         const url = "https://raw.githubusercontent.com/fallaciousreasoning/nz-mountains/main/mountains.json"
         const response = await fetch(url);
         const result = await response.json() as Mountains;
         mountains.set(result);
-
-        const points = Object.values(result).filter(a => a.latlng);
+        return result
+    },
+    async getFeatures() {
+        const data = await this.getData();
+        const points = Object.values(data).filter(a => a.latlng);
         return points.map(mountain => {
             const coords = fromLonLat([mountain.latlng[1], mountain.latlng[0]]);
             const feature = new Feature(new Point(coords));

src/search/places.ts

@@ -1,4 +1,5 @@
 import huts from '../layers/huts'
+import mountains from '../layers/mountains';
 
 const placesUrl = '/data/places.json'
 
@@ -18,8 +19,12 @@ const makePlacesPromise = async (sources: (() => Promise<Place[]>)[]) => {
 export const getPlaces = () => {
     if (!placesPromise) {
         placesPromise = makePlacesPromise([
+            huts.getData,
+            () => mountains.getData()
+                .then(r => Object.entries(r)
+                    .filter(([,m]) => m.latlng?.length && m.name)
+                    .map(([url, m]) => ({ name: m.name, lat: m.latlng[0], lon: m.latlng[1], type: 'peak', href: url }))),
             () => fetch(placesUrl).then(r => r.json() as Promise<Place[]>),
-            huts.getData
         ])
     }
     return placesPromise