Merge develop

assets/layers/bike_shop/bike_shop.json

@@ -157,6 +157,10 @@
         ]
     },
     "titleIcons": [
+        {
+            "render": "<a href='https://fietsambassade.gent.be/' target='_blank'><img src='./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg'/></a>",
+            "condition": "operator=De Fietsambassade Gent"
+        },
         {
             "render": "<a href='https://fietsambassade.gent.be/' target='_blank'><img src='./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg'/></a>",
             "condition": "operator=De Fietsambassade Gent"
@@ -310,6 +314,13 @@
             },
             "id": "bike_shop-access"
         },
+        {
+            "render": "Enkel voor {access}",
+            "freeform": {
+                "key": "access"
+            },
+            "id": "bike_shop-access"
+        },
         {
             "id": "bike_repair_sells-bikes",
             "question": {
@@ -691,6 +702,11 @@
         ]
     },
     "iconOverlays": [
+        {
+            "if": "opening_hours~*",
+            "then": "isOpen",
+            "badge": true
+        },
         {
             "if": "opening_hours~*",
             "then": "isOpen",

assets/themes/benches/benches.json

@@ -58,6 +58,5 @@
     "bench",
     "bench_at_pt",
     "picnic_table"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/bicyclelib/bicyclelib.json

@@ -42,7 +42,6 @@
   "startLon": 0,
   "startZoom": 1,
   "widenFactor": 1.5,
-  "roamingRenderings": [],
   "layers": [
     {
       "builtin": "bicycle_library",

assets/themes/bookcases/bookcases.json

@@ -40,7 +40,6 @@
   "startLon": 0,
   "startZoom": 1,
   "widenFactor": 1,
-  "roamingRenderings": [],
   "layers": [
     "public_bookcase"
   ]

assets/themes/buurtnatuur/buurtnatuur.json

@@ -124,19 +124,6 @@
             "nl": "Voeg een ontbrekend, erkend natuurreservaat toe, bv. een gebied dat beheerd wordt door het ANB of natuurpunt"
           }
         }
-      ],
-      "mapRendering": [
-        {
-          "icon": {
-            "render": "circle:#ffffff;./assets/themes/buurtnatuur/nature_reserve.svg"
-          },
-          "iconSize": {
-            "render": "50,50,center"
-          },
-          "location": [
-            "point"
-          ]
-        }
       ]
     },
     {
@@ -235,19 +222,6 @@
             "nl": "Voeg een ontbrekend park toe"
           }
         }
-      ],
-      "mapRendering": [
-        {
-          "icon": {
-            "render": "circle:#ffffff;./assets/themes/buurtnatuur/park.svg"
-          },
-          "iconSize": {
-            "render": "40,40,center"
-          },
-          "location": [
-            "point"
-          ]
-        }
       ]
     },
     {
@@ -365,26 +339,14 @@
             "nl": "Voeg een ontbrekend bos toe aan de kaart"
           }
         }
-      ],
-      "mapRendering": [
-        {
-          "icon": {
-            "render": "circle:#ffffff;./assets/themes/buurtnatuur/forest.svg"
-          },
-          "iconSize": {
-            "render": "40,40,center"
-          },
-          "location": [
-            "point"
-          ]
-        }
       ]
     },
     "viewpoint"
   ],
