From 5f1a7892c1976e6eeba7b0f640edc81ad9b6331d Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Mon, 7 Nov 2022 23:35:17 +0100
Subject: [PATCH] Fix typing and build

---
 Logic/ElementStorage.ts                       |  4 ++--
 .../Actors/MetaTagRecalculator.ts             |  2 +-
 Logic/GeoOperations.ts                        |  6 +++---
 Logic/Osm/Changes.ts                          | 21 +++++++++----------
 Logic/State/MapState.ts                       |  4 +++-
 UI/Popup/SplitRoadWizard.ts                   |  2 +-
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Logic/ElementStorage.ts b/Logic/ElementStorage.ts
index 581e8a12ec..2d35b05bde 100644
--- a/Logic/ElementStorage.ts
+++ b/Logic/ElementStorage.ts
@@ -3,11 +3,11 @@
  */
 import { UIEventSource } from "./UIEventSource"
 import { GeoJSONObject } from "@turf/turf"
-import {Feature, Point} from "geojson";
+import {Feature, Geometry, Point} from "geojson";
 import {OsmTags} from "../Models/OsmFeature";
 
 export class ElementStorage {
-    public ContainingFeatures = new Map<string, Feature<Point, OsmTags >>()
+    public ContainingFeatures = new Map<string, Feature<Geometry, OsmTags >>()
     private _elements = new Map<string, UIEventSource<any>>()
 
     constructor() {}
diff --git a/Logic/FeatureSource/Actors/MetaTagRecalculator.ts b/Logic/FeatureSource/Actors/MetaTagRecalculator.ts
index 933c1c1162..5bceca2bcc 100644
--- a/Logic/FeatureSource/Actors/MetaTagRecalculator.ts
+++ b/Logic/FeatureSource/Actors/MetaTagRecalculator.ts
@@ -27,7 +27,7 @@ class MetatagUpdater {
         const self = this
         this.params = {
             getFeatureById(id) {
-                return state.allElements.ContainingFeatures.get(id)
+                return <any> state.allElements.ContainingFeatures.get(id)
             },
             getFeaturesWithin(layerId, bbox) {
                 // We keep track of the BBOX that this source needs
diff --git a/Logic/GeoOperations.ts b/Logic/GeoOperations.ts
index 155072e62a..4aba7ce7b4 100644
--- a/Logic/GeoOperations.ts
+++ b/Logic/GeoOperations.ts
@@ -10,7 +10,7 @@ import {
     MultiPolygon,
     Polygon,
 } from "@turf/turf"
-import { LineString, Point } from "geojson"
+import {GeoJSON, LineString, Point} from "geojson"
 import togpx from "togpx"
 import Constants from "../Models/Constants"
 
@@ -37,8 +37,8 @@ export class GeoOperations {
      * Returns [lon,lat] coordinates
      * @param feature
      */
-    static centerpointCoordinates(feature: AllGeoJSON): [number, number] {
-        return <[number, number]>turf.center(feature).geometry.coordinates
+    static centerpointCoordinates(feature: AllGeoJSON | GeoJSON): [number, number] {
+        return <[number, number]>turf.center(<any> feature).geometry.coordinates
     }
 
     /**
diff --git a/Logic/Osm/Changes.ts b/Logic/Osm/Changes.ts
index 9f10543947..d59c25877e 100644
--- a/Logic/Osm/Changes.ts
+++ b/Logic/Osm/Changes.ts
@@ -1,18 +1,17 @@
-import { OsmNode, OsmObject, OsmRelation, OsmWay } from "./OsmObject"
-import { UIEventSource } from "../UIEventSource"
+import {OsmNode, OsmObject, OsmRelation, OsmWay} from "./OsmObject"
+import {UIEventSource} from "../UIEventSource"
 import Constants from "../../Models/Constants"
 import OsmChangeAction from "./Actions/OsmChangeAction"
-import { ChangeDescription, ChangeDescriptionTools } from "./Actions/ChangeDescription"
-import { Utils } from "../../Utils"
-import { LocalStorageSource } from "../Web/LocalStorageSource"
+import {ChangeDescription, ChangeDescriptionTools} from "./Actions/ChangeDescription"
+import {Utils} from "../../Utils"
+import {LocalStorageSource} from "../Web/LocalStorageSource"
 import SimpleMetaTagger from "../SimpleMetaTagger"
-import CreateNewNodeAction from "./Actions/CreateNewNodeAction"
 import FeatureSource from "../FeatureSource/FeatureSource"
-import { ElementStorage } from "../ElementStorage"
-import { GeoLocationPointProperties } from "../Actors/GeoLocationHandler"
-import { GeoOperations } from "../GeoOperations"
-import { ChangesetHandler, ChangesetTag } from "./ChangesetHandler"
-import { OsmConnection } from "./OsmConnection"
+import {ElementStorage} from "../ElementStorage"
+import {GeoLocationPointProperties} from "../Actors/GeoLocationHandler"
+import {GeoOperations} from "../GeoOperations"
+import {ChangesetHandler, ChangesetTag} from "./ChangesetHandler"
+import {OsmConnection} from "./OsmConnection"
 
 /**
  * Handles all changes made to OSM.
diff --git a/Logic/State/MapState.ts b/Logic/State/MapState.ts
index 6ae49aa352..bb6bf2858f 100644
--- a/Logic/State/MapState.ts
+++ b/Logic/State/MapState.ts
@@ -22,6 +22,8 @@ import { TiledStaticFeatureSource } from "../FeatureSource/Sources/StaticFeature
 import { Translation, TypedTranslation } from "../../UI/i18n/Translation"
 import { Tag } from "../Tags/Tag"
 import { OsmConnection } from "../Osm/OsmConnection"
+import {Feature, GeoJSON, LineString} from "geojson";
+import {OsmTags} from "../../Models/OsmFeature";
 
 export interface GlobalFilter {
     filter: FilterState
@@ -320,7 +322,7 @@ export default class MapState extends UserRelatedState {
                 return []
             }
 
-            const feature = {
+            const feature : Feature<LineString, OsmTags> = {
                 type: "Feature",
                 properties: {
                     id: "location_track",
diff --git a/UI/Popup/SplitRoadWizard.ts b/UI/Popup/SplitRoadWizard.ts
index 7d0c2bb11e..87c4a335fc 100644
--- a/UI/Popup/SplitRoadWizard.ts
+++ b/UI/Popup/SplitRoadWizard.ts
@@ -121,7 +121,7 @@ export default class SplitRoadWizard extends Toggle {
             }
 
             // Get nearest point on the road
-            const pointOnRoad = GeoOperations.nearestPoint(roadElement, coordinates) // pointOnRoad is a geojson
+            const pointOnRoad = GeoOperations.nearestPoint(<any> roadElement, coordinates) // pointOnRoad is a geojson
 
             // Update point properties to let it match the layer
             pointOnRoad.properties["_split_point"] = "yes"