Merge branch 'develop' into theme/street_lighting

assets/layers/conflation/conflation.json

@@ -30,7 +30,16 @@
         },
         {
             "width": "3",
-            "color": "#00f"
+            "color": "#00f",
+            "dasharray": {
+                "render": "",
+                "mappings": [
+                    {
+                        "if": "resulting-geometry=yes",
+                        "then": "6 6"
+                    }
+                ]
+            }
         }
     ]
 }

assets/themes/grb_import/grb.json

@@ -29,6 +29,7 @@
     "minzoom": 18
   },
   "trackAllNodes": true,
+  "enableGeolocation": false,
   "layers": [
     {
       "builtin": "type_node",
@@ -41,6 +42,13 @@
           "_is_part_of_building_passage=feat.get('parent_ways')?.some(p => p.tunnel === 'building_passage') ?? false",
           "_is_part_of_highway=!feat.get('is_part_of_building_passage') && (feat.get('parent_ways')?.some(p => p.highway !== undefined && p.highway !== '') ?? false)",
           "_is_part_of_landuse=feat.get('parent_ways')?.some(p => (p.landuse !== undefined && p.landuse !== '') || (p.natural !== undefined && p.natural !== '')) ?? false"
+        ],
+        "mapRendering": [
+          {
+            "icon": "square:#00f",
+            "iconSize": "5,5,center",
+            "location": "point"
+          }
         ]
       }
     },
@@ -92,6 +100,9 @@
             "key": "building"
           },
           "render": "The building type is <b>{building}</b>",
+          "question": {
+            "en": "What kind of building is this?"
+          },
           "mappings": [
             {
               "if": "building=house",
@@ -392,9 +403,10 @@
         }
       ],
       "calculatedTags": [
-        "_embedded_in=feat.overlapWith('OSM-buildings').filter(f => f.feat.properties['addr:housenumber'] !== undefined)[0]?.feat?.properties ",
+        "_embedded_in=feat.overlapWith('OSM-buildings')[0]?.feat?.properties ",
         "_embedding_nr=feat.get('_embedded_in')['addr:housenumber']",
-        "_embedding_street=feat.get('_embedded_in')['addr:street']"
+        "_embedding_street=feat.get('_embedded_in')['addr:street']",
+        "_embedding_id=feat.get('_embedded_in').id"
       ],
       "isShown": {
         "render": "yes",
@@ -429,6 +441,11 @@
         {
           "id": "import-button",
           "render": "{import_button(OSM-buildings, addr:street=$STRAATNM; addr:housenumber=$HUISNR,Import this address,,,OSM-buildings,5)}"
+        },
+        {
+          "id": "apply-button",
+          "render": "{tag_apply(addr:street=$STRAATNM; addr:housenumber=$HUISNR,Apply this address on the OSM-building,,_embedding_id)}",
+          "condition": "_embedded_in!="
         }
       ]
     },
@@ -628,7 +645,7 @@
       "name": "GRB geometries",
       "title": "GRB outline",
       "calculatedTags": [
-        "_overlaps_with=feat.overlapWith('OSM-buildings').filter(f => f.overlap > 1 &&  (feat.get('_surface') < 20 || f.overlap / feat.get('_surface')) > 0.9)[0] ?? null",
+        "_overlaps_with=feat.overlapWith('OSM-buildings').filter(f => f.overlap > 1 &&  (feat.get('_surface') < 20 || f.overlap / feat.get('_surface')) > 0.5)[0] ?? null",
         "_overlap_absolute=feat.get('_overlaps_with')?.overlap",
         "_overlap_percentage=Math.round(100 * feat.get('_overlap_absolute') / feat.get('_surface')) ",
         "_osm_obj:source:ref=feat.get('_overlaps_with')?.feat?.properties['source:geometry:ref']",
@@ -638,7 +655,8 @@
         "_grb_ref=feat.properties['source:geometry:entity'] + '/' + feat.properties['source:geometry:oidn']",
         "_imported_osm_object_found= feat.properties['_osm_obj:source:ref'] == feat.properties._grb_ref",
         "_grb_date=feat.properties['source:geometry:date'].replace(/\\//g,'-')",
-        "_imported_osm_still_fresh= feat.properties['_osm_obj:source:date'] == feat.properties._grb_date"
+        "_imported_osm_still_fresh= feat.properties['_osm_obj:source:date'] == feat.properties._grb_date",
+        "_target_building_type=feat.properties['_osm_obj:building'] === 'yes' ? feat.properties.building : (feat.properties['_osm_obj:building'] ?? feat.properties.building)"
       ],
       "tagRenderings": [
         {
@@ -676,7 +694,7 @@
           "mappings": [
             {
               "if": "_overlaps_with!=null",
-              "then": "{import_button(OSM-buildings,building=$building; source:geometry:date=$_grb_date; source:geometry:ref=$_grb_ref, Replace the geometry in OpenStreetMap,,,_osm_obj:id)}"
+              "then": "{import_button(OSM-buildings,building=$_target_building_type; source:geometry:date=$_grb_date; source:geometry:ref=$_grb_ref, Replace the geometry in OpenStreetMap,,,_osm_obj:id)}"
             }
           ]
         },

assets/themes/postboxes/postboxes.json

@@ -48,7 +48,7 @@
       "tagRenderings": [
         "images",
         {
-          "id": "minimap",
+          "id": "Minimap",
           "render": "{minimap(17): height: 10rem; overflow: hidden; border: 1px solid #DADADA; border-radius: 0.5rem; }"
         }
       ],