Themeconfig: improve icon badge expansion

src/Models/ThemeConfig/Conversion/PrepareLayer.ts

@@ -1,18 +1,6 @@
-import {
+import { Concat, DesugaringContext, DesugaringStep, Each, FirstOf, Fuse, On, SetDefault } from "./Conversion"
-    Concat,
-    DesugaringContext,
-    DesugaringStep,
-    Each,
-    FirstOf,
-    Fuse,
-    On,
-    SetDefault,
-} from "./Conversion"
 import { LayerConfigJson } from "../Json/LayerConfigJson"
-import {
+import { MinimalTagRenderingConfigJson, TagRenderingConfigJson } from "../Json/TagRenderingConfigJson"
-    MinimalTagRenderingConfigJson,
-    TagRenderingConfigJson,
-} from "../Json/TagRenderingConfigJson"
 import { Utils } from "../../../Utils"
 import RewritableConfigJson from "../Json/RewritableConfigJson"
 import SpecialVisualizations from "../../../UI/SpecialVisualizations"
@@ -36,7 +24,7 @@ import { ExpandTagRendering } from "./ExpandTagRendering"
 class AddFiltersFromTagRenderings extends DesugaringStep<LayerConfigJson> {
     constructor() {
         super(
-            'Inspects all the tagRenderings. If some tagRenderings have the `filter` attribute set, introduce those filters. This step might introduce shorthand filter names, thus \'ExpandFilter\' should be run afterwards. Can be disabled with "#filter":"no-auto"',
+            "Inspects all the tagRenderings. If some tagRenderings have the `filter` attribute set, introduce those filters. This step might introduce shorthand filter names, thus 'ExpandFilter' should be run afterwards. Can be disabled with \"#filter\":\"no-auto\"",
             ["filter"],
             "AddFiltersFromTagRenderings"
         )
@@ -265,8 +253,8 @@ export class AddQuestionBox extends DesugaringStep<LayerConfigJson> {
             const question: QuestionableTagRenderingConfigJson = {
                 id: "leftover-questions",
                 render: {
-                    "*": `{questions( ,${Array.from(seen).join(";")})}`,
+                    "*": `{questions( ,${Array.from(seen).join(";")})}`
-                },
+                }
             }
             json.tagRenderings.push(question)
         }
@@ -348,13 +336,13 @@ export class AddEditingElements extends DesugaringStep<LayerConfigJson> {
         if (json.allowMove && !usedSpecialFunctions.has("move_button")) {
             json.tagRenderings.push({
                 id: "move-button",
-                render: { "*": "{move_button()}" },
+                render: { "*": "{move_button()}" }
             })
         }
         if (json.deletion && !usedSpecialFunctions.has("delete_button")) {
             json.tagRenderings.push({
                 id: "delete-button",
-                render: { "*": "{delete_button()}" },
+                render: { "*": "{delete_button()}" }
             })
         }
 
@@ -369,9 +357,9 @@ export class AddEditingElements extends DesugaringStep<LayerConfigJson> {
                     or: [
                         "__featureSwitchIsDebugging=true",
                         "mapcomplete-show_tags=full",
-                        "mapcomplete-show_debug=yes",
+                        "mapcomplete-show_debug=yes"
-                    ],
+                    ]
-                },
+                }
             }
             json.tagRenderings?.push(trc)
         }
@@ -580,7 +568,7 @@ export class RewriteSpecial extends DesugaringStep<TagRenderingConfigJson> {
                 .map((nm) => RewriteSpecial.escapeStr(special[nm] ?? "", context))
                 .join(",")
             return {
-                "*": `{${type}(${args})${clss}}`,
+                "*": `{${type}(${args})${clss}}`
             }
         }
 
@@ -678,11 +666,50 @@ class ExpandIconBadges extends DesugaringStep<PointRenderingConfigJson> {
         }[] = []
 
         for (let i = 0; i < badgesJson.length; i++) {
-            const iconBadge: {
+            const iconBadge: string | ({
                 if: TagConfigJson
                 then: string | MinimalTagRenderingConfigJson
-            } = badgesJson[i]
+            }) = badgesJson[i]
-            const expanded = this._expand.convert(
+
+
+            if (typeof iconBadge === "string") {
+
+                const expanded: QuestionableTagRenderingConfigJson[] = this._expand.convert(
+                    iconBadge,
+                    context.enters("iconBadges", i)
+                )
+
+                for (const tr of expanded) {
+                    const condition = tr.condition
+                    for (const trElement of tr.mappings) {
+                        const showIf = TagUtils.optimzeJson({
+                            and: Utils.NoNull([condition,
+                                {
+                                    or: Utils.NoNull([
+                                        trElement.alsoShowIf, trElement.if
+                                    ])
+                                }
+                            ])
+                        })
+                        if (showIf === true) {
+                            context.warn("Dropping iconBadge that would be _always_ shown: " + (trElement.icon ?? trElement.then))
+                            continue
+                        }
+                        if (showIf === false) {
+                            continue
+                        }
+                        iconBadges.push({
+                            if: showIf,
+                            then: trElement.icon ?? trElement.then
+                        })
+                    }
+
+
+                }
+                continue
+            }
+
+            const expanded: QuestionableTagRenderingConfigJson[] = this._expand.convert(
                 <QuestionableTagRenderingConfigJson>iconBadge.then,
                 context.enters("iconBadges", i)
             )
@@ -694,7 +721,7 @@ class ExpandIconBadges extends DesugaringStep<PointRenderingConfigJson> {
             iconBadges.push(
                 ...expanded.map((resolved) => ({
                     if: iconBadge.if,
-                    then: <MinimalTagRenderingConfigJson>resolved,
+                    then: <MinimalTagRenderingConfigJson>resolved
                 }))
             )
         }
@@ -870,7 +897,7 @@ export class AutoTitleIcon extends DesugaringStep<LayerConfigJson> {
         }
         return <TagRenderingConfigJson>{
             id: "title_icon_auto_" + tr.id,
-            mappings,
+            mappings
         }
     }
 
@@ -979,7 +1006,7 @@ export class PrepareLayer extends Fuse<LayerConfigJson> {
                 (layer) =>
                     new Concat(
                         new ExpandTagRendering(state, layer, {
-                            addToContext: options?.addTagRenderingsToContext ?? false,
+                            addToContext: options?.addTagRenderingsToContext ?? false
                         })
                     )
             ),

src/Models/ThemeConfig/Json/PointRenderingConfigJson.ts

@@ -70,16 +70,18 @@ export default interface PointRenderingConfigJson {
      * They will be added as a 25% height icon at the bottom right of the icon, with all the badges in a flex layout.
      *
      * Note: strings are interpreted as icons, so layering and substituting is supported. You can use `circle:white;./my_icon.svg` to add a background circle
+     * Alternatively, this can reuse a _tagRendering_ from another layer, e.g. one of the 'icons'-tagrenderings.
+     * See ExpandIconBadges on how this is handled
      * group: hidden
      */
-    iconBadges?: {
+    iconBadges?: (string | {
         if: TagConfigJson
         /**
          * Badge to show
          * Type: icon
          */
         then: string | MinimalTagRenderingConfigJson
-    }[]
+    })[]
 
     /**
      * question: What size should the marker be on the map?