-  "roamingRenderings": [
+  "overrideAll": {
+    "tagRenderings+": [
       {
-      "#": "Access tag",
+        "id": "Access tag",
         "condition": {
           "and": [
             "tourism!~viewpoint"
@@ -491,7 +453,7 @@
         ]
       },
       {
-      "#": "Operator tag",
+        "id": "Operator tag",
         "render": {
           "nl": "Beheer door {operator}"
         },
@@ -570,7 +532,7 @@
         }
       },
       {
-      "#": "Non-editable description {description}",
+        "id": "Non-editable description {description}",
         "render": {
           "nl": "Extra info: <i>{description}</i>"
         },
@@ -579,7 +541,7 @@
         }
       },
       {
-      "#": "Editable description {description:0}",
+        "id": "Editable description {description:0}",
         "question": "Is er extra info die je kwijt wil?<br/><span class='subtle'>De <i>naam</i> van het gebied wordt in de volgende vraag gesteld</span>",
         "render": {
           "nl": "Extra info via buurtnatuur.be: <i>{description:0}</i>"
@@ -589,7 +551,7 @@
         }
       },
       {
-      "#": "Name:nl-tag",
+        "id": "Name:nl-tag",
         "render": {
           "nl": "Dit gebied heet {name:nl}"
         },
@@ -607,7 +569,7 @@
         }
       },
       {
-      "#": "Name tag",
+        "id": "Name tag",
         "render": {
           "nl": "Dit gebied heet {name}"
         },
@@ -642,3 +604,4 @@
       }
     ]
   }
+}

assets/themes/campersite/campersite.json

@@ -676,31 +676,7 @@
           }
         }
       ],
-      "wayHandling": 2,
+      "wayHandling": 2
-      "mapRendering": [
-        {
-          "icon": {
-            "render": "circle:white;./assets/themes/campersite/caravan.svg",
-            "mappings": [
-              {
-                "if": {
-                  "and": [
-                    "fee=no"
-                  ]
-                },
-                "then": "circle:white;./assets/themes/campersite/caravan_green.svg"
-              }
-            ]
-          },
-          "iconSize": {
-            "render": "40,40,center"
-          },
-          "location": [
-            "point",
-            "centroid"
-          ]
-        }
-      ]
     },
     {
       "id": "dumpstations",
@@ -1099,24 +1075,13 @@
             "de": "Fügen Sie eine neue sanitäre Entsorgungsstation hinzu. Hier können Camper Abwasser oder chemischen Toilettenabfälle entsorgen. Oft gibt es auch Trinkwasser und Strom."
           }
         }
-      ],
-      "mapRendering": [
-        {
-          "icon": {
-            "render": "circle:white;./assets/themes/campersite/sanitary_dump_station.svg"
-          },
-          "iconSize": {
-            "render": "32,32,center"
-          },
-          "location": [
-            "point"
-          ]
-        }
       ]
     }
   ],
