Add metacalculation on currentview

Customizations/AllKnownLayers.ts

@@ -20,8 +20,8 @@ export default class AllKnownLayers {
     public static sharedLayersJson: Map<string, any> = AllKnownLayers.getSharedLayersJson();
 
 
-    public static added_by_default: string[] = ["gps_location", "gps_location_history", "home_location", "gps_track","current_view"]
+    public static added_by_default: string[] = ["gps_location", "gps_location_history", "home_location", "gps_track"]
-    public static no_include: string[] = ["conflation", "left_right_style", "split_point"]
+    public static no_include: string[] = ["conflation", "left_right_style", "split_point","current_view"]
     /**
      * Layer IDs of layers which have special properties through built-in hooks
      */

Logic/FeatureSource/FeaturePipeline.ts

@@ -155,6 +155,7 @@ export default class FeaturePipeline {
 
             if (id === "current_view") {
                 handlePriviligedFeatureSource(state.currentView)
+                state.currentView.features.map(ffs => ffs[0]?.feature?.properties?.id).withEqualityStabilized((x,y) => x === y).addCallbackAndRunD(_ => self.applyMetaTags(state.currentView))
                 continue
             }
 
@@ -481,6 +482,7 @@ export default class FeaturePipeline {
                 self.applyMetaTags(tile)
             })
         })
+        this.applyMetaTags(this.state.currentView)
         self.metataggingRecalculated.ping()
 
     }

Logic/MetaTagging.ts

@@ -162,6 +162,8 @@ export default class MetaTagging {
         return functions;
     }
 
+    private static retaggingFuncCache = new Map<string, ((feature: any) => void)[]>()
+
     private static createRetaggingFunc(layer: LayerConfig):
         ((params: ExtraFuncParams, feature: any) => void) {
 
@@ -170,6 +172,13 @@ export default class MetaTagging {
             return undefined;
         }
 
+        let functions = MetaTagging.retaggingFuncCache.get(layer.id);
+        if (functions === undefined) {
+            functions = MetaTagging.createFunctionsForFeature(layer.id, calculatedTags)
+            MetaTagging.retaggingFuncCache.set(layer.id, functions)
+        }
+
+
         return (params: ExtraFuncParams, feature) => {
             const tags = feature.properties
             if (tags === undefined) {
@@ -177,7 +186,6 @@ export default class MetaTagging {
             }
 
             try {
-                const functions = MetaTagging.createFunctionsForFeature(layer.id, calculatedTags)
                 ExtraFunctions.FullPatchFeature(params, feature);
                 for (const f of functions) {
                     f(feature);

UI/BigComponents/LeftControls.ts

@@ -57,14 +57,15 @@ export default class LeftControls extends Combine {
                         return defaultIcon;
                     }
                     const tags = {...feature.properties, button: "yes"}
-                    const elem = currentViewFL.layerDef.mapRendering[0]?.GenerateLeafletStyle(tags, false, {
+                    const elem = currentViewFL.layerDef.mapRendering[0]?.GenerateLeafletStyle(new UIEventSource(tags), false, {
                         noSize: true
                     })?.html
+                    console.log("Elem is ", elem, "for", tags)
                     if(elem === undefined){
                         return defaultIcon
                     }
                     return elem
-                }))
+                })).SetClass("inline-block w-full h-full")
                 
                 const featureBox = new VariableUiElement(feature.map(feature => {
                     if(feature === undefined){return undefined}
@@ -81,7 +82,7 @@ export default class LeftControls extends Combine {
                     guiState.currentViewControlIsOpened
                 )
 
-            }).SetClass("inline-block w-full").onClick(() => {
+            }).onClick(() => {
                 guiState.currentViewControlIsOpened.setData(true)
             }),
 

assets/layers/current_view/current_view.json

@@ -2,7 +2,8 @@
   "id": "current_view",
   "description": "A meta-layer which contains one single feature, namely the BBOX of the current map view. This can be used to trigger special actions. If a popup is defined for this layer, this popup will be accessible via an extra button on screen.\n\nThe icon on the button is the default icon of the layer, but can be customized by detecting 'button=yes'.",
   "source": {
-    "osmTags": "current_view=yes"
+    "osmTags": "current_view=yes",
+    "maxCacheAge": 0
   },
   "shownByDefault": false,
   "title": "Current View",

assets/themes/grb_import/grb.json

@@ -29,6 +29,37 @@
     "minzoom": 19
   },
   "layers": [
+    {
+      "builtin": "current_view",
+      "override": {
+        "+mapRendering": [
+          {
+            "location": ["point"],
+            "icon": {
+              "render": "./assets/themes/grb_import/robot.svg"
+            },
+            "iconSize": "15,15,center"
+          }
+        ],
+        "calculatedTags": [
+          "_x='y'",
+          "_embedded_crab_addresses=feat.overlapWith('crab_address').length"
+        ],
+        "tagRenderings": [
+          {
+            "id": "hw",
+            "render": "There are {_embedded_crab_addresses} adresses in view",
+            "mappings": [{
+              "if": "_embedded_crab_addresses=",
+              "then": "Loading..."
+            },{
+              "if": "_embedded_crab_addresses=0",
+              "then": "No CRAB addresses in view. Zoom in more to see them"
+            }]
+          }
+        ]
+      }
+    },
     {
       "builtin": "type_node",
       "override": {

assets/themes/grb_import/license_info.json

@@ -6,5 +6,15 @@
       "Pieter Vander Vennet"
     ],
     "sources": []
+  },
+  {
+    "path": "robot.svg",
+    "license": "CC-BY 4.0 International",
+    "authors": [
+      "Font Awesome"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Font_Awesome_5_solid_robot.svg"
+    ]
   }
 ]

assets/themes/grb_import/robot.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path d="M0 256v128c0 17.7 14.3 32 32 32h32V224H32c-17.7 0-32 14.3-32 32zM464 96H352V32c0-17.7-14.3-32-32-32s-32 14.3-32 32v64H176c-44.2 0-80 35.8-80 80v272c0 35.3 28.7 64 64 64h320c35.3 0 64-28.7 64-64V176c0-44.2-35.8-80-80-80zM256 416h-64v-32h64v32zm-32-120c-22.1 0-40-17.9-40-40s17.9-40 40-40 40 17.9 40 40-17.9 40-40 40zm128 120h-64v-32h64v32zm96 0h-64v-32h64v32zm-32-120c-22.1 0-40-17.9-40-40s17.9-40 40-40 40 17.9 40 40-17.9 40-40 40zm192-72h-32v192h32c17.7 0 32-14.3 32-32V256c0-17.7-14.3-32-32-32z"/></svg>
+<!--
+Font Awesome Free 5.2.0 by @fontawesome - https://fontawesome.com
+License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+-->