Fix: etymology theme now supports multi-apply again, uses lower zoom level for multiselect

src/Logic/MetaTagging.ts

@@ -8,7 +8,8 @@ import { GeoIndexedStoreForLayer } from "./FeatureSource/Actors/GeoIndexedStore"
 import { IndexedFeatureSource } from "./FeatureSource/FeatureSource"
 import OsmObjectDownloader from "./Osm/OsmObjectDownloader"
 import { Utils } from "../Utils"
-import { UIEventSource } from "./UIEventSource"
+import { Store, UIEventSource } from "./UIEventSource"
+import { SpecialVisualizationState } from "../UI/SpecialVisualization"
 
 /**
  * Metatagging adds various tags to the elements, e.g. lat, lon, surface area, ...
@@ -24,11 +25,12 @@ export default class MetaTagging {
     >()
 
     constructor(state: {
-        layout: LayoutConfig
-        osmObjectDownloader: OsmObjectDownloader
-        perLayer: ReadonlyMap<string, GeoIndexedStoreForLayer>
-        indexedFeatures: IndexedFeatureSource
-        featureProperties: FeaturePropertiesStore
+        readonly selectedElementAndLayer: Store<{ feature: Feature; layer: LayerConfig }>
+        readonly layout: LayoutConfig
+        readonly osmObjectDownloader: OsmObjectDownloader
+        readonly perLayer: ReadonlyMap<string, GeoIndexedStoreForLayer>
+        readonly indexedFeatures: IndexedFeatureSource
+        readonly featureProperties: FeaturePropertiesStore
     }) {
         const params = MetaTagging.createExtraFuncParams(state)
         for (const layer of state.layout.layers) {
@@ -58,6 +60,21 @@ export default class MetaTagging {
                 )
             })
         }
+
+        state.selectedElementAndLayer.addCallbackAndRunD(({ feature, layer }) => {
+            // Force update the tags of the currently selected element
+            MetaTagging.addMetatags(
+                [feature],
+                params,
+                layer,
+                state.layout,
+                state.osmObjectDownloader,
+                state.featureProperties,
+                {
+                    evaluateStrict: true,
+                }
+            )
+        })
     }
 
     /**

src/UI/Popup/MinimapViz.ts

@@ -53,7 +53,13 @@ export class MinimapViz implements SpecialVisualization {
                     }
 
                     let idList = [value]
-                    if (key !== "id" && value.startsWith("[")) {
+                    if (Array.isArray(value)) {
+                        idList = value
+                    } else if (
+                        key !== "id" &&
+                        typeof value === "string" &&
+                        value?.startsWith("[")
+                    ) {
                         // This is a list of values
                         idList = JSON.parse(value)
                     }

src/UI/Popup/MultiApplyViz.ts

@@ -47,7 +47,10 @@ export class MultiApplyViz implements SpecialVisualization {
                 if (ids === undefined) {
                     return []
                 }
-                return JSON.parse(ids)
+                if (typeof ids === "string" && ids.startsWith("[")) {
+                    return JSON.parse(ids)
+                }
+                return ids
             } catch (e) {
                 console.warn(
                     "Could not parse ",

src/UI/SpecialVisualization.ts

@@ -52,6 +52,7 @@ export interface SpecialVisualizationState {
      * Works together with 'selectedElement' to indicate what properties should be displayed
      */
     readonly selectedLayer: UIEventSource<LayerConfig>
+    readonly selectedElementAndLayer: Store<{ feature: Feature; layer: LayerConfig }>
 
     /**
      * If data is currently being fetched from external sources