-  "roamingRenderings": [
+  "overrideAll": {
+    "tagRenderings+": [
       {
+        "id": "operator",
         "render": {
           "en": "This place is operated by {operator}",
           "ja": "この場所は{operator}によって運営されます",
@@ -1136,6 +1101,7 @@
         }
       },
       {
+        "id": "power_supply",
         "question": {
           "en": "Does this place have a power supply?",
           "ja": "この場所に電源はありますか?",
@@ -1178,3 +1144,4 @@
       }
     ]
   }
+}

assets/themes/charging_stations/charging_stations.json

@@ -46,6 +46,5 @@
   "defaultBackgroundId": "CartoDB.Voyager",
   "layers": [
     "charging_station"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/cyclestreets/cyclestreets.json

@@ -43,8 +43,172 @@
     "maxZoom": 12,
     "minNeededElements": 200
   },
-  "roamingRenderings": [
+  "layers": [
     {
+      "id": "fietsstraat",
+      "name": {
+        "nl": "Fietsstraten",
+        "en": "Cyclestreets",
+        "ja": "Cyclestreets",
+        "zh_Hant": "單車街道",
+        "it": "Strade ciclabili",
+        "de": "Fahrradstraßen"
+      },
+      "minzoom": 7,
+      "source": {
+        "osmTags": {
+          "and": [
+            "cyclestreet=yes"
+          ]
+        }
+      },
+      "isShown": {
+        "render": "yes",
+        "mappings": [
+          {
+            "if": "id!~way/.*",
+            "then": "no"
+          }
+        ]
+      },
+      "description": {
+        "nl": "Een fietsstraat is een straat waar gemotoriseerd verkeer een fietser niet mag inhalen.",
+        "en": "A cyclestreet is a street where motorized traffic is not allowed to overtake a cyclist",
+        "ja": "cyclestreetとは、自動車による交通がサイクリストを追い越すことができない道路です",
+        "it": "Una strada ciclabile è una strada in cui i veicoli a motore non possono sorpassare le persone in bicicletta",
+        "de": "Eine Fahrradstraße ist eine Straße, auf der motorisierter Verkehr einen Radfahrer nicht überholen darf"
+      },
+      "title": "{name}",
+      "icon": "./assets/themes/cyclestreets/F111.svg",
+      "color": "#0000ff",
+      "width": "10",
+      "tagRenderings": [
+        "images"
+      ]
+    },
+    {
+      "id": "toekomstige_fietsstraat",
+      "name": {
+        "nl": "Toekomstige fietsstraat",
+        "en": "Future cyclestreet",
+        "ja": "将来のcyclestreet",
+        "zh_Hant": "將來的單車街道",
+        "nb_NO": "Fremtidig sykkelvei",
+        "it": "Futura strada ciclabile",
+        "de": "Zukünftige Fahrradstraße"
+      },
+      "description": {
+        "nl": "Deze straat wordt binnenkort een fietsstraat",
+        "en": "This street will become a cyclestreet soon",
+        "ja": "この通りはまもなくcyclestreetになります",
+        "it": "Questa strada diventerà presto una strada ciclabile",
+        "de": "Diese Straße wird bald eine Fahrradstraße sein"
+      },
+      "minzoom": 9,
+      "wayHandling": 0,
+      "source": {
+        "osmTags": "proposed:cyclestreet=yes"
+      },
+      "title": {
+        "render": {
+          "nl": "Toekomstige fietsstraat",
+          "en": "Future cyclestreet",
+          "ja": "将来のcyclestreet",
+          "nb_NO": "Fremtidig sykkelvei",
+          "it": "Futura strada ciclabile",
+          "de": "Zukünftige Fahrradstraße"
+        },
+        "mappings": [
+          {
+            "then": {
+              "nl": "{name} wordt fietsstraat",
+              "en": "{name} will become a cyclestreet soon",
+              "ja": "{name}は、もうすぐcyclestreetになる",
+              "it": "{name} diventerà presto una strada ciclabile",
+              "de": "{name} wird bald eine Fahrradstraße werden"
+            },
+            "if": "name~*"
+          }
+        ]
+      },
+      "icon": "./assets/themes/cyclestreets/F113.svg",
+      "color": "#09f9dd",
+      "width": "5",
+      "tagRenderings": [
+        "images"
+      ]
+    },
+    {
+      "id": "all_streets",
+      "name": {
+        "nl": "Alle straten",
+        "en": "All streets",
+        "ja": "すべての道路",
+        "nb_NO": "Alle gater",
+        "it": "Tutte le strade",
+        "ru": "Все улицы",
+        "de": "Alle Straßen"
+      },
+      "description": {
+        "nl": "Laag waar je een straat als fietsstraat kan markeren",
+        "en": "Layer to mark any street as cyclestreet",
+        "ja": "任意の道路をCycle Streetとしてマークするレイヤ",
+        "nb_NO": "Lag for å markere hvilken som helst gate som sykkelvei",
+        "it": "Livello per contrassegnare tutte le strade come strade ciclabili",
+        "de": "Ebene zur Kennzeichnung einer Straße als Fahrradstraße"
+      },
+      "source": {
+        "osmTags": {
+          "or": [
+            "highway=residential",
+            "highway=tertiary",
+            "highway=unclassified"
+          ]
+        }
+      },
+      "minzoom": 18,
+      "wayHandling": 0,
+      "title": {
+        "render": {
+          "nl": "Straat",
+          "en": "Street",
+          "ja": "ストリート",
+          "it": "Strada",
+          "ru": "Улица",
+          "de": "Straße"
+        },
+        "mappings": [
+          {
+            "if": "name~*",
+            "then": "{name}"
+          }
+        ]
+      },
+      "icon": "./assets/svg/pencil.svg",
+      "width": "5",
+      "color": {
+        "render": "#aaaaaa",
+        "mappings": [
+          {
+            "then": "#0000ff",
+            "if": "cyclestreet=yes"
+          },
+          {
+            "then": "#09f9dd",
+            "if": "proposed:cyclestreet=yes"
+          }
+        ]
+      },
+      "tagRenderings": [
+        "images"
+      ]
+    }
+  ],
+  "overrideAll": {
+    "allowSplit": true,
+    "tagRenderings+": [
+      {
+        "id": "is_cyclestreet",
         "question": {
           "nl": "Is deze straat een fietsstraat?",
           "en": "Is this street a cyclestreet?",
@@ -121,6 +285,7 @@
         ]
       },
       {
+        "id": "future_cyclestreet",
         "question": {
           "nl": "Wanneer wordt deze straat een fietsstraat?",
           "en": "When will this street become a cyclestreet?",
@@ -141,193 +306,6 @@
           "key": "cyclestreet:start_date"
         }
       }
-  ],
-  "layers": [
-    {
-      "id": "fietsstraat",
-      "name": {
-        "nl": "Fietsstraten",
-        "en": "Cyclestreets",
-        "ja": "Cyclestreets",
-        "zh_Hant": "單車街道",
-        "it": "Strade ciclabili",
-        "de": "Fahrradstraßen"
-      },
-      "minzoom": 7,
-      "source": {
-        "osmTags": {
-          "and": [
-            "cyclestreet=yes"
     ]
   }
-      },
-      "isShown": {
-        "render": "yes",
-        "mappings": [
-          {
-            "if": "id!~way/.*",
-            "then": "no"
-          }
-        ]
-      },
-      "description": {
-        "nl": "Een fietsstraat is een straat waar gemotoriseerd verkeer een fietser niet mag inhalen.",
-        "en": "A cyclestreet is a street where motorized traffic is not allowed to overtake a cyclist",
-        "ja": "cyclestreetとは、自動車による交通がサイクリストを追い越すことができない道路です",
-        "it": "Una strada ciclabile è una strada in cui i veicoli a motore non possono sorpassare le persone in bicicletta",
-        "de": "Eine Fahrradstraße ist eine Straße, auf der motorisierter Verkehr einen Radfahrer nicht überholen darf"
-      },
-      "title": "{name}",
-      "icon": "./assets/themes/cyclestreets/F111.svg",
-      "color": "#0000ff",
-      "width": "10",
-      "tagRenderings": [
-        "images"
-      ],
-      "mapRendering": [
-        {
-          "icon": "./assets/themes/cyclestreets/F111.svg",
-          "location": [
-            "point"
-          ]
-        }
-      ]
-    },
-    {
-      "id": "toekomstige_fietsstraat",
-      "name": {
-        "nl": "Toekomstige fietsstraat",
-        "en": "Future cyclestreet",
-        "ja": "将来のcyclestreet",
-        "zh_Hant": "將來的單車街道",
-        "nb_NO": "Fremtidig sykkelvei",
-        "it": "Futura strada ciclabile",
-        "de": "Zukünftige Fahrradstraße"
-      },
-      "description": {
-        "nl": "Deze straat wordt binnenkort een fietsstraat",
-        "en": "This street will become a cyclestreet soon",
-        "ja": "この通りはまもなくcyclestreetになります",
-        "it": "Questa strada diventerà presto una strada ciclabile",
-        "de": "Diese Straße wird bald eine Fahrradstraße sein"
-      },
-      "minzoom": 9,
-      "wayHandling": 0,
-      "source": {
-        "osmTags": "proposed:cyclestreet=yes"
-      },
-      "title": {
-        "render": {
-          "nl": "Toekomstige fietsstraat",
-          "en": "Future cyclestreet",
-          "ja": "将来のcyclestreet",
-          "nb_NO": "Fremtidig sykkelvei",
-          "it": "Futura strada ciclabile",
-          "de": "Zukünftige Fahrradstraße"
-        },
-        "mappings": [
-          {
-            "then": {
-              "nl": "{name} wordt fietsstraat",
-              "en": "{name} will become a cyclestreet soon",
-              "ja": "{name}は、もうすぐcyclestreetになる",
-              "it": "{name} diventerà presto una strada ciclabile",
-              "de": "{name} wird bald eine Fahrradstraße werden"
-            },
-            "if": "name~*"
-          }
-        ]
-      },
-      "icon": "./assets/themes/cyclestreets/F113.svg",
-      "color": "#09f9dd",
-      "width": "5",
-      "tagRenderings": [
-        "images"
-      ],
-      "mapRendering": [
-        {
-          "icon": "./assets/themes/cyclestreets/F113.svg",
-          "location": [
-            "point"
-          ]
-        }
-      ]
-    },
-    {
-      "id": "all_streets",
-      "name": {
-        "nl": "Alle straten",
-        "en": "All streets",
-        "ja": "すべての道路",
-        "nb_NO": "Alle gater",
-        "it": "Tutte le strade",
-        "ru": "Все улицы",
-        "de": "Alle Straßen"
-      },
-      "description": {
-        "nl": "Laag waar je een straat als fietsstraat kan markeren",
-        "en": "Layer to mark any street as cyclestreet",
-        "ja": "任意の道路をCycle Streetとしてマークするレイヤ",
-        "nb_NO": "Lag for å markere hvilken som helst gate som sykkelvei",
-        "it": "Livello per contrassegnare tutte le strade come strade ciclabili",
-        "de": "Ebene zur Kennzeichnung einer Straße als Fahrradstraße"
-      },
-      "source": {
-        "osmTags": {
-          "or": [
-            "highway=residential",
-            "highway=tertiary",
-            "highway=unclassified"
-          ]
-        }
-      },
-      "minzoom": 18,
-      "wayHandling": 0,
-      "title": {
-        "render": {
-          "nl": "Straat",
-          "en": "Street",
-          "ja": "ストリート",
-          "it": "Strada",
-          "ru": "Улица",
-          "de": "Straße"
-        },
-        "mappings": [
-          {
-            "if": "name~*",
-            "then": "{name}"
-          }
-        ]
-      },
-      "icon": "./assets/svg/pencil.svg",
-      "width": "5",
-      "color": {
-        "render": "#aaaaaa",
-        "mappings": [
-          {
-            "then": "#0000ff",
-            "if": "cyclestreet=yes"
-          },
-          {
-            "then": "#09f9dd",
-            "if": "proposed:cyclestreet=yes"
-          }
-        ]
-      },
-      "tagRenderings": [
-        "images"
-      ],
-      "mapRendering": [
-        {
-          "icon": "./assets/svg/pencil.svg",
-          "location": [
-            "point"
-          ]
-        }
-      ]
-    }
-  ],
-  "overrideAll": {
-    "allowSplit": true
-  }
 }

assets/themes/cyclofix/cyclofix.json

@@ -57,6 +57,5 @@
     "bike_themed_object",
     "bike_cleaning",
     "bike_parking"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/drinking_water/drinking_water.json

@@ -40,6 +40,5 @@
   "widenFactor": 2,
   "layers": [
     "drinking_water"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/facadegardens/facadegardens.json

@@ -454,79 +454,7 @@
           }
         }
       ],
