Merge develop

src/Logic/FeatureSource/Sources/LastClickFeatureSource.ts

@@ -5,6 +5,7 @@ import { Feature, Point } from "geojson"
 import { TagUtils } from "../../Tags/TagUtils"
 import BaseUIElement from "../../../UI/BaseUIElement"
 import { Utils } from "../../../Utils"
+import { OsmTags } from "../../../Models/OsmFeature"
 
 /**
  * Highly specialized feature source.
@@ -12,8 +13,14 @@ import { Utils } from "../../../Utils"
  */
 export class LastClickFeatureSource implements WritableFeatureSource {
     public readonly features: UIEventSource<Feature[]> = new UIEventSource<Feature[]>([])
+    public readonly hasNoteLayer: boolean
+    public readonly renderings: string[]
+    public readonly hasPresets: boolean
+    private i: number = 0
 
     constructor(location: Store<{ lon: number; lat: number }>, layout: LayoutConfig) {
+        this.hasNoteLayer = layout.layers.some((l) => l.id === "note")
+        this.hasPresets = layout.layers.some((l) => l.presets?.length > 0)
         const allPresets: BaseUIElement[] = []
         for (const layer of layout.layers)
             for (let i = 0; i < (layer.presets ?? []).length; i++) {
@@ -26,35 +33,36 @@ export class LastClickFeatureSource implements WritableFeatureSource {
                 allPresets.push(html)
             }
 
-        const renderings = Utils.Dedup(
+        this.renderings = Utils.Dedup(
             allPresets.map((uiElem) =>
                 Utils.runningFromConsole ? "" : uiElem.ConstructElement().innerHTML
             )
         )
 
-        let i = 0
-
         location.addCallbackAndRunD(({ lon, lat }) => {
-            const properties = {
-                lastclick: "yes",
-                id: "last_click_" + i,
-                has_note_layer: layout.layers.some((l) => l.id === "note") ? "yes" : "no",
-                has_presets: layout.layers.some((l) => l.presets?.length > 0) ? "yes" : "no",
-                renderings: renderings.join(""),
-                number_of_presets: "" + renderings.length,
-                first_preset: renderings[0],
-            }
-            i++
-
-            const point = <Feature<Point>>{
-                type: "Feature",
-                properties,
-                geometry: {
-                    type: "Point",
-                    coordinates: [lon, lat],
-                },
-            }
-            this.features.setData([point])
+            this.features.setData([this.createFeature(lon, lat)])
         })
     }
+
+    public createFeature(lon: number, lat: number): Feature<Point, OsmTags> {
+        const properties: OsmTags = {
+            lastclick: "yes",
+            id: "last_click_" + this.i,
+            has_note_layer: this.hasNoteLayer ? "yes" : "no",
+            has_presets: this.hasPresets ? "yes" : "no",
+            renderings: this.renderings.join(""),
+            number_of_presets: "" + this.renderings.length,
+            first_preset: this.renderings[0],
+        }
+        this.i++
+
+        return <Feature<Point, OsmTags>>{
+            type: "Feature",
+            properties,
+            geometry: {
+                type: "Point",
+                coordinates: [lon, lat],
+            },
+        }
+    }
 }