Merge master

assets/themes/cyclofix/cyclofix.json

@@ -50,6 +50,35 @@
     "drinking_water",
     "bike_themed_object",
     "bike_cleaning",
-    "bike_parking"
+    "bike_parking",
+    {
+      "builtin": [
+        "charging_station"
+      ],
+      "override": {
+        "id": "charging_station_ebikes",
+        "minzoom": 14,
+        "source": {
+          "osmTags": {
+            "and+": [
+              "bicycle=yes"
+            ]
+          }
+        },
+        "filter": null,
+        "=presets": []
+      }
+    },
+    {
+      "#": "All charging stations at a high zoom level, to avoid duplicates",
+      "builtin": "charging_station",
+      "override": {
+        "name": null,
+        "filter": {
+          "sameAs": "charging_station_ebike"
+        },
+        "minzoom": 18
+      }
+    }
   ]
 }

assets/themes/grb_import/grb.json

@@ -498,6 +498,19 @@
                 "de": "Metatags noch nicht berechnet... Dieses Fenster erneut öffnen"
               }
             },
+            {
+              "if": {
+                "and": [
+                  "id~relation/*",
+                  "_overlap_percentage>50",
+                  "_reverse_overlap_percentage>50",
+                  "_overlaps_with!="
+                ]
+              },
+              "then": {
+                "en": "This building has holes and is modeled as a relation. As such, it cannot be conflated. Conflate it manually via <a href='https://buildings.osm.be/#/'>the building export site</a> {open_in_josm()}"
+              }
+            },
             {
               "#": "Actually the same as below, except that the text shows 'add the address' too",
               "if": {

assets/themes/personal/personal.json

@@ -41,8 +41,9 @@
   "overpassMaxZoom": 15,
   "overrideAll": {
     "minzoom": 17,
-    "syncSelection": "theme",
+    "syncSelection": "theme-only",
     "shownByDefault": false
   },
+  "enableNoteImports": false,
   "layers": []
 }

assets/themes/street_lighting/street_lighting.json

@@ -70,6 +70,7 @@
         }
       ],
       "tagRenderings": [
+        "images",
         {
           "id": "lit",
           "question": {
@@ -189,6 +190,7 @@
         }
       ],
       "tagRenderings": [
+        "images",
         {
           "id": "lit",
           "question": {

assets/themes/toerisme_vlaanderen/toerisme_vlaanderen.json

@@ -85,7 +85,8 @@
         "filter": {
           "sameAs": "charging_station_ebike"
         },
-        "minzoom": 18
+        "minzoom": 18,
+        "=presets": []
       }
     },
     {

assets/themes/uk_addresses/uk_addresses.json

@@ -261,7 +261,8 @@
             "en": "What is the sub-unit for this address? <div class='subtle'>Some named building or large complexes are split into sub-units (e.g. \"1\", \"Flat 2\", \"Unit C\")</div>"
           },
           "freeform": {
-            "key": "addr:unit"
+            "key": "addr:unit",
+            "addExtraTags": ["not:addr:unit="]
           },
           "mappings": [
             {
@@ -390,7 +391,8 @@
           "freeform": {
             "key": "addr:substreet",
             "addExtraTags": [
-              "addr:street="
+              "addr:street=",
+              "not:addr:substreet="
             ]
           },
           "mappings": [
@@ -469,7 +471,8 @@
             "en": "What is the parent street name for this address?<div class='subtle'>This street name will appear after the place name or first street name in the address</div>"
           },
           "freeform": {
-            "key": "addr:parentstreet"
+            "key": "addr:parentstreet",
+            "addExtraTags": ["not:addr:parentstreet="]
           },
           "mappings": [
             {