-      "wayHandling": 1,
+      "wayHandling": 1
-      "mapRendering": [
-        {
-          "icon": {
-            "render": "circle:white;./assets/themes/facadegardens/geveltuin.svg",
-            "mappings": [
-              {
-                "if": {
-                  "and": [
-                    "direct_sunlight=yes"
-                  ]
-                },
-                "then": "circle:white;./assets/themes/facadegardens/zon.svg"
-              },
-              {
-                "if": {
-                  "and": [
-                    "direct_sunlight=partial"
-                  ]
-                },
-                "then": "circle:white;./assets/themes/facadegardens/halfzon.svg"
-              },
-              {
-                "if": {
-                  "and": [
-                    "direct_sunlight=no"
-                  ]
-                },
-                "then": "circle:white;./assets/themes/facadegardens/schaduw.svg"
-              }
-            ]
-          },
-          "iconOverlays": [
-            {
-              "if": "plant~.*vine.*",
-              "then": "circle:white;./assets/themes/facadegardens/klimplant.svg",
-              "badge": true
-            },
-            {
-              "if": "plant~.*groundcover.*",
-              "then": "circle:white;./assets/themes/facadegardens/bodembedekker.svg",
-              "badge": true
-            },
-            {
-              "if": "edible=true",
-              "then": "circle:white;./assets/themes/facadegardens/eetbaar.svg",
-              "badge": true
-            },
-            {
-              "if": "rain_barel=yes",
-              "then": "circle:white;./assets/themes/facadegardens/gevelton.svg",
-              "badge": true
-            },
-            {
-              "if": "plant~.*shrub.*",
-              "then": "circle:white;./assets/themes/facadegardens/struik.svg",
-              "badge": true
-            },
-            {
-              "if": "plant~.*flower.*",
-              "then": "circle:white;./assets/themes/facadegardens/bloei.svg",
-              "badge": true
-            }
-          ],
-          "iconSize": {
-            "render": "50,50,center"
-          },
-          "location": [
-            "point"
-          ]
     }
   ]
 }
