More svelte work

Logic/GeoOperations.ts

@@ -209,11 +209,15 @@ export class GeoOperations {
      * GeoOperations.inside([1.42822265625, 48.61838518688487], multiPolygon) // => false
      * GeoOperations.inside([4.02099609375, 47.81315451752768], multiPolygon) // => false
      */
-    public static inside(pointCoordinate: [number, number] | Feature<Point>, feature): boolean {
+    public static inside(
+        pointCoordinate: [number, number] | Feature<Point>,
+        feature: Feature
+    ): boolean {
         // ray-casting algorithm based on
         // http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html
 
         if (feature.geometry.type === "Point") {
+            // The feature that should 'contain' pointCoordinate is a point itself, so it cannot contain anything
             return false
         }
 
@@ -227,6 +231,7 @@ export class GeoOperations {
         if (feature.geometry.type === "MultiPolygon") {
             const coordinatess = feature.geometry.coordinates
             for (const coordinates of coordinatess) {
+                // @ts-ignore
                 const inThisPolygon = GeoOperations.pointInPolygonCoordinates(x, y, coordinates)
                 if (inThisPolygon) {
                     return true
@@ -236,6 +241,7 @@ export class GeoOperations {
         }
 
         if (feature.geometry.type === "Polygon") {
+            // @ts-ignore
             return GeoOperations.pointInPolygonCoordinates(x, y, feature.geometry.coordinates)
         }
 

Logic/UIEventSource.ts

@@ -114,7 +114,7 @@ export abstract class Store<T> implements Readable<T> {
     abstract map<J>(f: (t: T) => J): Store<J>
     abstract map<J>(f: (t: T) => J, extraStoresToWatch: Store<any>[]): Store<J>
 
-    public mapD<J>(f: (t: T) => J, extraStoresToWatch: Store<any>[]): Store<J> {
+    public mapD<J>(f: (t: T) => J, extraStoresToWatch?: Store<any>[]): Store<J> {
         return this.map((t) => {
             if (t === undefined) {
                 return undefined

UI/BigComponents/BackgroundMapSwitch.ts

@@ -108,7 +108,10 @@ class SingleLayerSelectionButton extends Toggle {
             // Is the previous layer still valid? If so, we don't bother to switch
             if (
                 previousLayer.data.feature === null ||
-                GeoOperations.inside(locationControl.data, previousLayer.data.feature)
+                GeoOperations.inside(
+                    [locationControl.data.lon, locationControl.data.lat],
+                    previousLayer.data.feature
+                )
             ) {
                 return
             }

UI/BigComponents/ContactLink.svelte

@@ -1,11 +1,14 @@
-<!-- A contact link indicates how a mapper can contact their local community -->
 <script lang="ts">
     import {Store} from "../../Logic/UIEventSource";
-
+    // A contact link indicates how a mapper can contact their local community  
-    <!-- The _properties_ of a community feature -->
+    // The _properties_ of a community feature
     export let country: Store<{ resources; nameEn: string }>
-    let resources = country.mapD(country => Object.values(country?.resources ?? {}))
+    let resources : Store<{ id: string, resolved: Record<string, string> }[]> = country.map(country => {
-
+        if(country === undefined){
+            return []
+        }
+        return Array.from(Object.values(country?.resources ?? {}))
+    })
 </script>
 
 <div>

package-lock.json

@@ -9,6 +9,7 @@
       "version": "0.25.1",
       "license": "GPL-3.0-or-later",
       "dependencies": {
+        "@rollup/plugin-typescript": "^11.0.0",
         "@turf/boolean-intersects": "^6.5.0",
         "@turf/buffer": "^6.5.0",
         "@turf/collect": "^6.5.0",
@@ -79,9 +80,10 @@
         "sharp": "^0.30.5",
         "svelte": "^3.55.1",
         "svelte-check": "^3.0.2",
+        "svelte-preprocess": "^5.0.1",
         "ts-node": "^10.9.1",
         "ts2json-schema": "^1.4.0",
-        "tslib": "^2.4.1",
+        "tslib": "^2.5.0",
         "tslint": "^6.1.3",
         "tslint-no-circular-imports": "^0.7.0",
         "typescript": "^4.7.4",
@@ -1784,11 +1786,35 @@
         }
       }
     },
+    "node_modules/@rollup/plugin-typescript": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-11.0.0.tgz",
+      "integrity": "sha512-goPyCWBiimk1iJgSTgsehFD5OOFHiAknrRJjqFCudcW8JtWiBlK284Xnn4flqMqg6YAjVG/EE+3aVzrL5qNSzQ==",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.1",
+        "resolve": "^1.22.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.14.0||^3.0.0",
+        "tslib": "*",
+        "typescript": ">=3.7.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        },
+        "tslib": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@rollup/pluginutils": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz",
       "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==",
-      "dev": true,
       "dependencies": {
         "@types/estree": "^1.0.0",
         "estree-walker": "^2.0.2",
@@ -3429,8 +3455,7 @@
     "node_modules/@types/estree": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz",
-      "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==",
+      "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="
-      "dev": true
     },
     "node_modules/@types/geojson": {
       "version": "7946.0.10",
@@ -5158,8 +5183,7 @@
     "node_modules/estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-      "dev": true
     },
     "node_modules/esutils": {
       "version": "2.0.3",
@@ -8023,7 +8047,7 @@
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.10.0.tgz",
       "integrity": "sha512-JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA==",
-      "dev": true,
+      "devOptional": true,
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -9358,10 +9382,10 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.4.1",
+      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
-      "dev": true
+      "devOptional": true
     },
     "node_modules/tslint": {
       "version": "6.1.3",
@@ -11903,11 +11927,19 @@
         "@rollup/pluginutils": "^5.0.1"
       }
     },
+    "@rollup/plugin-typescript": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-11.0.0.tgz",
+      "integrity": "sha512-goPyCWBiimk1iJgSTgsehFD5OOFHiAknrRJjqFCudcW8JtWiBlK284Xnn4flqMqg6YAjVG/EE+3aVzrL5qNSzQ==",
+      "requires": {
+        "@rollup/pluginutils": "^5.0.1",
+        "resolve": "^1.22.1"
+      }
+    },
     "@rollup/pluginutils": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.2.tgz",
       "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==",
-      "dev": true,
       "requires": {
         "@types/estree": "^1.0.0",
         "estree-walker": "^2.0.2",
@@ -13209,8 +13241,7 @@
     "@types/estree": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz",
-      "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==",
+      "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="
-      "dev": true
     },
     "@types/geojson": {
       "version": "7946.0.10",
@@ -14549,8 +14580,7 @@
     "estree-walker": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
-      "dev": true
     },
     "esutils": {
       "version": "2.0.3",
@@ -16722,7 +16752,7 @@
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.10.0.tgz",
       "integrity": "sha512-JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "fsevents": "~2.3.2"
       }
@@ -17660,10 +17690,10 @@
       }
     },
     "tslib": {
-      "version": "2.4.1",
+      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
-      "dev": true
+      "devOptional": true
     },
     "tslint": {
       "version": "6.1.3",

package.json

@@ -5,7 +5,7 @@
   "description": "A small website to edit OSM easily",
   "bugs": "https://github.com/pietervdvn/MapComplete/issues",
   "homepage": "https://mapcomplete.osm.be",
-  "main": "index.js",
+  "main": "index.ts",
   "type": "module",
   "scripts": {
     "start": "npm run generate:layeroverview && npm run strt",
@@ -64,6 +64,7 @@
     "not op_mini all"
   ],
   "dependencies": {
+    "@rollup/plugin-typescript": "^11.0.0",
     "@turf/boolean-intersects": "^6.5.0",
     "@turf/buffer": "^6.5.0",
     "@turf/collect": "^6.5.0",
@@ -134,9 +135,10 @@
     "sharp": "^0.30.5",
     "svelte": "^3.55.1",
     "svelte-check": "^3.0.2",
+    "svelte-preprocess": "^5.0.1",
     "ts-node": "^10.9.1",
     "ts2json-schema": "^1.4.0",
-    "tslib": "^2.4.1",
+    "tslib": "^2.5.0",
     "tslint": "^6.1.3",
     "tslint-no-circular-imports": "^0.7.0",
     "typescript": "^4.7.4",