Cleanup types

Author: fallaciousreasoning

src/layers/layerDefinitions.ts

@@ -1,7 +1,6 @@
-import BaseLayer from "ol/layer/Base";
-import { TileCoord } from "ol/tilecoord";
-import { pickRandom } from "../utils/random";
 import RenderEvent from "ol/render/Event";
+import { type TileCoord } from "ol/tilecoord";
+import { pickRandom } from "../utils/random";
 
 export interface BaseLayerDefinition {
     name: string;
@@ -61,7 +60,7 @@ export const layerDefinitions: TileLayerDefinition[] = [
         description: "Terrain relief overlay",
         type: 'overlay',
         defaultVisible: true,
-        prerender: e => e.context.canvas.getContext('2d').globalCompositeOperation = 'multiply',
+        prerender: e => e.context!.canvas.getContext('2d')!.globalCompositeOperation = 'multiply',
         minZoom: 10,
         url: 'https://tiles-cdn.koordinates.com/services;key=d0772bed2204423f87157f7fb1223389/tiles/v4/layer=50765/EPSG:3857/{z}/{x}/{y}.png'
     }

src/layers/mountains.ts

@@ -45,7 +45,7 @@ export default {
         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 coords = fromLonLat([mountain.latlng![1], mountain.latlng![0]]);
             const feature = new Feature(new Point(coords));
             feature.setId(mountain.link)
             return feature;
@@ -59,7 +59,7 @@ export default {
 
         fragment.update(value => ({
             ...value,
-            page: `mountains/${encodeURIComponent(originalFeature.getId())}`
+            page: `mountains/${encodeURIComponent(originalFeature.getId()!)}`
         }))
 
     }

src/search/places.ts

@@ -22,8 +22,8 @@ export const getPlaces = () => {
             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 }))),
+                    .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[]>),
         ])
     }

src/stores/mountains.ts

@@ -1,7 +1,16 @@
 import { writable } from "svelte/store";
-import type MountainsJson from '../../public/data/mountains.json'
 
-export type Mountain = typeof MountainsJson[keyof typeof MountainsJson] & { routes: Route[] };
+export type Mountain = {
+    link: string;
+    name: string,
+    altitude: string,
+    description: string | null,
+    latlng?: [number, number],
+    routes: Route[],
+    places: Mountain[],
+    image: string | null,
+    images: string[]
+}
 export type Mountains = {
     [href: string]: Mountain
 }