-  ],
-  "roamingRenderings": []
-}

assets/themes/fritures/fritures.json

@@ -54,6 +54,5 @@
         "filter": null
       }
     }
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/fruit_trees/fruit_trees.json

@@ -68,19 +68,6 @@
             "nl": "Voeg een boomgaard toe (als punt - omtrek nog te tekenen)"
           }
         }
-      ],
-      "mapRendering": [
-        {
-          "icon": {
-            "render": "./assets/themes/buurtnatuur/forest.svg"
-          },
-          "iconSize": {
-            "render": "40,40,center"
-          },
-          "location": [
-            "point"
-          ]
-        }
       ]
     },
     {
@@ -183,21 +170,7 @@
             "nl": "Voeg hier een boom toe"
           }
         }
-      ],
-      "mapRendering": [
-        {
-          "icon": {
-            "render": "./assets/themes/fruit_trees/fruit_tree.svg"
-          },
-          "iconSize": {
-            "render": "40,40,center"
-          },
-          "location": [
-            "point"
       ]
     }
   ]
 }
-  ],
-  "roamingRenderings": []
-}

assets/themes/grb.json

@@ -197,29 +197,9 @@
         "render": "#00f"
       },
       "wayHandling": 2,
-      "presets": [],
+      "presets": []
-      "mapRendering": [
-        {
-          "label": {
-            "mappings": [
-              {
-                "if": "addr:housenumber~*",
-                "then": "<div style='background-color: white; font: large; width: 1.5em; height: 1.5em; border-radius: 100%'>{addr:housenumber}</div>"
-              }
-            ]
-          },
-          "iconSize": {
-            "render": "40,40,center"
-          },
-          "location": [
-            "point",
-            "centroid"
-          ]
-        }
-      ]
     }
   ],
   "hideFromOverview": true,
