Favourites: include _all_ tagRenderings

src/Models/ThemeConfig/Conversion/Conversion.ts

@@ -2,6 +2,7 @@ import { LayerConfigJson } from "../Json/LayerConfigJson"
 import { Utils } from "../../../Utils"
 import { QuestionableTagRenderingConfigJson } from "../Json/QuestionableTagRenderingConfigJson"
 import { ConversionContext } from "./ConversionContext"
+import { T } from "vitest/dist/types-aac763a5"
 
 export interface DesugaringContext {
     tagRenderings: Map<string, QuestionableTagRenderingConfigJson>
@@ -81,18 +82,36 @@ export class Pure<TIn, TOut> extends Conversion<TIn, TOut> {
     }
 }
 
+export class Bypass<T> extends DesugaringStep<T> {
+    private readonly _applyIf: (t: T) => boolean
+    private readonly _step: DesugaringStep<T>
+    constructor(applyIf: (t: T) => boolean, step: DesugaringStep<T>) {
+        super("Applies the step on the object, if the object satisfies the predicate", [], "Bypass")
+        this._applyIf = applyIf
+        this._step = step
+    }
+
+    convert(json: T, context: ConversionContext): T {
+        if (!this._applyIf(json)) {
+            return json
+        }
+        return this._step.convert(json, context)
+    }
+}
+
 export class Each<X, Y> extends Conversion<X[], Y[]> {
     private readonly _step: Conversion<X, Y>
     private readonly _msg: string
+    private readonly _filter: (x: X) => boolean
 
-    constructor(step: Conversion<X, Y>, msg?: string) {
+    constructor(step: Conversion<X, Y>, options?: { msg?: string }) {
         super(
             "Applies the given step on every element of the list",
             [],
             "OnEach(" + step.name + ")"
         )
         this._step = step
-        this._msg = msg
+        this._msg = options?.msg
     }
 
     convert(values: X[], context: ConversionContext): Y[] {

src/Models/ThemeConfig/Conversion/CreateNoteImportLayer.ts

@@ -85,7 +85,7 @@ export default class CreateNoteImportLayer extends Conversion<LayerConfigJson, L
             description: trs(t.description, { title: layer.title.render }),
             source: {
                 osmTags: {
-                    and: ["id~*"],
+                    and: ["id~[0-9]+", "comment_url~.*notes/[0-9]*g.json"],
                 },
                 geoJson:
                     "https://api.openstreetmap.org/api/0.6/notes.json?limit=10000&closed=" +

src/Models/ThemeConfig/Conversion/PrepareLayer.ts

@@ -566,6 +566,16 @@ export class AddQuestionBox extends DesugaringStep<LayerConfigJson> {
 }
 
 export class AddEditingElements extends DesugaringStep<LayerConfigJson> {
+    static addedElements: string[] = [
+        "minimap",
+        "just_created",
+        "split_button",
+        "move_button",
+        "delete_button",
+        "last_edit",
+        "favourite_state",
+        "all_tags",
+    ]
     private readonly _desugaring: DesugaringContext
 
     constructor(desugaring: DesugaringContext) {
@@ -1210,7 +1220,7 @@ class AddFavouriteBadges extends DesugaringStep<LayerConfigJson> {
     }
 
     convert(json: LayerConfigJson, context: ConversionContext): LayerConfigJson {
-        if (json.id === "favourite") {
+        if (json.source === "special" || json.source === "special:library") {
             return json
         }
         const pr = json.pointRendering?.[0]

src/Models/ThemeConfig/Conversion/Validation.ts

@@ -1,4 +1,4 @@
-import { Conversion, DesugaringStep, Each, Fuse, On, Pipe, Pure } from "./Conversion"
+import { Bypass, Conversion, DesugaringStep, Each, Fuse, On } from "./Conversion"
 import { LayerConfigJson } from "../Json/LayerConfigJson"
 import LayerConfig from "../LayerConfig"
 import { Utils } from "../../../Utils"
@@ -11,7 +11,6 @@ import { TagUtils } from "../../../Logic/Tags/TagUtils"
 import { ExtractImages } from "./FixImages"
 import { And } from "../../../Logic/Tags/And"
 import Translations from "../../../UI/i18n/Translations"
-import Svg from "../../../Svg"
 import FilterConfigJson from "../Json/FilterConfigJson"
 import DeleteConfig from "../DeleteConfig"
 import { QuestionableTagRenderingConfigJson } from "../Json/QuestionableTagRenderingConfigJson"
@@ -276,9 +275,9 @@ export class ValidateThemeAndLayers extends Fuse<LayoutConfigJson> {
             new On(
                 "layers",
                 new Each(
-                    new Pipe(
-                        new ValidateLayer(undefined, isBuiltin, doesImageExist, false, true),
-                        new Pure((x) => x?.raw)
+                    new Bypass(
+                        (layer) => Constants.added_by_default.indexOf(<any>layer.id) < 0,
+                        new ValidateLayerConfig(undefined, isBuiltin, doesImageExist, false, true)
                     )
                 )
             )
@@ -968,7 +967,7 @@ export class ValidateTagRenderings extends Fuse<TagRenderingConfigJson> {
             "Various validation on tagRenderingConfigs",
             new DetectShadowedMappings(layerConfig),
             new DetectConflictingAddExtraTags(),
-            //    new DetectNonErasedKeysInMappings(),
+            // TODO enable   new DetectNonErasedKeysInMappings(),
             new DetectMappingsWithImages(doesImageExist),
             new On("render", new ValidatePossibleLinks()),
             new On("question", new ValidatePossibleLinks()),
@@ -1350,6 +1349,29 @@ export class PrevalidateLayer extends DesugaringStep<LayerConfigJson> {
     }
 }
 
+export class ValidateLayerConfig extends DesugaringStep<LayerConfigJson> {
+    private readonly validator: ValidateLayer
+    constructor(
+        path: string,
+        isBuiltin: boolean,
+        doesImageExist: DoesImageExist,
+        studioValidations: boolean = false,
+        skipDefaultLayers: boolean = false
+    ) {
+        super("Thin wrapper around 'ValidateLayer", [], "ValidateLayerConfig")
+        this.validator = new ValidateLayer(
+            path,
+            isBuiltin,
+            doesImageExist,
+            studioValidations,
+            skipDefaultLayers
+        )
+    }
+
+    convert(json: LayerConfigJson, context: ConversionContext): LayerConfigJson {
+        return this.validator.convert(json, context).raw
+    }
+}
 export class ValidateLayer extends Conversion<
     LayerConfigJson,
     { parsed: LayerConfig; raw: LayerConfigJson }

src/Models/ThemeViewState.ts

@@ -462,6 +462,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
      * @private
      */
     private selectClosestAtCenter(i: number = 0) {
+        this.mapProperties.lastKeyNavigation.setData(Date.now() / 1000)
         const toSelect = this.closestFeatures.features.data[i]
         if (!toSelect) {
             return
@@ -567,46 +568,6 @@ export default class ThemeViewState implements SpecialVisualizationState {
         })
     }
 
-    private addLastClick(last_click: LastClickFeatureSource) {
-        // The last_click gets a _very_ special treatment as it interacts with various parts
-
-        this.featureProperties.trackFeatureSource(last_click)
-        this.indexedFeatures.addSource(last_click)
-
-        last_click.features.addCallbackAndRunD((features) => {
-            if (this.selectedLayer.data?.id === "last_click") {
-                // The last-click location moved, but we have selected the last click of the previous location
-                // So, we update _after_ clearing the selection to make sure no stray data is sticking around
-                this.selectedElement.setData(undefined)
-                this.selectedElement.setData(features[0])
-            }
-        })
-
-        new ShowDataLayer(this.map, {
-            features: new FilteringFeatureSource(this.newPointDialog, last_click),
-            doShowLayer: this.featureSwitches.featureSwitchEnableLogin,
-            layer: this.newPointDialog.layerDef,
-            selectedElement: this.selectedElement,
-            selectedLayer: this.selectedLayer,
-            metaTags: this.userRelatedState.preferencesAsTags,
-            onClick: (feature: Feature) => {
-                if (this.mapProperties.zoom.data < Constants.minZoomLevelToAddNewPoint) {
-                    this.map.data.flyTo({
-                        zoom: Constants.minZoomLevelToAddNewPoint,
-                        center: this.mapProperties.lastClickLocation.data,
-                    })
-                    return
-                }
-                // We first clear the selection to make sure no weird state is around
-                this.selectedLayer.setData(undefined)
-                this.selectedElement.setData(undefined)
-
-                this.selectedElement.setData(feature)
-                this.selectedLayer.setData(this.newPointDialog.layerDef)
-            },
-        })
-    }
-
     /**
      * Add the special layers to the map
      */
@@ -663,9 +624,7 @@ export default class ThemeViewState implements SpecialVisualizationState {
         }
 
         const rangeFLayer: FilteredLayer = this.layerState.filteredLayers.get("range")
-
         const rangeIsDisplayed = rangeFLayer?.isDisplayed
-
         if (
             !QueryParameters.wasInitialized(FilteredLayer.queryParameterKey(rangeFLayer.layerDef))
         ) {