Feature: add favourite

src/Models/ThemeConfig/Conversion/PrepareLayer.ts

@@ -26,7 +26,7 @@ import predifined_filters from "../../../../assets/layers/filters/filters.json"
 import { TagConfigJson } from "../Json/TagConfigJson"
 import PointRenderingConfigJson, { IconConfigJson } from "../Json/PointRenderingConfigJson"
 import ValidationUtils from "./ValidationUtils"
-import { RenderingSpecification, SpecialVisualization } from "../../../UI/SpecialVisualization"
+import { RenderingSpecification } from "../../../UI/SpecialVisualization"
 import { QuestionableTagRenderingConfigJson } from "../Json/QuestionableTagRenderingConfigJson"
 import { ConfigMeta } from "../../../UI/Studio/configMeta"
 import LineRenderingConfigJson from "../Json/LineRenderingConfigJson"
@@ -639,6 +639,13 @@ export class AddEditingElements extends DesugaringStep<LayerConfigJson> {
             json.tagRenderings.push(this._desugaring.tagRenderings.get("last_edit"))
         }
 
+        if (!usedSpecialFunctions.has("favourite_status")) {
+            json.tagRenderings.push({
+                id: "favourite_status",
+                render: { "*": "{favourite_status()}" },
+            })
+        }
+
         if (!usedSpecialFunctions.has("all_tags")) {
             const trc: QuestionableTagRenderingConfigJson = {
                 id: "all-tags",
@@ -1193,6 +1200,31 @@ class ExpandMarkerRenderings extends DesugaringStep<IconConfigJson> {
     }
 }
 
+class AddFavouriteBadges extends DesugaringStep<LayerConfigJson> {
+    constructor() {
+        super(
+            "Adds the favourite heart to the title and the rendering badges",
+            [],
+            "AddFavouriteBadges"
+        )
+    }
+
+    convert(json: LayerConfigJson, context: ConversionContext): LayerConfigJson {
+        if (json.id === "favourite") {
+            return json
+        }
+        const pr = json.pointRendering?.[0]
+        if (pr) {
+            pr.iconBadges ??= []
+            if (!pr.iconBadges.some((ti) => ti.if === "_favourite=yes")) {
+                pr.iconBadges.push({ if: "_favourite=yes", then: "circle:white;heart:red" })
+            }
+        }
+
+        return json
+    }
+}
+
 export class AddRatingBadge extends DesugaringStep<LayerConfigJson> {
     constructor() {
         super(
@@ -1206,6 +1238,10 @@ export class AddRatingBadge extends DesugaringStep<LayerConfigJson> {
         if (!json.tagRenderings) {
             return json
         }
+        if (json.titleIcons.some((ti) => ti === "icons.rating" || ti["id"] === "rating")) {
+            // already added
+            return json
+        }
 
         const specialVis: Exclude<RenderingSpecification, string>[] = <
             Exclude<RenderingSpecification, string>[]
@@ -1247,6 +1283,7 @@ export class PrepareLayer extends Fuse<LayerConfigJson> {
             ),
             new SetDefault("titleIcons", ["icons.defaults"]),
             new AddRatingBadge(),
+            new AddFavouriteBadges(),
             new On(
                 "titleIcons",
                 (layer) =>

src/Models/ThemeConfig/Conversion/Validation.ts

@@ -968,7 +968,7 @@ export class ValidateTagRenderings extends Fuse<TagRenderingConfigJson> {
             "Various validation on tagRenderingConfigs",
             new DetectShadowedMappings(layerConfig),
             new DetectConflictingAddExtraTags(),
-            new DetectNonErasedKeysInMappings(),
+            //    new DetectNonErasedKeysInMappings(),
             new DetectMappingsWithImages(doesImageExist),
             new On("render", new ValidatePossibleLinks()),
             new On("question", new ValidatePossibleLinks()),

src/Models/ThemeConfig/LayoutConfig.ts

@@ -305,6 +305,9 @@ export default class LayoutConfig implements LayoutInformation {
         }
         for (const layer of this.layers) {
             if (!layer.source) {
+                if (layer.isShown?.matchesProperties(tags)) {
+                    return layer
+                }
                 continue
             }
             if (layer.source.osmTags.matchesProperties(tags)) {