-  "roamingRenderings": [],
   "defaultBackgroundId": "AGIVFlandersGRB"
 }

assets/themes/maps/maps.json

@@ -40,6 +40,5 @@
   "socialImage": "",
   "layers": [
     "map"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/nature/nature.json

@@ -26,6 +26,5 @@
     "map",
     "information_board",
     "nature_reserve"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/parkings/parkings.json

@@ -26,6 +26,5 @@
   "socialImage": "",
   "layers": [
     "parking"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/personal/personal.json

@@ -46,6 +46,5 @@
   "startZoom": 16,
   "widenFactor": 1.2,
   "overpassMaxZoom": 0,
-  "layers": [],
+  "layers": []
-  "roamingRenderings": []
 }

assets/themes/play_forests/play_forests.json

@@ -23,6 +23,5 @@
   "socialImage": "",
   "layers": [
     "play_forest"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/playgrounds/playgrounds.json

@@ -42,6 +42,5 @@
   "socialImage": "",
   "layers": [
     "playground"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/sport_pitches/sport_pitches.json

@@ -41,6 +41,5 @@
   "socialImage": "",
   "layers": [
     "sport_pitch"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/surveillance/surveillance.json

@@ -43,6 +43,5 @@
   "layers": [
     "direction",
     "surveillance_camera"
-  ],
+  ]
-  "roamingRenderings": []
 }

assets/themes/trees/trees.json

@@ -55,6 +55,5 @@
   "layers": [
     "tree_node"
   ],
-  "roamingRenderings": [],
   "defaultBackgroundId": "AGIV"
 }

assets/themes/uk_addresses/uk_addresses.json

@@ -108,29 +108,6 @@
             }
           ]
         }
-      ],
-      "mapRendering": [
-        {
-          "icon": {
-            "render": "./assets/themes/uk_addresses/housenumber_unknown.svg",
-            "mappings": [
-              {
-                "if": "_embedding_object:id~*",
-                "then": "./assets/themes/uk_addresses/housenumber_unknown_small.svg"
-              },
-              {
-                "if": "_imported=yes",
-                "then": "./assets/themes/uk_addresses/housenumber_unknown_small.svg"
-              }
-            ]
-          },
-          "iconSize": {
-            "render": "40,40,center"
-          },
-          "location": [
-            "point"
-          ]
-        }
       ]
     },
     {
@@ -277,36 +254,7 @@
             "then": "#ff0"
           }
         ]
-      },
-      "mapRendering": [
-        {
-          "icon": {
-            "render": "./assets/themes/uk_addresses/housenumber_ok.svg",
-            "mappings": [
-              {
-                "if": {
-                  "or": [
-                    {
-                      "and": [
-                        "addr:housenumber=",
-                        "nohousenumber!=yes"
-                      ]
-                    },
-                    "addr:street="
-                  ]
-                },
-                "then": "./assets/themes/uk_addresses/housenumber_unknown.svg"
       }
-            ]
-          },
-          "iconSize": {
-            "render": "40,40,center"
-          },
-          "location": [
-            "point"
-          ]
-        }
-      ]
     },
     {
       "id": "named_streets",
@@ -324,15 +272,7 @@
       },
       "width": {
         "render": "0"
-      },
+      }
-      "mapRendering": [
-        {
-          "location": [
-            "point"
-          ]
     }
   ]
 }
-  ],
-  "roamingRenderings": []
-}

assets/themes/waste_basket/waste_basket.json

@@ -33,6 +33,5 @@
         "minzoom": 12
       }
     }
-  ],
+  ]
-  "roamingRenderings": []
 }

scripts/generateLayerOverview.ts

@@ -118,6 +118,9 @@ class LayerOverviewUtils {
             if (themeFile["units"] !== undefined) {
                 themeErrorCount.push("The theme " + themeFile.id + " has units defined - these should be defined on the layer instead. (Hint: use overrideAll: { '+units': ... }) ")
             }
+            if (themeFile["roamingRenderings"] !== undefined) {
+                themeErrorCount.push("Theme " + themeFile.id + " contains an old 'roamingRenderings'. Use an 'overrideAll' instead")    
+            }
             for (const layer of themeFile.layers) {
                 if (typeof layer === "string") {
                     if (!knownLayerIds.has(layer)) {

scripts/lint.ts

@@ -63,6 +63,11 @@ for (const themeFile of themeFiles) {
         // @ts-ignore
         fixLayerConfig(layerConfig)
     }
+    
+    if(themeFile.parsed["roamingRenderings"] !== undefined && themeFile.parsed["roamingRenderings"].length == 0){
+        delete themeFile.parsed["roamingRenderings"]
+    }
+    
     writeFileSync(themeFile.path, JSON.stringify(themeFile.parsed, null, "  "))
 }
 //*/