Merge branch 'develop' into bike-theme-duplicate-location

assets/layers/artwork/artwork.json

@@ -29,13 +29,13 @@
             "ja": "アートワーク",
             "zh_Hant": "藝術品",
             "nb_NO": "Kunstverk",
-            "fi": "Taideteos",
-            "gl": "Obra de arte",
-            "hu": "Műalkotás",
-            "pl": "Dzieło sztuki",
-            "pt": "Obra de arte",
+            "sv": "Konstverk",
             "pt_BR": "Obra de arte",
-            "sv": "Konstverk"
+            "pt": "Obra de arte",
+            "pl": "Dzieło sztuki",
+            "hu": "Műalkotás",
+            "gl": "Obra de arte",
+            "fi": "Taideteos"
         },
         "mappings": [
             {
@@ -417,5 +417,24 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/themes/artwork/artwork.svg"
+            },
+            "location": [
+                "point",
+                "centroid"
+            ]
+        },
+        {
+            "color": {
+                "render": "#0000ff"
+            },
+            "width": {
+                "render": "10"
+            }
+        }
+    ]
 }

assets/layers/barrier/barrier.json

@@ -324,5 +324,16 @@
             },
             "id": "Overlap (cyclebarrier)"
         }
+    ],
+    "mapRendering": [
+        {
+            "icon": "./assets/layers/barrier/barrier.svg",
+            "location": [
+                "point"
+            ]
+        },
+        {
+            "width": "5"
+        }
     ]
 }

assets/layers/bench/bench.json

@@ -660,5 +660,18 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "circle:#FE6F32;./assets/layers/bench/bench.svg"
+            },
+            "iconSize": {
+                "render": "35,35,center"
+            },
+            "location": [
+                "point"
+            ]
+        }
+    ]
 }

assets/layers/bench_at_pt/bench_at_pt.json

@@ -149,5 +149,26 @@
     },
     "color": {
         "render": "#00f"
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/themes/benches/bench_public_transport.svg"
+            },
+            "iconSize": {
+                "render": "35,35,center"
+            },
+            "location": [
+                "point"
+            ]
+        },
+        {
+            "color": {
+                "render": "#00f"
+            },
+            "width": {
+                "render": "8"
+            }
+        }
+    ]
 }

assets/layers/bicycle_library/bicycle_library.json

@@ -288,5 +288,37 @@
     "color": {
         "render": "#c00"
     },
-    "wayHandling": 2
+    "wayHandling": 2,
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "pin:#22ff55;./assets/layers/bicycle_library/bicycle_library.svg"
+            },
+            "iconBadges": [
+                {
+                    "if": "opening_hours~*",
+                    "then": "isOpen"
+                },
+                {
+                    "if": "service:bicycle:pump=yes",
+                    "then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg"
+                }
+            ],
+            "iconSize": {
+                "render": "50,50,bottom"
+            },
+            "location": [
+                "point",
+                "centroid"
+            ]
+        },
+        {
+            "color": {
+                "render": "#c00"
+            },
+            "width": {
+                "render": "1"
+            }
+        }
+    ]
 }

assets/layers/bicycle_tube_vending_machine/bicycle_tube_vending_machine.json

@@ -48,8 +48,7 @@
                     "operational_status=closed"
                 ]
             },
-            "then": "close:#c33",
-            "badge": true
+            "then": "close:#c33"
         }
     ],
     "iconSize": "50,50,bottom",
@@ -276,5 +275,31 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "pin:#ffffff;./assets/layers/bicycle_tube_vending_machine/pinIcon.svg"
+            },
+            "iconBadges": [
+                {
+                    "if": {
+                        "or": [
+                            "operational_status=broken",
+                            "operational_status=closed"
+                        ]
+                    },
+                    "then": "close:#c33"
+                }
+            ],
+            "iconSize": "50,50,bottom",
+            "location": [
+                "point",
+                "centroid"
+            ]
+        },
+        {
+            "color": "#6bc4f7"
+        }
+    ]
 }

assets/layers/bike_cafe/bike_cafe.json

@@ -365,5 +365,27 @@
             ]
         }
     ],
-    "wayHandling": 2
+    "wayHandling": 2,
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/bike_cafe/bike_cafe.svg"
+            },
+            "iconSize": {
+                "render": "50,50,bottom"
+            },
+            "location": [
+                "point",
+                "centroid"
+            ]
+        },
+        {
+            "color": {
+                "render": "#694E2D"
+            },
+            "width": {
+                "render": "2"
+            }
+        }
+    ]
 }

assets/layers/bike_cleaning/bike_cleaning.json

@@ -79,13 +79,15 @@
                 ]
             },
             "then": {
-                "render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg"
+                "render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg",
+                "roaming": true
             }
         }
     ],
     "titleIcons": [
         {
-            "render": "<img src='./assets/layers/bike_cleaning/bike_cleaning_icon.svg'/>"
+            "render": "<img src='./assets/layers/bike_cleaning/bike_cleaning_icon.svg'/>",
+            "roaming": true
         }
     ],
     "tagRenderings": [
@@ -115,6 +117,7 @@
                     "then": "The cleaning service has a fee"
                 }
             ],
+            "roaming": true,
             "id": "bike_cleaning-service:bicycle:cleaning:charge"
         },
         {
@@ -142,6 +145,7 @@
                     "then": "The cleaning service has a fee"
                 }
             ],
+            "roaming": false,
             "id": "bike_cleaning-charge"
         }
     ],
@@ -157,5 +161,30 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/bike_cleaning/bike_cleaning.svg"
+            },
+            "iconBadges": [
+                {
+                    "if": {
+                        "and": [
+                            "service:bicycle:cleaning~*",
+                            "amenity!=bike_wash"
+                        ]
+                    },
+                    "then": {
+                        "render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg",
+                        "roaming": true
+                    }
+                }
+            ],
+            "iconSize": "50,50,bottom",
+            "location": [
+                "point"
+            ]
+        }
+    ]
 }

assets/layers/bike_parking/bike_parking.json

@@ -539,4 +539,6 @@
             "width": "1"
         }
     ]
+
 }
+

assets/layers/bike_repair_station/bike_repair_station.json

@@ -759,5 +759,76 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/bike_repair_station/repair_station.svg",
+                "mappings": [
+                    {
+                        "if": {
+                            "and": [
+                                "service:bicycle:pump=no",
+                                "service:bicycle:pump:operational_status=broken"
+                            ]
+                        },
+                        "then": "./assets/layers/bike_repair_station/repair_station.svg"
+                    },
+                    {
+                        "if": {
+                            "and": [
+                                "service:bicycle:pump=yes",
+                                "service:bicycle:tools=yes"
+                            ]
+                        },
+                        "then": "./assets/layers/bike_repair_station/repair_station_pump.svg"
+                    },
+                    {
+                        "if": {
+                            "and": [
+                                "service:bicycle:pump:operational_status=broken",
+                                "service:bicycle:tools=no"
+                            ]
+                        },
+                        "then": "./assets/layers/bike_repair_station/broken_pump_2.svg"
+                    },
+                    {
+                        "if": {
+                            "and": [
+                                "service:bicycle:pump=yes",
+                                {
+                                    "or": [
+                                        "service:bicycle:tools=no",
+                                        "service:bicycle:tools="
+                                    ]
+                                }
+                            ]
+                        },
+                        "then": "./assets/layers/bike_repair_station/pump.svg"
+                    }
+                ]
+            },
+            "iconBadges": [
+                {
+                    "if": "operator=De Fietsambassade Gent",
+                    "then": "./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg"
+                }
+            ],
+            "iconSize": {
+                "render": "50,50,bottom"
+            },
+            "location": [
+                "point",
+                "centroid"
+            ]
+        },
+        {
+            "color": {
+                "render": "#00f"
+            },
+            "width": {
+                "render": "1"
+            }
+        }
+    ]
 }

assets/layers/bike_shop/bike_shop.json

@@ -752,5 +752,57 @@
     "color": {
         "render": "#c00"
     },
-    "wayHandling": 2
+    "wayHandling": 2,
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/bike_shop/repair_shop.svg",
+                "mappings": [
+                    {
+                        "if": "operator=De Fietsambassade Gent",
+                        "then": "./assets/themes/cyclofix/fietsambassade_gent_logo_small.svg"
+                    },
+                    {
+                        "if": "service:bicycle:retail=yes",
+                        "then": "./assets/layers/bike_shop/shop.svg"
+                    }
+                ]
+            },
+            "iconBadges": [
+                {
+                    "if": "opening_hours~*",
+                    "then": "isOpen"
+                },
+                {
+                    "if": "service:bicycle:pump=yes",
+                    "then": "circle:#e2783d;./assets/layers/bike_repair_station/pump.svg"
+                },
+                {
+                    "if": {
+                        "and": [
+                            "service:bicycle:cleaning~*"
+                        ]
+                    },
+                    "then": {
+                        "render": "./assets/layers/bike_cleaning/bike_cleaning_icon.svg"
+                    }
+                }
+            ],
+            "iconSize": {
+                "render": "50,50,bottom"
+            },
+            "location": [
+                "point",
+                "centroid"
+            ]
+        },
+        {
+            "color": {
+                "render": "#c00"
+            },
+            "width": {
+                "render": "1"
+            }
+        }
+    ]
 }

assets/layers/bike_themed_object/bike_themed_object.json

@@ -69,5 +69,27 @@
         "render": "#AB76D5"
     },
     "presets": [],
-    "wayHandling": 2
+    "wayHandling": 2,
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/bike_themed_object/other_services.svg"
+            },
+            "iconSize": {
+                "render": "50,50,bottom"
+            },
+            "location": [
+                "point",
+                "centroid"
+            ]
+        },
+        {
+            "color": {
+                "render": "#AB76D5"
+            },
+            "width": {
+                "render": "2"
+            }
+        }
+    ]
 }

assets/layers/binocular/binocular.json

@@ -127,5 +127,26 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "circle:white;./assets/layers/binocular/telescope.svg"
+            },
+            "iconSize": {
+                "render": "40,40,center"
+            },
+            "location": [
+                "point"
+            ]
+        },
+        {
+            "color": {
+                "render": "#00f"
+            },
+            "width": {
+                "render": "8"
+            }
+        }
+    ]
 }

assets/layers/birdhide/birdhide.json

@@ -309,5 +309,29 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": {
+                    "nl": "./assets/layers/birdhide/birdhide.svg"
+                },
+                "mappings": [
+                    {
+                        "if": {
+                            "or": [
+                                "building=yes",
+                                "shelter=yes",
+                                "amenity=shelter"
+                            ]
+                        },
+                        "then": "./assets/layers/birdhide/birdshelter.svg"
+                    }
+                ]
+            },
+            "location": [
+                "point"
+            ]
+        }
+    ]
 }

assets/layers/cafe_pub/cafe_pub.json

@@ -28,8 +28,7 @@
     "iconOverlays": [
         {
             "if": "opening_hours~*",
-            "then": "isOpen",
-            "badge": true
+            "then": "isOpen"
         }
     ],
     "label": {
@@ -203,5 +202,35 @@
             ]
         }
     },
-    "allowMove": true
+    "allowMove": true,
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "circle:white;./assets/layers/cafe_pub/pub.svg",
+                "mappings": [
+                    {
+                        "if": "amenity=cafe",
+                        "then": "circle:white;./assets/layers/cafe_pub/cafe.svg"
+                    }
+                ]
+            },
+            "iconBadges": [
+                {
+                    "if": "opening_hours~*",
+                    "then": "isOpen"
+                }
+            ],
+            "label": {
+                "mappings": [
+                    {
+                        "if": "name~*",
+                        "then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
+                    }
+                ]
+            },
+            "location": [
+                "point"
+            ]
+        }
+    ]
 }

assets/layers/charging_station/charging_station.protojson

@@ -558,21 +558,6 @@
         "nl": "Is dit oplaadpunt operationeel?"
       },
       "mappings": [
-        {
-          "if": {
-            "and": [
-              "planned:amenity=",
-              "construction:amenity=",
-              "disused:amenity=",
-              "operational_status=",
-              "amenity=charging_station"
-            ]
-          },
-          "then": {
-            "en": "This charging station works",
-            "nl": "Dit oplaadpunt werkt"
-          }
-        },
         {
           "if": {
             "and": [
@@ -632,6 +617,21 @@
             "en": "This charging station has beed permanently disabled and is not in use anymore but is still visible",
             "nl": "Dit oplaadpunt is niet meer in gebruik maar is wel nog aanwezig"
           }
+        },
+        {
+          "if": {
+            "and": [
+              "planned:amenity=",
+              "construction:amenity=",
+              "disused:amenity=",
+              "operational_status=",
+              "amenity=charging_station"
+            ]
+          },
+          "then": {
+            "en": "This charging station works",
+            "nl": "Dit oplaadpunt werkt"
+          }
         }
       ]
     },
@@ -668,69 +668,69 @@
       }
     }
   ],
-  "icon": {
-    "render": "pin:#fff;./assets/themes/charging_stations/plug.svg",
-    "mappings": [
-      {
-        "if": "bicycle=yes",
-        "then": "pin:#fff;./assets/themes/charging_stations/bicycle.svg"
-      },
-      {
-        "if": {
-          "or": [
-            "car=yes",
-            "motorcar=yes"
-          ]
-        },
-        "then": "pin:#fff;./assets/themes/charging_stations/car.svg"
-      }
-    ]
-  },
-  "iconOverlays": [
+  "mapRendering": [
     {
-      "if": {
-        "or": [
-          "disused:amenity=charging_station",
-          "operational_status=broken"
-        ]
-      },
-      "then": "cross_bottom_right:#c22;"
-    },
-    {
-      "if": {
-        "or": [
-          "proposed:amenity=charging_station",
-          "planned:amenity=charging_station"
-        ]
-      },
-      "then": "./assets/layers/charging_station/under_construction.svg",
-      "badge": true
-    },
-    {
-      "if": {
-        "and": [
-          "bicycle=yes",
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "icon": {
+        "render": "pin:#fff;./assets/themes/charging_stations/plug.svg",
+        "mappings": [
           {
-            "or": [
-              "motorcar=yes",
-              "car=yes"
-            ]
+            "if": "bicycle=yes",
+            "then": "pin:#fff;./assets/themes/charging_stations/bicycle.svg"
+          },
+          {
+            "if": {
+              "or": [
+                "car=yes",
+                "motorcar=yes"
+              ]
+            },
+            "then": "pin:#fff;./assets/themes/charging_stations/car.svg"
           }
         ]
       },
-      "then": "circle:#fff;./assets/themes/charging_stations/car.svg",
-      "badge": true
+      "iconBadges": [
+        {
+          "if": {
+            "or": [
+              "disused:amenity=charging_station",
+              "operational_status=broken"
+            ]
+          },
+          "then": "cross:#c22;"
+        },
+        {
+          "if": {
+            "or": [
+              "proposed:amenity=charging_station",
+              "planned:amenity=charging_station"
+            ]
+          },
+          "then": "./assets/layers/charging_station/under_construction.svg"
+        },
+        {
+          "if": {
+            "and": [
+              "bicycle=yes",
+              {
+                "or": [
+                  "motorcar=yes",
+                  "car=yes"
+                ]
+              }
+            ]
+          },
+          "then": "circle:#fff;./assets/themes/charging_stations/car.svg"
+        }
+      ],
+      "iconSize": {
+        "render": "50,50,bottom"
+      }
     }
   ],
-  "width": {
-    "render": "8"
-  },
-  "iconSize": {
-    "render": "50,50,bottom"
-  },
-  "color": {
-    "render": "#00f"
-  },
   "presets": [
     {
       "tags": [

assets/layers/cluster_style/cluster_style.json

@@ -36,5 +36,43 @@
                 "then": "<div class='rounded-full text-xl font-bold flex flex-col' style='width: 2.5rem; height: 2.5rem; background: white'>{kilocount}K</div>"
             }
         ]
-    }
+    },
+    "mapRendering": [
+        {
+            "label": {
+                "render": "<div class='rounded-full text-xl font-bold' style='width: 2rem; height: 2rem; background: white'>{showCount}</div>",
+                "mappings": [
+                    {
+                        "if": "showCount>1000",
+                        "then": "<div class='rounded-full text-xl font-bold flex flex-col' style='width: 2.5rem; height: 2.5rem; background: white'>{kilocount}K</div>"
+                    }
+                ]
+            },
+            "location": [
+                "point"
+            ]
+        },
+        {
+            "color": {
+                "render": "#3c3",
+                "mappings": [
+                    {
+                        "if": "showCount>200",
+                        "then": "#f33"
+                    },
+                    {
+                        "if": "showCount>100",
+                        "then": "#c93"
+                    },
+                    {
+                        "if": "showCount>50",
+                        "then": "#cc3"
+                    }
+                ]
+            },
+            "width": {
+                "render": "1"
+            }
+        }
+    ]
 }

assets/layers/conflation/conflation.json

@@ -0,0 +1,45 @@
+{
+    "id": "conflation",
+    "description": "This is a special meta_layer which render geometry-changes for inspection",
+    "minzoom": 1,
+    "source": {
+        "osmTags": {
+            "or": [
+                "move=yes",
+                "newpoint=yes"
+            ]
+        }
+    },
+    "name": "Conflation",
+    "title": "Conflation",
+    "mapRendering": [
+        {
+            "location": "point",
+            "icon": "addSmall:#000",
+            "iconSize": "10,10,center"
+        },
+        {
+            "location": "end",
+            "icon": "circle:#0f0",
+            "iconSize": "10,10,center"
+        },
+        {
+            "location": "start",
+            "icon": "square:#f00",
+            "iconSize": "10,10,center"
+        },
+        {
+            "width": "3",
+            "color": "#00f",
+            "dasharray": {
+                "render": "",
+                "mappings": [
+                    {
+                        "if": "resulting-geometry=yes",
+                        "then": "6 6"
+                    }
+                ]
+            }
+        }
+    ]
+}

assets/layers/crossings/crossings.json

@@ -254,8 +254,7 @@
                     "if": "tactile_paving=incorrect",
                     "then": {
                         "en": "This crossing has tactile paving, but is not correct",
-                        "nl": "Deze oversteekplaats heeft een geleidelijn, die incorrect is.",
-                        "de": "Diese Kreuzung hat taktile Pflasterung, ist aber nicht korrekt"
+                        "nl": "Deze oversteekplaats heeft een geleidelijn, die incorrect is."
                     },
                     "hideInAnswer": true
                 }
@@ -279,8 +278,7 @@
                     "if": "button_operated=yes",
                     "then": {
                         "en": "This traffic light has a button to request green light",
-                        "nl": "Dit verkeerslicht heeft een knop voor groen licht",
-                        "de": "Diese Ampel hat eine Taste, um ein grünes Signal anzufordern"
+                        "nl": "Dit verkeerslicht heeft een knop voor groen licht"
                     }
                 },
                 {
@@ -288,7 +286,7 @@
                     "then": {
                         "en": "This traffic light does not have a button to request green light",
                         "nl": "Dit verkeerlicht heeft geen knop voor groen licht",
-                        "de": "Diese Ampel hat keine Taste, um ein grünes Signal anzufordern"
+                        "de": "Diese Ampel hat keine Taste, um ein grünes Signal anzufordern."
                     }
                 }
             ]
@@ -367,5 +365,29 @@
                 }
             ]
         }
+    ],
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/crossings/pedestrian_crossing.svg",
+                "mappings": [
+                    {
+                        "if": {
+                            "or": [
+                                "highway=traffic_signals",
+                                "crossing=traffic_signals"
+                            ]
+                        },
+                        "then": "./assets/layers/crossings/traffic_lights.svg"
+                    }
+                ]
+            },
+            "location": [
+                "point"
+            ]
+        },
+        {
+            "width": "5"
+        }
     ]
 }

assets/layers/cycleways_and_roads/cycleways_and_roads.json

@@ -54,8 +54,7 @@
                 "if": "cycleway=shared_lane",
                 "then": {
                     "nl": "Fietssuggestiestrook",
-                    "en": "Shared lane",
-                    "de": "Gemeinsame Fahrspur"
+                    "en": "Shared lane"
                 }
             },
             {
@@ -731,8 +730,7 @@
             },
             "render": {
                 "en": "The carriage width of this road is <strong>{width:carriageway}m</strong>",
-                "nl": "De breedte van deze rijbaan in deze straat is <strong>{width:carriageway}m</strong>",
-                "de": "Die Fahrbahnbreite dieser Straße beträgt <strong>{width:carriageway}m</strong>"
+                "nl": "De breedte van deze rijbaan in deze straat is <strong>{width:carriageway}m</strong>"
             },
             "freeform": {
                 "key": "width:carriageway",
@@ -744,8 +742,7 @@
             },
             "question": {
                 "en": "What is the carriage width of this road (in meters)?<br/><span class='subtle'>This is measured curb to curb and thus includes the width of parallell parking lanes</span>",
-                "nl": "Hoe breed is de rijbaan in deze straat (in meters)?<br/><span class='subtle'>Dit is </span><br/><span class='subtle'>Meet dit van stoepsteen tot stoepsteen, dus inclusief een parallelle parkeerstrook</span>",
-                "de": "Wie groß ist die Fahrbahnbreite dieser Straße (in Metern)?<br/><span class='subtle'>Diese wird von Bordstein zu Bordstein gemessen und schließt daher die Breite von parallelen Parkspuren ein</span>"
+                "nl": "Hoe breed is de rijbaan in deze straat (in meters)?<br/><span class='subtle'>Dit is </span><br/><span class='subtle'>Meet dit van stoepsteen tot stoepsteen, dus inclusief een parallelle parkeerstrook</span>"
             },
             "id": "width:carriageway"
         },
@@ -903,8 +900,7 @@
             "id": "cycleway-traffic-signs-supplementary",
             "question": {
                 "en": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?",
-                "nl": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?",
-                "de": "Hat das Verkehrszeichen D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) ein Zusatzzeichen?"
+                "nl": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?"
             },
             "condition": {
                 "or": [
@@ -995,8 +991,7 @@
             "id": "cycleway-traffic-signs-D7-supplementary",
             "question": {
                 "en": "Does the traffic sign D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) have a supplementary sign?",
-                "nl": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?",
-                "de": "Hat das Verkehrszeichen D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) ein Zusatzzeichen?"
+                "nl": "Heeft het verkeersbord D7 (<img src='./assets/themes/cycle_infra/Belgian_road_sign_D07.svg' style='width: 1.5em'>) een onderbord?"
             },
             "condition": {
                 "or": [
@@ -1281,5 +1276,87 @@
             }
         ]
     },
-    "allowSplit": true
+    "allowSplit": true,
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/themes/cycle_infra/bicycleway.svg"
+            },
+            "iconSize": {
+                "render": "40,40,center"
+            },
+            "location": [
+                "point"
+            ]
+        },
+        {
+            "color": {
+                "render": "rgba(170, 170, 170, 0.7)",
+                "mappings": [
+                    {
+                        "if": "highway=cycleway",
+                        "then": "rgba(0, 189, 141, 0.7)"
+                    },
+                    {
+                        "if": "highway=path",
+                        "then": "rgba(204, 74, 207, 0.7)"
+                    },
+                    {
+                        "if": "cycleway=track",
+                        "then": "rgba(113, 3, 200, 0.7)"
+                    },
+                    {
+                        "if": "cycleway=shared_lane",
+                        "then": "rgba(74, 59, 247, 0.7)"
+                    },
+                    {
+                        "if": "cycleway=lane",
+                        "then": "rgba(254, 155, 6, 0.9)"
+                    },
+                    {
+                        "if": "cyclestreet=yes",
+                        "then": "rgba(57, 159, 191, 0.7)"
+                    }
+                ]
+            },
+            "width": {
+                "render": "8"
+            },
+            "dashArray": {
+                "render": "",
+                "mappings": [
+                    {
+                        "if": {
+                            "or": [
+                                "oneway=yes",
+                                {
+                                    "or": [
+                                        "highway=cycleway",
+                                        "highway=path"
+                                    ]
+                                }
+                            ]
+                        },
+                        "then": ""
+                    },
+                    {
+                        "if": "cycleway=track",
+                        "then": ""
+                    },
+                    {
+                        "if": "cycleway=shared_lane",
+                        "then": "15 30"
+                    },
+                    {
+                        "if": "cycleway=lane",
+                        "then": "25 15 15 15 25"
+                    },
+                    {
+                        "if": "cyclestreet=yes",
+                        "then": ""
+                    }
+                ]
+            }
+        }
+    ]
 }

assets/layers/defibrillator/defibrillator.json

@@ -35,7 +35,13 @@
         "mappings": [
             {
                 "if": "_recently_surveyed=true",
-                "then": "./assets/layers/defibrillator/aed_checked.svg"
+                "then": {
+                    "en": "./assets/layers/defibrillator/aed_checked.svg",
+                    "ru": "./assets/layers/defibrillator/aed_checked.svg",
+                    "it": "./assets/layers/defibrillator/aed_checked.svg",
+                    "fr": "./assets/layers/defibrillator/aed_checked.svg",
+                    "de": "./assets/layers/defibrillator/aed_checked.svg"
+                }
             }
         ]
     },
@@ -203,8 +209,7 @@
                 "en": "Is this a a regular automatic defibrillator or a manual defibrillator for professionals only?",
                 "nl": "Is dit een gewone automatische defibrillator of een manueel toestel enkel voor professionals?",
                 "fr": "Est-ce un défibrillateur automatique normal ou un défibrillateur manuel à usage professionnel uniquement ?",
-                "it": "Si tratta di un normale defibrillatore automatico o un defibrillatore manuale riservato ai professionisti?",
-                "de": "Ist dies ein normaler automatischer Defibrillator oder ein manueller Defibrillator nur für Profis?"
+                "it": "Si tratta di un normale defibrillatore automatico o un defibrillatore manuale riservato ai professionisti?"
             },
             "freeform": {
                 "key": "defibrillator"
@@ -551,5 +556,24 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/themes/aed/aed.svg",
+                "mappings": [
+                    {
+                        "if": "_recently_surveyed=true",
+                        "then": "./assets/layers/defibrillator/aed_checked.svg"
+                    }
+                ]
+            },
+            "location": [
+                "point"
+            ]
+        },
+        {
+            "color": "#0000ff"
+        }
+    ]
 }

assets/layers/direction/direction.json

@@ -45,5 +45,30 @@
     "color": "--catch-detail-color",
     "stroke": "0",
     "presets": [],
-    "wayHandling": 2
+    "wayHandling": 2,
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "direction_gradient:var(--catch-detail-color)",
+                "#": "For some weird reason, showing the icon in the layer control panel breaks the svg-gradient (because the svg gradient has a global color or smthng) - so we use a different icon without gradient",
+                "mappings": [
+                    {
+                        "if": "id=node/-1",
+                        "then": "direction:var(--catch-detail-color)"
+                    }
+                ]
+            },
+            "iconSize": "200,200,center",
+            "location": [
+                "point",
+                "centroid"
+            ],
+            "rotation": {
+                "render": "{_direction:numerical}deg"
+            }
+        },
+        {
+            "color": "--catch-detail-color"
+        }
+    ]
 }

assets/layers/drinking_water/drinking_water.json

@@ -33,8 +33,7 @@
                     "operational_status=closed"
                 ]
             },
-            "then": "close:#c33",
-            "badge": true
+            "then": "close:#c33"
         }
     ],
     "iconSize": "40,40,bottom",
@@ -61,7 +60,7 @@
                 "nl": "drinkbaar water",
                 "fr": "eau potable",
                 "gl": "auga potábel",
-                "de": "Trinkwasserstelle",
+                "de": "trinkwasser",
                 "it": "acqua potabile",
                 "ru": "питьевая вода",
                 "id": "air minum"
@@ -99,8 +98,7 @@
                         "en": "This drinking water works",
                         "nl": "Deze drinkwaterfontein werkt",
                         "it": "La fontanella funziona",
-                        "fr": "Cette fontaine fonctionne",
-                        "de": "Diese Trinkwasserstelle funktioniert"
+                        "fr": "Cette fontaine fonctionne"
                     }
                 },
                 {
@@ -164,7 +162,7 @@
                 "en": "<a href='#{_closest_other_drinking_water_id}'>There is another drinking water fountain at {_closest_other_drinking_water_distance} meter</a>",
                 "nl": "<a href='#{_closest_other_drinking_water_id}'>Er bevindt zich een ander drinkwaterpunt op {_closest_other_drinking_water_distance} meter</a>",
                 "it": "<a href='#{_closest_other_drinking_water_id}'>C’è un’altra fontanella a {_closest_other_drinking_water_distance} metri</a>",
-                "de": "<a href='#{_closest_other_drinking_water_id}'>Eine weitere Trinkwasserstelle liegt {_closest_other_drinking_water_distance} Meter entfernt</a>",
+                "de": "<a href='#{_closest_other_drinking_water_id}'>Ein weiterer Trinkwasserbrunnen befindet sich in {_closest_other_drinking_water_distance} Meter</a>",
                 "fr": "<a href='#{_closest_other_drinking_water_id}'>Une autre source d’eau potable est à {_closest_other_drinking_water_distance} mètres a>"
             },
             "condition": "_closest_other_drinking_water_id~*"
@@ -182,5 +180,27 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "pin:#6BC4F7;./assets/layers/drinking_water/drips.svg"
+            },
+            "iconBadges": [
+                {
+                    "if": {
+                        "or": [
+                            "operational_status=broken",
+                            "operational_status=closed"
+                        ]
+                    },
+                    "then": "close:#c33"
+                }
+            ],
+            "iconSize": "40,40,bottom",
+            "location": [
+                "point"
+            ]
+        }
+    ]
 }

assets/layers/etymology/etymology.json

@@ -172,5 +172,48 @@
                 "then": "#fcca05aa"
             }
         ]
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "pin:#05d7fcaa;./assets/layers/etymology/logo.svg",
+                "mappings": [
+                    {
+                        "if": {
+                            "and": [
+                                "name:etymology=",
+                                "name:etymology:wikidata="
+                            ]
+                        },
+                        "then": "pin:#fcca05aa;./assets/layers/etymology/logo.svg"
+                    }
+                ]
+            },
+            "iconSize": {
+                "render": "40,40,center"
+            },
+            "location": [
+                "point"
+            ]
+        },
+        {
+            "color": {
+                "render": "#05d7fcaa",
+                "mappings": [
+                    {
+                        "if": {
+                            "and": [
+                                "name:etymology=",
+                                "name:etymology:wikidata="
+                            ]
+                        },
+                        "then": "#fcca05aa"
+                    }
+                ]
+            },
+            "width": {
+                "render": "8"
+            }
+        }
+    ]
 }

assets/layers/food/food.json

@@ -92,8 +92,7 @@
             ],
             "description": {
                 "nl": "Een zaak waar je snel bediend wordt, vaak met de focus op afhalen. Zitgelegenheid is eerder beperkt (of zelfs afwezig)",
-                "en": "A food business concentrating on fast counter-only service and take-away food",
-                "de": "Ein Lebensmittelunternehmen, das sich auf schnellen Thekendienst und Essen zum Mitnehmen konzentriert"
+                "en": "A food business concentrating on fast counter-only service and take-away food"
             },
             "preciseInput": {
                 "preferredBackground": "map"
@@ -571,8 +570,7 @@
                         "fr": "Apporter ses propres contenants <b>n’est pas permis</b>",
                         "en": "Bringing your own container is <b>not allowed</b>",
                         "ja": "独自の容器を持参することは<b>できません</b>",
-                        "ru": "Приносить свою тару <b>не разрешено</b>",
-                        "de": "Das Mitbringen eines eigenen Containers ist <b>nicht erlaubt</b>"
+                        "ru": "Приносить свою тару <b>не разрешено</b>"
                     }
                 },
                 {
@@ -581,8 +579,7 @@
                         "nl": "Je <b>moet</b> je eigen containers meenemen om je bestelling in mee te nemen.",
                         "en": "You <b>must</b> bring your own container to order here.",
                         "ja": "自身の容器が注文に<b>必要</b>。",
-                        "fr": "Il est <b>obligatoire</b> d’apporter ses propres contenants",
-                        "de": "Sie <b>müssen</b> Ihren eigenen Behälter mitbringen, um hier zu bestellen."
+                        "fr": "Il est <b>obligatoire</b> d’apporter ses propres contenants"
                     }
                 }
             ],
@@ -669,5 +666,55 @@
             ]
         }
     },
-    "allowMove": true
+    "allowMove": true,
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "circle:white;./assets/layers/food/restaurant.svg",
+                "mappings": [
+                    {
+                        "if": {
+                            "and": [
+                                "amenity=fast_food",
+                                "cuisine=friture"
+                            ]
+                        },
+                        "then": "circle:white;./assets/layers/food/fries.svg"
+                    },
+                    {
+                        "if": "amenity=fast_food",
+                        "then": "circle:white;./assets/layers/food/fastfood.svg"
+                    }
+                ]
+            },
+            "iconBadges": [
+                {
+                    "if": "opening_hours~*",
+                    "then": "isOpen"
+                },
+                {
+                    "if": {
+                        "or": [
+                            "diet:vegetarian=yes",
+                            "diet:vegan=yes"
+                        ]
+                    },
+                    "then": {
+                        "render": "circle:white;./assets/themes/fritures/Vegetarian-mark.svg"
+                    }
+                }
+            ],
+            "label": {
+                "mappings": [
+                    {
+                        "if": "name~*",
+                        "then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
+                    }
+                ]
+            },
+            "location": [
+                "point"
+            ]
+        }
+    ]
 }

assets/layers/ghost_bike/ghost_bike.json

@@ -84,7 +84,7 @@
             "render": {
                 "en": "A <b>ghost bike</b> is a memorial for a cyclist who died in a traffic accident, in the form of a white bicycle placed permanently near the accident location.",
                 "nl": "Een Witte Fiets (of Spookfiets) is een aandenken aan een fietser die bij een verkeersongeval om het leven kwam. Het gaat over een witgeschilderde fiets die geplaatst werd in de buurt van het ongeval.",
-                "de": "Ein <b>Geisterrad</b> ist ein weißes Fahrrad, dass zum Gedenken eines tödlich verunglückten Radfahrers vor Ort aufgestellt wurde.",
+                "de": "Ein <b>Geisterrad</b> ist ein Denkmal für einen Radfahrer, der bei einem Verkehrsunfall ums Leben kam, in Form eines weißen Fahrrades, das dauerhaft in der Nähe des Unfallortes aufgestellt wird.",
                 "it": "Una <b>bici fantasma</b> è il memoriale di un ciclista che è morto in un incidente stradale e che ha la forma di una bicicletta bianca piazzata in maniera stabile vicino al luogo dell’incidente.",
                 "fr": "Un <b>vélo fantôme</b> est un monument commémoratif pour un cycliste décédé dans un accident de la route, sous la forme d'un vélo blanc placé en permanence près du lieu de l'accident."
             }
@@ -182,8 +182,7 @@
                 "en": "Placed on {start_date}",
                 "it": "Piazzata in data {start_date}",
                 "fr": "Placé le {start_date}",
-                "ru": "Установлен {start_date}",
-                "de": "Aufgestellt am {start_date}"
+                "ru": "Установлен {start_date}"
             },
             "freeform": {
                 "key": "start_date",
@@ -204,5 +203,14 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": "./assets/layers/ghost_bike/ghost_bike.svg",
+            "iconSize": "40,40,bottom",
+            "location": [
+                "point"
+            ]
+        }
+    ]
 }

assets/layers/gps_location/gps_location.json

@@ -0,0 +1,15 @@
+{
+    "id": "gps_location",
+    "description": "Meta layer showing the current location of the user",
+    "minzoom": 0,
+    "source": {
+        "osmTags": "user:location=yes"
+    },
+    "mapRendering": [
+        {
+            "icon": "crosshair:#00f",
+            "iconSize": "40,40,center",
+            "location": "point"
+        }
+    ]
+}

assets/layers/grass_in_parks/grass_in_parks.json

@@ -51,5 +51,19 @@
             "id": "grass-in-parks-reviews",
             "render": "{reviews(name, landuse=grass )}"
         }
+    ],
+    "mapRendering": [
+        {
+            "icon": "./assets/themes/playgrounds/playground.svg",
+            "iconSize": "40,40,center",
+            "location": [
+                "point",
+                "centroid"
+            ]
+        },
+        {
+            "color": "#0f0",
+            "width": "1"
+        }
     ]
 }

assets/layers/home_location/home_location.json

@@ -5,13 +5,15 @@
     "source": {
         "osmTags": "user:home=yes"
     },
-    "icon": {
-        "render": "circle:white;./assets/svg/home.svg"
-    },
-    "iconSize": {
-        "render": "20,20,center"
-    },
-    "color": {
-        "render": "#00f"
-    }
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "circle:white;./assets/svg/home.svg"
+            },
+            "iconSize": {
+                "render": "20,20,center"
+            },
+            "location": "point"
+        }
+    ]
 }

assets/layers/information_board/information_board.json

@@ -68,5 +68,23 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/information_board/board.svg"
+            },
+            "iconSize": {
+                "render": "40,40,center"
+            },
+            "location": [
+                "point"
+            ]
+        },
+        {
+            "color": {
+                "render": "#00f"
+            }
+        }
+    ]
 }

assets/layers/left_right_style/left_right_style.json

@@ -0,0 +1,35 @@
+{
+    "id": "left_right_style",
+    "description": "Special meta-style which will show one single line, either on the left or on the right depending on the id. This is used in the small popups with left_right roads",
+    "source": {
+        "osmTags": {
+            "or": [
+                "id=left",
+                "id=right"
+            ]
+        }
+    },
+    "mapRendering": [
+        {
+            "width": 15,
+            "color": {
+                "render": "#ff000088",
+                "mappings": [
+                    {
+                        "if": "id=left",
+                        "then": "#0000ff88"
+                    }
+                ]
+            },
+            "offset": {
+                "render": "-15",
+                "mappings": [
+                    {
+                        "if": "id=right",
+                        "then": "15"
+                    }
+                ]
+            }
+        }
+    ]
+}

assets/layers/map/map.json

@@ -241,5 +241,55 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/map/map.svg",
+                "mappings": [
+                    {
+                        "if": {
+                            "and": [
+                                "map_source=OpenStreetMap",
+                                "map_source:attribution=sticker"
+                            ]
+                        },
+                        "then": "./assets/layers/map/map-stickered.svg"
+                    },
+                    {
+                        "if": {
+                            "and": [
+                                "map_source=OpenStreetMap",
+                                "map_source:attribution=yes"
+                            ]
+                        },
+                        "then": "./assets/layers/map/osm-logo-white-bg.svg"
+                    },
+                    {
+                        "if": {
+                            "and": [
+                                "map_source=OpenStreetMap"
+                            ]
+                        },
+                        "then": "./assets/layers/map/osm-logo-buggy-attr.svg"
+                    }
+                ]
+            },
+            "iconSize": {
+                "render": "50,50,center"
+            },
+            "location": [
+                "point",
+                "centroid"
+            ]
+        },
+        {
+            "color": {
+                "render": "#00f"
+            },
+            "width": {
+                "render": "8"
+            }
+        }
+    ]
 }

assets/layers/nature_reserve/nature_reserve.json

@@ -304,8 +304,7 @@
                 "nl": "{curator} is de beheerder van dit gebied",
                 "en": "{curator} is the curator of this nature reserve",
                 "it": "{curator} è il curatore di questa riserva naturale",
-                "fr": "{curator} est en charge de la conservation de la réserve",
-                "de": "{curator} ist der Pfleger dieses Naturschutzgebietes"
+                "fr": "{curator} est en charge de la conservation de la réserve"
             },
             "freeform": {
                 "key": "curator",
@@ -318,8 +317,7 @@
                 "nl": "Waar kan men naartoe emailen voor vragen en meldingen van dit natuurgebied?<br/><span class='subtle'>Respecteer privacy - geef enkel persoonlijke emailadressen als deze elders zijn gepubliceerd",
                 "en": "What email adress can one send to with questions and problems with this nature reserve?<br/><span class='subtle'>Respect privacy - only fill out a personal email address if this is widely published",
                 "it": "Qual è l’indirizzo email a cui scrivere per fare domande o segnalare problemi su questa riserva naturale?<br/><span class='subtle'>Rispetta la privacy (compila l’indirizzo email personale solo se è stato reso pubblico)",
-                "fr": "À quelle adresse courriel peut-on envoyer des questions et des problèmes concernant cette réserve naturelle ? <br/><span class='subtle'>Respecter la vie privée – renseignez une adresse électronique personnelle seulement si celle-ci est largement publiée",
-                "de": "An welche Email-Adresse kann man sich bei Fragen und Problemen zu diesem Naturschutzgebiet wenden?<br/><span class='subtle'>Respektieren Sie die Privatsphäre - geben Sie nur dann eine persönliche Email-Adresse an, wenn diese allgemein bekannt ist"
+                "fr": "À quelle adresse courriel peut-on envoyer des questions et des problèmes concernant cette réserve naturelle ? <br/><span class='subtle'>Respecter la vie privée – renseignez une adresse électronique personnelle seulement si celle-ci est largement publiée"
             },
             "render": {
                 "nl": "<a href='mailto:{email}' target='_blank'>{email}</a>",
@@ -342,8 +340,7 @@
                 "nl": "Waar kan men naartoe bellen voor vragen en meldingen van dit natuurgebied?<br/><span class='subtle'>Respecteer privacy - geef enkel persoonlijke telefoonnummers als deze elders zijn gepubliceerd",
                 "en": "What phone number can one call to with questions and problems with this nature reserve?<br/><span class='subtle'>Respect privacy - only fill out a personal phone number address if this is widely published",
                 "it": "Quale numero di telefono comporre per fare domande o segnalare problemi riguardanti questa riserva naturale?br/><span class='subtle'>Rispetta la privacy (inserisci il numero di telefono privato solo se questo è noto pubblicamente)",
-                "fr": "Quel numéro de téléphone peut-on appeler pour poser des questions et résoudre des problèmes concernant cette réserve naturelle ? <br/><span class='subtil'>Respecter la vie privée – renseignez un numéro de téléphone personnel seulement si celui-ci est largement publié",
-                "de": "Welche Telefonnummer kann man bei Fragen und Problemen zu diesem Naturschutzgebiet anrufen?<br/><span class='subtle'>Respektieren Sie die Privatsphäre - geben Sie nur eine Telefonnummer an, wenn diese allgemein bekannt ist"
+                "fr": "Quel numéro de téléphone peut-on appeler pour poser des questions et résoudre des problèmes concernant cette réserve naturelle ? <br/><span class='subtil'>Respecter la vie privée – renseignez un numéro de téléphone personnel seulement si celui-ci est largement publié"
             },
             "render": {
                 "nl": "<a href='tel:{email}' target='_blank'>{phone}</a>",
@@ -466,5 +463,27 @@
                 }
             ]
         }
+    ],
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/nature_reserve/nature_reserve.svg"
+            },
+            "iconSize": {
+                "render": "50,50,center"
+            },
+            "location": [
+                "point",
+                "centroid"
+            ]
+        },
+        {
+            "color": {
+                "render": "#3c3"
+            },
+            "width": {
+                "render": "1"
+            }
+        }
     ]
 }

assets/layers/observation_tower/observation_tower.json

@@ -96,8 +96,7 @@
         {
             "question": {
                 "en": "How much does one have to pay to enter this tower?",
-                "nl": "Hoeveel moet men betalen om deze toren te bezoeken?",
-                "de": "Was kostet der Zugang zu diesem Turm?"
+                "nl": "Hoeveel moet men betalen om deze toren te bezoeken?"
             },
             "render": {
                 "en": "Visiting this tower costs <b>{charge}</b>",
@@ -205,5 +204,18 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "circle:white;./assets/layers/observation_tower/Tower_observation.svg"
+            },
+            "iconSize": {
+                "render": "40,40,center"
+            },
+            "location": [
+                "point"
+            ]
+        }
+    ]
 }

assets/layers/parking/parking.json

@@ -94,5 +94,18 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/parking/parking.svg"
+            },
+            "iconSize": {
+                "render": "36,36,center"
+            },
+            "location": [
+                "point"
+            ]
+        }
+    ]
 }

assets/layers/picnic_table/picnic_table.json

@@ -115,5 +115,18 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "circle:#e6cf39;./assets/layers/picnic_table/picnic_table.svg"
+            },
+            "iconSize": {
+                "render": "35,35,center"
+            },
+            "location": [
+                "point"
+            ]
+        }
+    ]
 }

assets/layers/play_forest/play_forest.json

@@ -116,5 +116,27 @@
             "description": "Een zone in het bos, duidelijk gemarkeerd als speelzone met de overeenkomstige borden.<br/><img src='./assets/layers/play_forest/icon.svg'/>"
         }
     ],
-    "wayHandling": 2
+    "wayHandling": 2,
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/play_forest/icon.svg"
+            },
+            "iconSize": {
+                "render": "40,40,center"
+            },
+            "location": [
+                "point",
+                "centroid"
+            ]
+        },
+        {
+            "color": {
+                "render": "#007055"
+            },
+            "width": {
+                "render": "2"
+            }
+        }
+    ]
 }

assets/layers/playground/playground.json

@@ -213,8 +213,7 @@
                 "en": "What is the minimum age required to access this playground?",
                 "it": "Qual è l’età minima per accedere a questo parco giochi?",
                 "fr": "Quel est l'âge minimal requis pour accéder à ce terrain de jeux ?",
-                "ru": "С какого возраста доступна эта детская площадка?",
-                "de": "Ab welchem Alter dürfen Kinder auf diesem Spielplatz spielen?"
+                "ru": "С какого возраста доступна эта детская площадка?"
             },
             "freeform": {
                 "key": "min_age",
@@ -235,8 +234,7 @@
                 "nl": "Wat is de maximaal toegestane leeftijd voor deze speeltuin?",
                 "en": "What is the maximum age allowed to access this playground?",
                 "it": "Qual è l’età massima per accedere a questo parco giochi?",
-                "fr": "Quel est l’âge maximum autorisé pour utiliser l’aire de jeu ?",
-                "de": "Bis zu welchem Alter dürfen Kinder auf diesem Spielplatz spielen?"
+                "fr": "Quel est l’âge maximum autorisé pour utiliser l’aire de jeu ?"
             },
             "freeform": {
                 "key": "max_age",
@@ -357,8 +355,7 @@
                 "nl": "Wie kan men bellen indien er problemen zijn met de speeltuin?",
                 "en": "What is the phone number of the playground maintainer?",
                 "fr": "Quel est le numéro de téléphone du responsable du terrain de jeux ?",
-                "it": "Qual è il numero di telefono del gestore del campetto?",
-                "de": "Wie lautet die Telefonnummer vom Betreiber des Spielplatzes?"
+                "it": "Qual è il numero di telefono del gestore del campetto?"
             },
             "render": {
                 "nl": "De bevoegde dienst kan getelefoneerd worden via <a href='tel:{phone}'>{phone}</a>",
@@ -491,8 +488,7 @@
                     "opening_hours~*"
                 ]
             },
-            "then": "isOpen",
-            "badge": true
+            "then": "isOpen"
         }
     ],
     "width": {
@@ -545,5 +541,56 @@
                 "leisure="
             ]
         }
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/themes/playgrounds/playground.svg"
+            },
+            "iconBadges": [
+                {
+                    "if": {
+                        "and": [
+                            "opening_hours!=24/7",
+                            "opening_hours~*"
+                        ]
+                    },
+                    "then": "isOpen"
+                }
+            ],
+            "iconSize": {
+                "render": "40,40,center",
+                "mappings": [
+                    {
+                        "if": "id~node/.*",
+                        "then": "40,40,center"
+                    },
+                    {
+                        "if": "_size_classification=small",
+                        "then": "25,25,center"
+                    },
+                    {
+                        "if": "_size_classification=medium",
+                        "then": "40,40,center"
+                    },
+                    {
+                        "if": "_size_classification=large",
+                        "then": "60,60,center"
+                    }
+                ]
+            },
+            "location": [
+                "point",
+                "centroid"
+            ]
+        },
+        {
+            "color": {
+                "render": "#5dbaa9"
+            },
+            "width": {
+                "render": "1"
+            }
+        }
+    ]
 }

assets/layers/public_bookcase/public_bookcase.json

@@ -45,7 +45,7 @@
         ]
     },
     "icon": {
-        "render": "./assets/themes/bookcases/bookcase.svg;"
+        "render": "./assets/themes/bookcases/bookcase.svg"
     },
     "label": {
         "mappings": [
@@ -487,5 +487,32 @@
                 }
             ]
         }
+    ],
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/themes/bookcases/bookcase.svg"
+            },
+            "label": {
+                "mappings": [
+                    {
+                        "if": "name~*",
+                        "then": "<div style='background: white; padding: 0.25em; border-radius:0.5em'>{name}</div>"
+                    }
+                ]
+            },
+            "location": [
+                "point",
+                "centroid"
+            ]
+        },
+        {
+            "color": {
+                "render": "#0000ff"
+            },
+            "width": {
+                "render": "8"
+            }
+        }
     ]
 }

assets/layers/shops/shops.json

@@ -377,5 +377,33 @@
             ]
         }
     },
-    "allowMove": true
+    "allowMove": true,
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/themes/shops/shop.svg"
+            },
+            "iconBadges": [
+                {
+                    "if": "opening_hours~*",
+                    "then": "isOpen"
+                }
+            ],
+            "iconSize": {
+                "render": "40,40,center"
+            },
+            "location": [
+                "point",
+                "centroid"
+            ]
+        },
+        {
+            "color": {
+                "render": "#00f"
+            },
+            "width": {
+                "render": "8"
+            }
+        }
+    ]
 }

assets/layers/slow_roads/slow_roads.json

@@ -265,5 +265,47 @@
     "color": {
         "render": "#eaba2a"
     },
-    "presets": []
+    "presets": [],
+    "mapRendering": [
+        {
+            "icon": "./assets/layers/slow_roads/slow_road.svg",
+            "location": [
+                "point"
+            ]
+        },
+        {
+            "color": {
+                "render": "#eaba2a"
+            },
+            "width": {
+                "render": "7"
+            },
+            "dashArray": {
+                "render": "",
+                "mappings": [
+                    {
+                        "if": "highway=cycleway",
+                        "then": ""
+                    },
+                    {
+                        "if": "highway=path",
+                        "then": "0 12"
+                    },
+                    {
+                        "if": {
+                            "or": [
+                                "highway=footway",
+                                "highway=pedestrian"
+                            ]
+                        },
+                        "then": "12 18"
+                    },
+                    {
+                        "if": "highway=living_street",
+                        "then": "12 12 0 12"
+                    }
+                ]
+            }
+        }
+    ]
 }

assets/layers/sport_pitch/sport_pitch.json

@@ -160,8 +160,7 @@
                 "fr": "De quelle surface est fait ce terrain de sport ?",
                 "en": "Which is the surface of this sport pitch?",
                 "it": "Qual è la superficie di questo campo sportivo?",
-                "ru": "Какое покрытие на этой спортивной площадке?",
-                "de": "Was ist die Oberfläche dieses Sportplatzes?"
+                "ru": "Какое покрытие на этой спортивной площадке?"
             },
             "render": {
                 "nl": "De ondergrond is <b>{surface}</b>",
@@ -262,8 +261,7 @@
                         "fr": "Accès limité (par exemple uniquement sur réservation, à certains horaires…)",
                         "en": "Limited access (e.g. only with an appointment, during certain hours, ...)",
                         "it": "Accesso limitato (p.es. solo con prenotazione, in certi orari, ...)",
-                        "ru": "Ограниченный доступ (напр., только по записи, в определённые часы, ...)",
-                        "de": "Eingeschränkter Zugang (z. B. nur mit Termin, zu bestimmten Zeiten, ...)"
+                        "ru": "Ограниченный доступ (напр., только по записи, в определённые часы, ...)"
                     }
                 },
                 {
@@ -296,8 +294,7 @@
                 "fr": "Doit-on réserver pour utiliser ce terrain de sport ?",
                 "en": "Does one have to make an appointment to use this sport pitch?",
                 "it": "È necessario prenotarsi per usare questo campo sportivo?",
-                "ru": "Нужна ли предварительная запись для доступа на эту спортивную площадку?",
-                "de": "Muss man einen Termin vereinbaren, um diesen Sportplatz zu benutzen?"
+                "ru": "Нужна ли предварительная запись для доступа на эту спортивную площадку?"
             },
             "condition": {
                 "and": [
@@ -313,8 +310,7 @@
                         "nl": "Reserveren is verplicht om gebruik te maken van dit sportterrein",
                         "fr": "Il est obligatoire de réserver pour utiliser ce terrain de sport",
                         "en": "Making an appointment is obligatory to use this sport pitch",
-                        "it": "La prenotazione è obbligatoria per usare questo campo sportivo",
-                        "de": "Für die Nutzung des Sportplatzes ist eine Voranmeldung erforderlich"
+                        "it": "La prenotazione è obbligatoria per usare questo campo sportivo"
                     }
                 },
                 {
@@ -324,8 +320,7 @@
                         "fr": "Il est recommendé de réserver pour utiliser ce terrain de sport",
                         "en": "Making an appointment is recommended when using this sport pitch",
                         "it": "La prenotazione è consigliata per usare questo campo sportivo",
-                        "ru": "Желательна предварительная запись для доступа на эту спортивную площадку",
-                        "de": "Für die Nutzung des Sportplatzes wird eine Voranmeldung empfohlen"
+                        "ru": "Желательна предварительная запись для доступа на эту спортивную площадку"
                     }
                 },
                 {
@@ -335,8 +330,7 @@
                         "fr": "Il est possible de réserver, mais ce n'est pas nécéssaire pour utiliser ce terrain de sport",
                         "en": "Making an appointment is possible, but not necessary to use this sport pitch",
                         "it": "La prenotazione è consentita, ma non è obbligatoria per usare questo campo sportivo",
-                        "ru": "Предварительная запись для доступа на эту спортивную площадку возможна, но не обязательна",
-                        "de": "Eine Voranmeldung ist möglich, aber nicht notwendig, um diesen Sportplatz zu nutzen"
+                        "ru": "Предварительная запись для доступа на эту спортивную площадку возможна, но не обязательна"
                     }
                 },
                 {
@@ -357,8 +351,7 @@
                 "nl": "Wat is het telefoonnummer van de bevoegde dienst of uitbater?",
                 "fr": "Quel est le numéro de téléphone du gérant ?",
                 "en": "What is the phone number of the operator?",
-                "it": "Qual è il numero di telefono del gestore?",
-                "de": "Wie ist die Telefonnummer des Betreibers?"
+                "it": "Qual è il numero di telefono del gestore?"
             },
             "freeform": {
                 "key": "phone",
@@ -372,8 +365,7 @@
                 "nl": "Wat is het email-adres van de bevoegde dienst of uitbater?",
                 "fr": "Quelle est l'adresse courriel du gérant ?",
                 "en": "What is the email address of the operator?",
-                "it": "Qual è l'indirizzo email del gestore?",
-                "de": "Wie ist die Email-Adresse des Betreibers?"
+                "it": "Qual è l'indirizzo email del gestore?"
             },
             "freeform": {
                 "key": "email",
@@ -452,8 +444,7 @@
                     "opening_hours~*"
                 ]
             },
-            "then": "isOpen",
-            "badge": true
+            "then": "isOpen"
         },
         {
             "if": {
@@ -463,8 +454,7 @@
                     "access=no"
                 ]
             },
-            "then": "circle:white;./assets/layers/sport_pitch/lock.svg",
-            "badge": true
+            "then": "circle:white;./assets/layers/sport_pitch/lock.svg"
         }
     ],
     "width": {
@@ -524,5 +514,76 @@
                 "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen"
             ]
         }
+    ],
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "circle:white;./assets/layers/sport_pitch/sport_pitch.svg",
+                "mappings": [
+                    {
+                        "if": {
+                            "or": [
+                                "sport=baseball",
+                                "sport=basketball",
+                                "sport=beachvolleyball",
+                                "sport=boules",
+                                "sport=skateboard",
+                                "sport=soccer",
+                                "sport=table_tennis",
+                                "sport=tennis",
+                                "sport=volleyball"
+                            ]
+                        },
+                        "then": "circle:white;./assets/layers/sport_pitch/{sport}.svg"
+                    }
+                ]
+            },
+            "iconBadges": [
+                {
+                    "if": {
+                        "and": [
+                            "opening_hours!=24/7",
+                            "opening_hours~*"
+                        ]
+                    },
+                    "then": "isOpen"
+                },
+                {
+                    "if": {
+                        "or": [
+                            "access=customers",
+                            "access=private",
+                            "access=no"
+                        ]
+                    },
+                    "then": "circle:white;./assets/layers/sport_pitch/lock.svg"
+                }
+            ],
+            "iconSize": {
+                "render": "25,25,center",
+                "mappings": [
+                    {
+                        "if": {
+                            "or": [
+                                "_size_classification=medium",
+                                "id~node/.*"
+                            ]
+                        },
+                        "then": "40,40,center"
+                    },
+                    {
+                        "if": "_size_classification=small",
+                        "then": "25,25,center"
+                    },
+                    {
+                        "if": "_size_classification=large",
+                        "then": "50,50,center"
+                    }
+                ]
+            },
+            "location": [
+                "point"
+            ]
+        }
     ]
 }

assets/layers/street_lamps/bent_pole_1.svg

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="400"
+   height="400"
+   viewBox="0 0 105.83333 105.83334"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="bent-pole-1.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2"
+     inkscape:cx="91.636778"
+     inkscape:cy="228.62622"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g869"
+     inkscape:document-rotation="0"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="2160"
+     inkscape:window-height="1346"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid835" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Laag 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g864"
+       transform="translate(-9.1324516,-2.7737965)">
+      <g
+         id="g869">
+        <g
+           id="g1550"
+           transform="matrix(1.75,0,0,1.75,-46.536839,-41.767847)">
+          <g
+             id="g1544">
+            <path
+               style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               d="M 50.142868,82.148796 V 39.815463 C 50.424145,33.62186 52.916667,31.75 59.53125,30.427083 L 76.729167,27.78125"
+               id="path837"
+               sodipodi:nodetypes="cccc" />
+          </g>
+          <path
+             style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+             id="path857"
+             sodipodi:type="arc"
+             sodipodi:cx="66.672424"
+             sodipodi:cy="41.538971"
+             sodipodi:rx="4.6302085"
+             sodipodi:ry="2.9244671"
+             sodipodi:start="0"
+             sodipodi:end="3.1415927"
+             sodipodi:open="true"
+             sodipodi:arc-type="chord"
+             d="m 71.302633,41.538971 a 4.6302085,2.9244671 0 0 1 -2.315104,2.532663 4.6302085,2.9244671 0 0 1 -4.630209,0 4.6302085,2.9244671 0 0 1 -2.315104,-2.532663 z"
+             transform="rotate(-9)" />
+          <rect
+             style="fill:#000000;stroke:#000000;stroke-width:0.866025;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+             id="rect859"
+             width="7.9375"
+             height="3.9687498"
+             x="46.302082"
+             y="80.697914" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

assets/layers/street_lamps/bent_pole_2.svg

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="400"
+   height="400"
+   viewBox="0 0 105.83333 105.83334"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="bent-pole-2.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="141.74396"
+     inkscape:cy="178.45475"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g969"
+     inkscape:document-rotation="0"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="2160"
+     inkscape:window-height="1346"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid835" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Laag 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g864"
+       transform="translate(-9.1324516,-2.7737965)">
+      <g
+         id="g969"
+         transform="translate(11.842268)">
+        <g
+           id="g1568"
+           transform="matrix(1.75,0,0,1.75,-37.655138,-41.767847)">
+          <g
+             id="g908">
+            <g
+               id="g1555">
+              <path
+                 style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                 d="M 50.20685,82.148797 50.142868,39.815463 C 50.424145,33.62186 52.916667,31.75 59.53125,30.427083 L 76.729167,27.78125"
+                 id="path837"
+                 sodipodi:nodetypes="cccc" />
+              <path
+                 style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+                 id="path857"
+                 sodipodi:type="arc"
+                 sodipodi:cx="66.672424"
+                 sodipodi:cy="41.538971"
+                 sodipodi:rx="4.6302085"
+                 sodipodi:ry="2.9244671"
+                 sodipodi:start="0"
+                 sodipodi:end="3.1415927"
+                 sodipodi:open="true"
+                 sodipodi:arc-type="chord"
+                 transform="rotate(-9)"
+                 d="m 71.302633,41.538971 a 4.6302085,2.9244671 0 0 1 -2.315104,2.532663 4.6302085,2.9244671 0 0 1 -4.630209,0 4.6302085,2.9244671 0 0 1 -2.315104,-2.532663 z" />
+              <rect
+                 style="fill:#000000;stroke:#000000;stroke-width:0.866025;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+                 id="rect859"
+                 width="7.9375"
+                 height="3.9687498"
+                 x="46.302082"
+                 y="80.697914" />
+            </g>
+          </g>
+          <g
+             id="g957"
+             transform="translate(11.641669,6.6145832)">
+            <g
+               id="g908-0"
+               transform="translate(-94.985418,38.364583)">
+              <g
+                 id="g947"
+                 transform="matrix(-1,0,0,1,183.75745,-44.851203)">
+                <g
+                   id="g942">
+                  <path
+                     style="fill:none;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                     d="M 50.270833,39.6875 C 50.55211,33.493897 52.916667,31.75 59.53125,30.427083 L 76.729167,27.78125"
+                     id="path837-4"
+                     sodipodi:nodetypes="ccc" />
+                  <path
+                     style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+                     id="path857-5"
+                     sodipodi:type="arc"
+                     sodipodi:cx="66.672424"
+                     sodipodi:cy="41.538971"
+                     sodipodi:rx="4.6302085"
+                     sodipodi:ry="2.9244671"
+                     sodipodi:start="0"
+                     sodipodi:end="3.1415927"
+                     sodipodi:open="true"
+                     sodipodi:arc-type="chord"
+                     transform="rotate(-9)"
+                     d="m 71.302633,41.538971 a 4.6302085,2.9244671 0 0 1 -2.315104,2.532663 4.6302085,2.9244671 0 0 1 -4.630209,0 4.6302085,2.9244671 0 0 1 -2.315104,-2.532663 z" />
+                </g>
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

assets/layers/street_lamps/license_info.json

@@ -0,0 +1,36 @@
+[
+  {
+    "path": "bent_pole_1.svg",
+    "license": "CC0",
+    "authors": [
+      "Robin van der Linde"
+    ],
+    "sources": []
+  },
+  {
+    "path": "bent_pole_2.svg",
+    "license": "CC0",
+    "authors": [
+      "Robin van der Linde"
+    ],
+    "sources": []
+  },
+  {
+    "path": "straight_pole.svg",
+    "license": "CC0",
+    "authors": [
+      "Robin van der Linde"
+    ],
+    "sources": []
+  },
+  {
+    "path": "street_lamp.svg",
+    "license": "CC0",
+    "authors": [
+      "Yohan Boniface"
+    ],
+    "sources": [
+      "https://github.com/hotosm/HDM-CartoCSS/blob/master/icons/poi/street_lamp.svg"
+    ]
+  }
+]

assets/layers/street_lamps/straight_pole.svg

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100mm"
+   height="100mm"
+   viewBox="0 0 99.999987 99.999992"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="straight_pole.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4340417"
+     inkscape:cx="-22.578158"
+     inkscape:cy="290.51848"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g888"
+     inkscape:document-rotation="0"
+     showgrid="true"
+     units="mm"
+     inkscape:window-width="2160"
+     inkscape:window-height="1346"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid835" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Laag 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g864"
+       transform="translate(-9.1324516,-2.7737965)">
+      <g
+         id="g869">
+        <g
+           id="g1550"
+           transform="matrix(1.75,0,0,1.75,-46.536839,-41.767847)">
+          <g
+             id="g1605"
+             transform="matrix(1.35,0,0,1.35,-21.342788,-16.055652)">
+            <g
+               id="g888"
+               transform="matrix(1.25,0,0,1.25,-15.134304,-18.038165)">
+              <g
+                 id="g905">
+                <g
+                   id="g871"
+                   transform="translate(-0.08664166)">
+                  <path
+                     style="fill:none;stroke:#000000;stroke-width:1.14286;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                     d="M 60.651853,71.512113 V 45.305764"
+                     id="path1416"
+                     sodipodi:nodetypes="cc" />
+                  <rect
+                     style="fill:#000000;stroke:#000000;stroke-width:1.14286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+                     id="rect1421"
+                     width="4.5357146"
+                     height="2.2678573"
+                     x="58.355999"
+                     y="69.272255" />
+                </g>
+                <g
+                   id="g1446" />
+                <g
+                   id="g867"
+                   transform="translate(-3.5449738e-7,8.1221356)">
+                  <path
+                     style="fill:#ffff00;stroke:#000000;stroke-width:1.14286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+                     id="path1426"
+                     sodipodi:type="arc"
+                     sodipodi:cx="60.537212"
+                     sodipodi:cy="34.523796"
+                     sodipodi:rx="3.779762"
+                     sodipodi:ry="2.2678573"
+                     sodipodi:start="0"
+                     sodipodi:end="3.1415927"
+                     sodipodi:open="true"
+                     sodipodi:arc-type="chord"
+                     d="m 64.316974,34.523796 a 3.779762,2.2678573 0 0 1 -1.889881,1.964022 3.779762,2.2678573 0 0 1 -3.779762,0 3.779762,2.2678573 0 0 1 -1.889881,-1.964022 z" />
+                  <rect
+                     style="fill:none;stroke:#000000;stroke-width:1.14286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+                     id="rect1428"
+                     width="7.5595241"
+                     height="0.75595242"
+                     x="56.757454"
+                     y="32.255939" />
+                  <g
+                     id="g1585">
+                    <path
+                       style="fill:none;stroke:#ffff00;stroke-width:0.571429;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                       d="m 57.211024,37.547605 -1.511905,1.965477"
+                       id="path1456"
+                       sodipodi:nodetypes="cc" />
+                    <path
+                       style="fill:none;stroke:#ffff00;stroke-width:0.571429;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                       d="m 55.85031,36.489273 -2.419048,1.209523"
+                       id="path1460"
+                       sodipodi:nodetypes="cc" />
+                    <path
+                       style="fill:none;stroke:#ffff00;stroke-width:0.571429;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                       d="m 58.874119,38.303558 -0.604762,2.267857"
+                       id="path1462"
+                       sodipodi:nodetypes="cc" />
+                  </g>
+                  <g
+                     id="g1590">
+                    <path
+                       style="fill:none;stroke:#ffff00;stroke-width:0.571429;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                       d="m 63.863406,37.547605 1.511905,1.965477"
+                       id="path1456-5"
+                       sodipodi:nodetypes="cc" />
+                    <path
+                       style="fill:none;stroke:#ffff00;stroke-width:0.571429;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                       d="m 65.22412,36.489273 2.419048,1.209523"
+                       id="path1460-2"
+                       sodipodi:nodetypes="cc" />
+                    <path
+                       style="fill:none;stroke:#ffff00;stroke-width:0.571429;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+                       d="m 62.200311,38.303558 0.604762,2.267857"
+                       id="path1462-5"
+                       sodipodi:nodetypes="cc" />
+                  </g>
+                </g>
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

assets/layers/street_lamps/street_lamp.svg

@@ -0,0 +1,4 @@
+<svg width="18" height="18" xmlns="http://www.w3.org/2000/svg">
+ <path d="m9 1c-1 0-2 1.5-3 4h-1v1h1l1 4 1 1v1h-2v1h2v4h2v-4h2v-1h-2v-1l1-1 1-4h1v-1h-1c-1-2.5-2-4-3-4zm-2 5h4l-1 4h-2z" fill="none" opacity=".3" stroke="#fff" stroke-linejoin="round" stroke-width="2" xmlns:ns0="http://www.w3.org/2000/svg"/>
+ <path d="m9 1c-1 0-2 1.5-3 4h-1v1h1l1 4 1 1v1h-2v1h2v4h2v-4h2v-1h-2v-1l1-1 1-4h1v-1h-1c-1-2.5-2-4-3-4zm-2 5h4l-1 4h-2z" fill="#747474" xmlns:ns0="http://www.w3.org/2000/svg"/>
+</svg>

assets/layers/street_lamps/street_lamps.json

@@ -0,0 +1,371 @@
+{
+    "id": "street_lamps",
+    "name": {
+        "en": "Street Lamps",
+        "nl": "Straatlantaarns"
+    },
+    "source": {
+        "osmTags": "highway=street_lamp"
+    },
+    "minZoom": 16,
+    "title": {
+        "render": {
+            "en": "Street Lamp",
+            "nl": "Straatlantaarn"
+        },
+        "mappings": [
+            {
+                "if": "ref~*",
+                "then": {
+                    "en": "Street Lamp {ref}",
+                    "nl": "Straatlantaarn {ref}"
+                }
+            }
+        ]
+    },
+    "mapRendering": [
+        {
+            "location": "point",
+            "icon": "./assets/layers/street_lamps/street_lamp.svg",
+            "iconBadges": [
+                {
+                    "if": "light:colour~*",
+                    "then": "circle:{light:colour}"
+                }
+            ],
+            "iconSize": "40,40,bottom"
+        }
+    ],
+    "presets": [
+        {
+            "title": {
+                "en": "street lamp",
+                "nl": "straatlantaarn"
+            },
+            "tags": [
+                "highway=street_lamp"
+            ],
+            "preciseInput": true
+        }
+    ],
+    "tagRenderings": [
+        {
+            "id": "ref",
+            "render": {
+                "en": "This street lamp has the reference number {ref}",
+                "nl": "Deze straatlantaarn heeft het nummer {ref}"
+            },
+            "question": {
+                "en": "What is the reference number of this street lamp?",
+                "nl": "Wat is het nummer van deze straatlantaarn?"
+            },
+            "freeform": {
+                "key": "ref"
+            }
+        },
+        {
+            "id": "support",
+            "question": {
+                "en": "How is this street lamp mounted?",
+                "nl": "Hoe is deze straatlantaarn gemonteerd?"
+            },
+            "mappings": [
+                {
+                    "if": "support=catenary",
+                    "then": {
+                        "en": "This lamp is suspended using cables",
+                        "nl": "Deze lantaarn hangt aan kabels"
+                    }
+                },
+                {
+                    "if": "support=ceiling",
+                    "then": {
+                        "en": "This lamp is mounted on a ceiling",
+                        "nl": "Deze lantaarn hangt aan een plafond"
+                    }
+                },
+                {
+                    "if": "support=ground",
+                    "then": {
+                        "en": "This lamp is mounted in the ground",
+                        "nl": "Deze lantaarn zit in de grond"
+                    }
+                },
+                {
+                    "if": "support=pedestal",
+                    "then": {
+                        "en": "This lamp is mounted on a short pole (mostly < 1.5m)",
+                        "nl": "Deze lantaarn zit op een korte paal (meestal < 1.5m)"
+                    }
+                },
+                {
+                    "if": "support=pole",
+                    "then": {
+                        "en": "This lamp is mounted on a pole",
+                        "nl": "Deze lantaarn zit op een paal"
+                    }
+                },
+                {
+                    "if": "support=wall",
+                    "then": {
+                        "en": "This lamp is mounted directly to the wall",
+                        "nl": "Deze lantaarn hangt direct aan de muur"
+                    }
+                },
+                {
+                    "if": "support=wall_mount",
+                    "then": {
+                        "en": "This lamp is mounted to the wall using a metal bar",
+                        "nl": "Deze lantaarn hangt aan de muur met een metalen balk"
+                    }
+                }
+            ]
+        },
+        {
+            "id": "lamp_mount",
+            "question": {
+                "en": "How is this lamp mounted to the pole?",
+                "nl": "Hoe zit deze lantaarn aan de paal?"
+            },
+            "condition": "support=pole",
+            "mappings": [
+                {
+                    "if": "lamp_mount=straight_mast",
+                    "then": {
+                        "en": "This lamp sits atop of a straight mast",
+                        "nl": "Deze lantaarn zit boven op een rechte paal"
+                    }
+                },
+                {
+                    "if": "lamp_mount=bent_mast",
+                    "then": {
+                        "en": "This lamp sits at the end of a bent mast",
+                        "nl": "Deze lantaarn zit aan het eind van een gebogen paal"
+                    }
+                }
+            ]
+        },
+        {
+            "id": "method",
+            "question": {
+                "en": "What kind of lighting does this lamp use?",
+                "nl": "Wat voor verlichting gebruikt deze lantaarn?"
+            },
+            "mappings": [
+                {
+                    "if": "light:method=electric",
+                    "then": {
+                        "en": "This lamp is lit electrically",
+                        "nl": "Deze lantaarn is elektrisch verlicht"
+                    },
+                    "hideInAnswer": true
+                },
+                {
+                    "if": "light:method=LED",
+                    "then": {
+                        "en": "This lamp uses LEDs",
+                        "nl": "Deze lantaarn gebruikt LEDs"
+                    }
+                },
+                {
+                    "if": "light:method=incandescent",
+                    "then": {
+                        "en": "This lamp uses incandescent lighting",
+                        "nl": "Deze lantaarn gebruikt gloeilampen"
+                    }
+                },
+                {
+                    "if": "light:method=halogen",
+                    "then": {
+                        "en": "This lamp uses halogen lighting",
+                        "nl": "Deze lantaarn gebruikt halogeen verlichting"
+                    }
+                },
+                {
+                    "if": "light:method=discharge",
+                    "then": {
+                        "en": "This lamp uses discharge lamps (unknown type)",
+                        "nl": "Deze lantaarn gebruikt gasontladingslampen (onbekend type)"
+                    }
+                },
+                {
+                    "if": "light:method=mercury",
+                    "then": {
+                        "en": "This lamp uses a mercury-vapour lamp (lightly blueish)",
+                        "nl": "Deze lantaarn gebruikt een kwiklamp (enigszins blauwachtig)"
+                    }
+                },
+                {
+                    "if": "light:method=metal-halide",
+                    "then": {
+                        "en": "This lamp uses metal-halide lamps (bright white)",
+                        "nl": "Deze lantaarn gebruikt metaalhalidelampen"
+                    }
+                },
+                {
+                    "if": "light:method=fluorescent",
+                    "then": {
+                        "en": "This lamp uses fluorescent lighting",
+                        "nl": "Deze lantaarn gebruikt fluorescentieverlichting (TL en spaarlamp)"
+                    }
+                },
+                {
+                    "if": "light:method=sodium",
+                    "then": {
+                        "en": "This lamp uses sodium lamps (unknown type)",
+                        "nl": "Deze lantaarn gebruikt natriumlampen (onbekend type)"
+                    }
+                },
+                {
+                    "if": "light:method=low_pressure_sodium",
+                    "then": {
+                        "en": "This lamp uses low pressure sodium lamps (monochrome orange)",
+                        "nl": "Deze lantaarn gebruikt lagedruknatriumlampen (monochroom oranje)"
+                    }
+                },
+                {
+                    "if": "light:method=high_pressure_sodium",
+                    "then": {
+                        "en": "This lamp uses high pressure sodium lamps (orange with white)",
+                        "nl": "Deze lantaarn gebruikt hogedruknatriumlampen (oranje met wit)"
+                    }
+                },
+                {
+                    "if": "light:method=gas",
+                    "then": {
+                        "en": "This lamp is lit using gas",
+                        "nl": "Deze lantaarn wordt verlicht met gas"
+                    }
+                }
+            ]
+        },
+        {
+            "id": "colour",
+            "question": {
+                "en": "What colour light does this lamp emit?",
+                "nl": "Wat voor kleur licht geeft deze lantaarn?"
+            },
+            "render": {
+                "en": "This lamp emits {light:colour} light",
+                "nl": "Deze lantaarn geeft {light:colour} licht"
+            },
+            "freeform": {
+                "key": "light:colour",
+                "type": "color"
+            },
+            "mappings": [
+                {
+                    "if": "light:colour=white",
+                    "then": {
+                        "en": "This lamp emits white light",
+                        "nl": "Deze lantaarn geeft wit licht"
+                    }
+                },
+                {
+                    "if": "light:colour=green",
+                    "then": {
+                        "en": "This lamp emits green light",
+                        "nl": "Deze lantaarn geeft groen licht"
+                    }
+                },
+                {
+                    "if": "light:colour=orange",
+                    "then": {
+                        "en": "This lamp emits orange light",
+                        "nl": "Deze lantaarn geeft oranje licht"
+                    }
+                }
+            ]
+        },
+        {
+            "id": "count",
+            "render": {
+                "en": "This lamp has {light:count} fixtures",
+                "nl": "Deze lantaarn heeft {light:count} lampen"
+            },
+            "question": {
+                "en": "How many fixtures does this light have?",
+                "nl": "Hoeveel lampen heeft deze lantaarn?"
+            },
+            "condition": "support=pole",
+            "freeform": {
+                "key": "light:count",
+                "type": "pnat"
+            },
+            "mappings": [
+                {
+                    "if": "light:count=1",
+                    "then": {
+                        "en": "This lamp has 1 fixture",
+                        "nl": "Deze lantaarn heeft 1 lamp"
+                    }
+                },
+                {
+                    "if": "light:count=2",
+                    "then": {
+                        "en": "This lamp has 2 fixtures",
+                        "nl": "Deze lantaarn heeft 2 lampen"
+                    }
+                }
+            ]
+        },
+        {
+            "id": "lit",
+            "question": {
+                "en": "When is this lamp lit?",
+                "nl": "Wanneer is deze lantaarn verlicht?"
+            },
+            "mappings": [
+                {
+                    "if": "light:lit=dusk-dawn",
+                    "then": {
+                        "en": "This lamp is lit at night",
+                        "nl": "Deze lantaarn is 's nachts verlicht"
+                    }
+                },
+                {
+                    "if": "light:lit=24/7",
+                    "then": {
+                        "en": "This lamp is lit 24/7",
+                        "nl": "Deze lantaarn is 24/7 verlicht"
+                    }
+                },
+                {
+                    "if": "light:lit=motion",
+                    "then": {
+                        "en": "This lamp is lit based on motion",
+                        "nl": "Deze lantaarn is verlicht op basis van beweging"
+                    }
+                },
+                {
+                    "if": "light:lit=demand",
+                    "then": {
+                        "en": "This lamp is lit based on demand (e.g. with a pushbutton)",
+                        "nl": "Deze lantaarn is verlicht op verzoek (bijv. met een drukknop)"
+                    }
+                }
+            ]
+        },
+        {
+            "id": "direction",
+            "render": {
+                "en": "This lamp points towards {light:direction}",
+                "nl": "Deze lantaarn is gericht naar {light:direction}"
+            },
+            "question": {
+                "en": "Where does this lamp point to?",
+                "nl": "Waar is deze lamp heengericht?"
+            },
+            "condition": "light:count=1",
+            "freeform": {
+                "key": "light:direction",
+                "type": "direction"
+            }
+        }
+    ],
+    "deletion": true,
+    "allowMove": {
+        "enableImproveAccuracy": true,
+        "enableRelocation": false
+    }
+}

assets/layers/surveillance_camera/surveillance_camera.json

@@ -181,8 +181,7 @@
                         "en": "A public area is surveilled, such as a street, a bridge, a square, a park, a train station, a public corridor or tunnel,...",
                         "nl": "Bewaking van de publieke ruilmte, dus een straat, een brug, een park, een plein, een stationsgebouw, een publiek toegankelijke gang of tunnel...",
                         "fr": "Une zone publique est surveillée, telle qu'une rue, un pont, une place, un parc, une gare, un couloir ou un tunnel public…",
-                        "it": "Sorveglia un'area pubblica, come una strada, un ponte, una piazza, un parco, una stazione, un passaggio o un sottopasso pubblico, ...",
-                        "de": "Überwacht wird ein öffentlicher Bereich, z. B. eine Straße, eine Brücke, ein Platz, ein Park, ein Bahnhof, ein öffentlicher Korridor oder Tunnel,..."
+                        "it": "Sorveglia un'area pubblica, come una strada, un ponte, una piazza, un parco, una stazione, un passaggio o un sottopasso pubblico, ..."
                     }
                 },
                 {
@@ -512,5 +511,65 @@
             "title": "Surveillance camera"
         }
     ],
-    "wayHandling": 2
+    "wayHandling": 2,
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/themes/surveillance/logo.svg",
+                "mappings": [
+                    {
+                        "if": "camera:type=dome",
+                        "then": "./assets/themes/surveillance/dome.svg"
+                    },
+                    {
+                        "if": "_direction:leftright=right",
+                        "then": "./assets/themes/surveillance/cam_right.svg"
+                    },
+                    {
+                        "if": "_direction:leftright=left",
+                        "then": "./assets/themes/surveillance/cam_left.svg"
+                    }
+                ]
+            },
+            "iconSize": {
+                "mappings": [
+                    {
+                        "if": "camera:type=dome",
+                        "then": "50,50,center"
+                    },
+                    {
+                        "if": "_direction:leftright~*",
+                        "then": "100,35,center"
+                    }
+                ],
+                "render": "50,50,center"
+            },
+            "location": [
+                "point",
+                "centroid"
+            ],
+            "rotation": {
+                "#": "Note: {camera:direction} is substituted by a number, giving the string 'calc(123deg + 90deg)'  ; it is this string that is used as css property, which interprets the calc",
+                "render": "calc({_direction:numerical}deg + 90deg)",
+                "mappings": [
+                    {
+                        "if": "camera:type=dome",
+                        "then": "0"
+                    },
+                    {
+                        "if": "_direction:leftright=right",
+                        "then": "calc({_direction:numerical}deg - 90deg)"
+                    }
+                ]
+            }
+        },
+        {
+            "color": {
+                "render": "#f00"
+            },
+            "width": {
+                "render": "8"
+            }
+        }
+    ]
 }

assets/layers/toilet/toilet.json

@@ -412,24 +412,21 @@
             "id": "toilet-handwashing",
             "question": {
                 "en": "Do these toilets have a sink to wash your hands?",
-                "nl": "Hebben deze toiletten een lavabo om de handen te wassen?",
-                "de": "Verfügt diese Toilette über ein Waschbecken?"
+                "nl": "Hebben deze toiletten een lavabo om de handen te wassen?"
             },
             "mappings": [
                 {
                     "if": "toilets:handwashing=yes",
                     "then": {
                         "en": "This toilets have a sink to wash your hands",
-                        "nl": "Deze toiletten hebben een lavabo waar men de handen kan wassen",
-                        "de": "Diese Toilette verfügt über ein Waschbecken"
+                        "nl": "Deze toiletten hebben een lavabo waar men de handen kan wassen"
                     }
                 },
                 {
                     "if": "toilets:handwashing=no",
                     "then": {
                         "en": "This toilets <b>don't</b> have a sink to wash your hands",
-                        "nl": "Deze toiletten hebben <b>geen</b> lavabo waar men de handen kan wassen",
-                        "de": "Diese Toilette verfügt über <b>kein</b> Waschbecken"
+                        "nl": "Deze toiletten hebben <b>geen</b> lavabo waar men de handen kan wassen"
                     }
                 }
             ]
@@ -438,8 +435,7 @@
             "id": "toilet-has-paper",
             "question": {
                 "en": "Does one have to bring their own toilet paper to this toilet?",
-                "nl": "Moet je je eigen toiletpappier meenemen naar deze toilet?",
-                "de": "Muss man für diese Toilette sein eigenes Toilettenpapier mitbringen?"
+                "nl": "Moet je je eigen toiletpappier meenemen naar deze toilet?"
             },
             "mappings": [
                 {
@@ -453,8 +449,7 @@
                     "if": "toilets:paper_supplied=no",
                     "then": {
                         "en": "You have to bring your own toilet paper to this toilet",
-                        "nl": "Je moet je eigen toiletpapier meebrengen naar deze toilet",
-                        "de": "Für diese Toilette müssen Sie Ihr eigenes Toilettenpapier mitbringen"
+                        "nl": "Je moet je eigen toiletpapier meebrengen naar deze toilet"
                     }
                 }
             ]
@@ -519,5 +514,30 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/toilet/toilets.svg",
+                "mappings": [
+                    {
+                        "if": "wheelchair=yes",
+                        "then": "circle:white;./assets/layers/toilet/wheelchair.svg"
+                    },
+                    {
+                        "if": {
+                            "or": [
+                                "toilets:position=urinals",
+                                "toilets:position=urinal"
+                            ]
+                        },
+                        "then": "./assets/layers/toilet/urinal.svg"
+                    }
+                ]
+            },
+            "location": [
+                "point"
+            ]
+        }
+    ]
 }

assets/layers/trail/trail.json

@@ -40,8 +40,7 @@
             "id": "trail-length",
             "render": {
                 "en": "The trail is {_length:km} kilometers long",
-                "nl": "Deze wandeling is {_length:km} kilometer lang",
-                "de": "Der Wanderweg ist {_length:km} Kilometer lang"
+                "nl": "Deze wandeling is {_length:km} kilometer lang"
             }
         },
         {
@@ -107,32 +106,28 @@
                     "if": "colour=blue",
                     "then": {
                         "nl": "Blauwe wandeling",
-                        "en": "Blue trail",
-                        "de": "Blauer Weg"
+                        "en": "Blue trail"
                     }
                 },
                 {
                     "if": "colour=red",
                     "then": {
                         "nl": "Rode wandeling",
-                        "en": "Red trail",
-                        "de": "Roter Weg"
+                        "en": "Red trail"
                     }
                 },
                 {
                     "if": "colour=green",
                     "then": {
                         "nl": "Groene wandeling",
-                        "en": "Green trail",
-                        "de": "Grüner Weg"
+                        "en": "Green trail"
                     }
                 },
                 {
                     "if": "colour=yellow",
                     "then": {
                         "nl": "Gele wandeling",
-                        "en": "Yellow trail",
-                        "de": "Gelber Weg"
+                        "en": "Yellow trail"
                     }
                 }
             ],
@@ -213,5 +208,45 @@
     },
     "dashArray": {
         "render": "5 5"
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/trail/trail.svg",
+                "mappings": [
+                    {
+                        "if": "wheelchair=yes",
+                        "then": "./assets/layers/trail/wheelchair.svg"
+                    },
+                    {
+                        "if": "pushchair=yes",
+                        "then": "./assets/layers/trail/pushchair.svg"
+                    }
+                ]
+            },
+            "iconSize": {
+                "render": "35,35,center"
+            },
+            "location": [
+                "point"
+            ]
+        },
+        {
+            "color": {
+                "render": "#335D9F",
+                "mappings": [
+                    {
+                        "if": "colour~*",
+                        "then": "{colour}"
+                    }
+                ]
+            },
+            "width": {
+                "render": "3"
+            },
+            "dashArray": {
+                "render": "5 5"
+            }
+        }
+    ]
 }

assets/layers/tree_node/tree_node.json

@@ -406,8 +406,7 @@
                         "nl": "Erkend als erfgoed door een andere organisatie",
                         "en": "Registered as heritage by a different organisation",
                         "it": "Registrato come patrimonio da un’organizzazione differente",
-                        "fr": "Enregistré comme patrimoine par une autre organisation",
-                        "de": "Von einer anderen Organisation als Denkmal registriert"
+                        "fr": "Enregistré comme patrimoine par une autre organisation"
                     }
                 },
                 {
@@ -435,8 +434,7 @@
                         "nl": "Erkend als erfgoed door een andere organisatie",
                         "en": "Registered as heritage by a different organisation",
                         "it": "Registrato come patrimonio da un’organizzazione differente",
-                        "fr": "Enregistré comme patrimoine par une autre organisation",
-                        "de": "Von einer anderen Organisation als Denkmal registriert"
+                        "fr": "Enregistré comme patrimoine par une autre organisation"
                     },
                     "hideInAnswer": true
                 }
@@ -454,8 +452,7 @@
                 "en": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
                 "it": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
                 "ru": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Onroerend Erfgoed ID: <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
-                "fr": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Identifiant Onroerend Erfgoed : <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>",
-                "de": ""
+                "fr": "<img src=\"./assets/layers/tree_node/Onroerend_Erfgoed_logo_without_text.svg\" style=\"width:0.85em;height:1em;vertical-align:middle\" alt=\"\"/> Identifiant Onroerend Erfgoed : <a href=\"https://id.erfgoed.net/erfgoedobjecten/{ref:OnroerendErfgoed}\">{ref:OnroerendErfgoed}</a>"
             },
             "question": {
                 "nl": "Wat is het ID uitgegeven door Onroerend Erfgoed Vlaanderen?",
@@ -618,5 +615,36 @@
     },
     "deletion": {
         "minNeededChangesets": 5
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "circle:#ffffff;./assets/themes/trees/unknown.svg",
+                "mappings": [
+                    {
+                        "if": {
+                            "and": [
+                                "leaf_type=broadleaved"
+                            ]
+                        },
+                        "then": "circle:#ffffff;./assets/themes/trees/broadleaved.svg"
+                    },
+                    {
+                        "if": {
+                            "and": [
+                                "leaf_type=needleleaved"
+                            ]
+                        },
+                        "then": "circle:#ffffff;./assets/themes/trees/needleleaved.svg"
+                    }
+                ]
+            },
+            "iconSize": {
+                "render": "40,40,bottom"
+            },
+            "location": [
+                "point"
+            ]
+        }
+    ]
 }

assets/layers/type_node/type_node.json

@@ -0,0 +1,12 @@
+{
+    "id": "type_node",
+    "description": "This is a special meta_layer which exports _every_ point in OSM. This only works if zoomed below the point that the full tile is loaded (and not loaded via Overpass). Note that this point will also contain a property `parent_ways` which contains all the ways this node is part of as a list",
+    "minzoom": 18,
+    "source": {
+        "osmTags": "id~node/.*"
+    },
+    "mapRendering": [],
+    "name": "All OSM Nodes",
+    "title": "OSM node {id}",
+    "tagRendering": []
+}

assets/layers/viewpoint/viewpoint.json

@@ -72,5 +72,18 @@
             },
             "id": "viewpoint-description"
         }
+    ],
+    "mapRendering": [
+        {
+            "icon": "./assets/layers/viewpoint/viewpoint.svg",
+            "iconSize": "20,20,center",
+            "location": [
+                "point"
+            ]
+        },
+        {
+            "color": "#ffffff",
+            "width": "5"
+        }
     ]
 }

assets/layers/village_green/village_green.json

@@ -35,5 +35,19 @@
             "id": "village_green-reviews",
             "render": "{reviews(name, landuse=village_green )}"
         }
+    ],
+    "mapRendering": [
+        {
+            "icon": "./assets/themes/playgrounds/playground.svg",
+            "iconSize": "40,40,center",
+            "location": [
+                "point",
+                "centroid"
+            ]
+        },
+        {
+            "color": "#937f20",
+            "width": "1"
+        }
     ]
 }

assets/layers/visitor_information_centre/visitor_information_centre.json

@@ -69,5 +69,18 @@
         "render": "#E64C00"
     },
     "presets": [],
-    "wayHandling": 1
+    "wayHandling": 1,
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/visitor_information_centre/information.svg"
+            },
+            "iconSize": {
+                "render": "40,40,center"
+            },
+            "location": [
+                "point"
+            ]
+        }
+    ]
 }

assets/layers/waste_basket/waste_basket.json

@@ -83,8 +83,7 @@
                     "if": "waste=sharps",
                     "then": {
                         "en": "A waste basket for needles and other sharp objects",
-                        "nl": "Een vuilnisbak voor injectienaalden en andere scherpe voorwerpen",
-                        "de": "Ein Abfalleimer für Nadeln und andere scharfe Gegenstände"
+                        "nl": "Een vuilnisbak voor injectienaalden en andere scherpe voorwerpen"
                     }
                 }
             ]
@@ -126,7 +125,7 @@
                     },
                     "then": {
                         "en": "This waste basket <b>does not</b> have a dispenser for (dog) excrement bags",
-                        "nl": "Deze vuilbak heeft <b>geen</b> verdeler voor hondenpoepzakjes",
+                        "nl": "Deze vuilnisbak heeft <i>geen</i>verdeler voor hondenpoepzakjes",
                         "de": "Dieser Abfalleimer <b>hat keinen</b> Spender für (Hunde-)Kotbeutel"
                     }
                 },
@@ -134,7 +133,7 @@
                     "if": "vending=",
                     "then": {
                         "en": "This waste basket <b>does not</b> have a dispenser for (dog) excrement bags",
-                        "nl": "Deze vuilnisbak heeft <b>geen</b> verdeler voor hondenpoepzakjes",
+                        "nl": "Deze vuilnisbaak heeft waarschijnlijk geen verdeler voor hondenpoepzakjes",
                         "de": "Dieser Abfalleimer <b>hat keinen</b> Spender für (Hunde-)Kotbeutel"
                     },
                     "hideInAnwer": true
@@ -199,5 +198,41 @@
     "allowMove": {
         "enableRelocation": false,
         "enableImproveAccuraccy": true
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/themes/waste_basket/waste_basket.svg"
+            },
+            "iconSize": {
+                "render": "40,40,center",
+                "mappings": [
+                    {
+                        "if": {
+                            "and": [
+                                "amenity=waste_basket"
+                            ]
+                        },
+                        "then": {
+                            "en": "Waste Basket",
+                            "nl": "Vuilnisbak",
+                            "ru": "Контейнер для мусора",
+                            "de": "Abfalleimer"
+                        }
+                    }
+                ]
+            },
+            "location": [
+                "point"
+            ]
+        },
+        {
+            "color": {
+                "render": "#00f"
+            },
+            "width": {
+                "render": "8"
+            }
+        }
+    ]
 }

assets/layers/watermill/watermill.json

@@ -171,5 +171,18 @@
     },
     "color": {
         "render": "#FFC0CB"
-    }
+    },
+    "mapRendering": [
+        {
+            "icon": {
+                "render": "./assets/layers/watermill/watermill.svg"
+            },
+            "iconSize": {
+                "render": "50,50,center"
+            },
+            "location": [
+                "point"
+            ]
+        }
+    ]
 }

assets/svg/liberapay.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 80"><g transform="matrix(.83012 0 0 .83012-135.4-247.7)"><path d="m259.55 385.57c0 5.145-4.169 9.318-9.318 9.318h-77.74c-5.144 0-9.318-4.174-9.318-9.318v-77.74c0-5.145 4.174-9.318 9.318-9.318h77.74c5.149 0 9.318 4.173 9.318 9.318v77.74" fill="#f6c915"/><g fill="#fff"><path d="m202.45 366.03c-3.104 0-5.541-.405-7.311-1.213-1.77-.809-3.039-1.912-3.803-3.313-.766-1.398-1.137-3-1.115-4.818.021-1.814.272-3.748.754-5.803l8.327-34.817 10.164-1.573-9.114 37.768c-.175.786-.273 1.508-.295 2.163-.023.655.098 1.235.36 1.737.262.504.71.908 1.344 1.213.633.307 1.519.504 2.656.591l-1.967 8.06"/><path d="m239.16 344.33c0 3.19-.525 6.108-1.574 8.753-1.049 2.646-2.503 4.929-4.36 6.852-1.858 1.925-4.087 3.421-6.688 4.491-2.601 1.07-5.432 1.607-8.49 1.607-1.487 0-2.973-.132-4.459-.395l-2.951 11.869h-9.704l10.884-45.37c1.748-.524 3.748-.994 5.999-1.41 2.252-.415 4.689-.622 7.312-.622 2.448 0 4.558.371 6.327 1.114 1.771.743 3.224 1.76 4.361 3.049 1.136 1.29 1.977 2.798 2.523 4.524.546 1.726.82 3.574.82 5.542m-23.802 13.442c.743.175 1.661.262 2.754.262 1.704 0 3.256-.316 4.655-.951 1.398-.633 2.59-1.518 3.574-2.655.982-1.136 1.747-2.501 2.294-4.098.546-1.595.819-3.354.819-5.278 0-1.879-.416-3.475-1.245-4.787-.831-1.311-2.273-1.967-4.327-1.967-1.4 0-2.711.131-3.935.394l-4.589 19.08"/></g></g></svg>

assets/svg/license_info.json

@@ -879,6 +879,16 @@
     ],
     "sources": []
   },
+  {
+    "path": "liberapay.svg",
+    "license": "Logo (all rights reserved)",
+    "authors": [
+      "LiberaPay"
+    ],
+    "sources": [
+      "https://liberapay.com/"
+    ]
+  },
   {
     "path": "loading.svg",
     "license": "CC0; trivial",
@@ -1411,6 +1421,26 @@
       "https://www.onlinewebfonts.com/icon/197818"
     ]
   },
+  {
+    "path": "teardrop.svg",
+    "license": "CC-BY-SA 3.0 Unported",
+    "authors": [
+      "Mono, derivated work User:Benoit Rochon"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Map_pin_icon_green.svg"
+    ]
+  },
+  {
+    "path": "teardrop_with_hole_green.svg",
+    "license": "CC-BY-SA 3.0 Unported",
+    "authors": [
+      "Mono, derivated work User:Benoit Rochon"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Map_pin_icon_green.svg"
+    ]
+  },
   {
     "path": "translate.svg",
     "license": "CC-BY-SA 3.0",

assets/svg/teardrop.svg

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   width="94"
+   height="128"
+   sodipodi:docname="teardrop.svg">
+  <metadata
+     id="metadata2822">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2820">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective2824" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1003"
+     id="namedview2818"
+     showgrid="false"
+     inkscape:zoom="3.0991164"
+     inkscape:cx="-71.403124"
+     inkscape:cy="60.493358"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2816" />
+  <path
+     style="fill:#000000;fill-opacity:0.98823529"
+     d="M 46.977003,126.64334 C 46.693972,125.95584 40.813862,120.20567 36.603071,114.98067 11.655836,81.858372 -16.158365,51.082905 16.319943,13.682837 30.700637,-0.21083367 48.43303,-1.0034227 66.662563,5.4726973 117.9922,35.174601 80.828906,83.627914 56.427079,115.48067 l -9.450076,11.16267 z M 62.417383,75.872046 C 96.654166,51.387445 70.185413,4.2391813 32.569429,19.913013 21.585178,25.769872 16.134954,35.960547 15.944071,47.980664 c -0.524495,11.693153 5.685418,21.471037 15.526227,27.460808 7.055481,3.840074 10.157178,4.533661 18.145697,4.057654 5.177622,-0.308516 8.161127,-1.153847 12.801388,-3.62708 z"
+     id="path4127"
+     sodipodi:nodetypes="ccccccccccsc" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#000000;fill-opacity:0.98823529;fill-rule:nonzero;stroke:none"
+     id="path4129"
+     sodipodi:cx="52.363636"
+     sodipodi:cy="49.05526"
+     sodipodi:rx="51.222816"
+     sodipodi:ry="41.754009"
+     d="m 41.682107,89.891342 a 51.222816,41.754009 0 1 1 1.276617,0.208091"
+     sodipodi:start="1.7808687"
+     sodipodi:end="8.0386371"
+     sodipodi:open="true"
+     transform="matrix(0.87829487,0,0,1.0519028,0.55474126,-6.9952658)" />
+  <path
+     sodipodi:type="arc"
+     style="opacity:0.34016395;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none"
+     id="path4131"
+     sodipodi:cx="49.05526"
+     sodipodi:cy="48.59893"
+     sodipodi:rx="26.010695"
+     sodipodi:ry="20.991087"
+     d="m 43.631232,69.128546 a 26.010695,20.991087 0 1 1 0.64826,0.104614"
+     sodipodi:start="1.7808687"
+     sodipodi:end="8.0386371"
+     sodipodi:open="true"
+     transform="translate(0.64534523,0)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#000080;fill-opacity:0;fill-rule:nonzero;stroke:none"
+     id="path4135"
+     sodipodi:cx="35.365417"
+     sodipodi:cy="102.78788"
+     sodipodi:rx="16.655972"
+     sodipodi:ry="11.750445"
+     d="m 31.892136,114.28 a 16.655972,11.750445 0 1 1 0.415114,0.0586"
+     sodipodi:start="1.7808687"
+     sodipodi:end="8.0386371"
+     sodipodi:open="true"
+     transform="translate(0.64534523,0)" />
+</svg>

assets/svg/teardrop_with_hole_green.svg

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2816"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   width="94"
+   height="128"
+   sodipodi:docname="Map_pin_icon_green.svg">
+  <metadata
+     id="metadata2822">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs2820">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective2824" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview2818"
+     showgrid="false"
+     inkscape:zoom="3.0991164"
+     inkscape:cx="-5.0939007"
+     inkscape:cy="60.493358"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2816" />
+  <path
+     style="fill:#008000;fill-opacity:0.98823529"
+     d="M 46.977003,126.64334 C 46.693972,125.95584 40.813862,120.20567 36.603071,114.98067 11.655836,81.858372 -16.158365,51.082905 16.319943,13.682837 30.700637,-0.21083367 48.43303,-1.0034227 66.662563,5.4726973 117.9922,35.174601 80.828906,83.627914 56.427079,115.48067 l -9.450076,11.16267 z M 62.417383,75.872046 C 96.654166,51.387445 70.185413,4.2391813 32.569429,19.913013 21.585178,25.769872 16.134954,35.960547 15.944071,47.980664 c -0.524495,11.693153 5.685418,21.471037 15.526227,27.460808 7.055481,3.840074 10.157178,4.533661 18.145697,4.057654 5.177622,-0.308516 8.161127,-1.153847 12.801388,-3.62708 z"
+     id="path4127"
+     sodipodi:nodetypes="ccccccccccsc" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#008000;fill-opacity:0.98823529;fill-rule:nonzero;stroke:none"
+     id="path4129"
+     sodipodi:cx="52.363636"
+     sodipodi:cy="49.05526"
+     sodipodi:rx="51.222816"
+     sodipodi:ry="41.754009"
+     d="m 41.682107,89.891342 a 51.222816,41.754009 0 1 1 1.276617,0.208091"
+     sodipodi:start="1.7808687"
+     sodipodi:end="8.0386371"
+     sodipodi:open="true"
+     transform="matrix(0.87829487,0,0,1.0519028,0.55474126,-6.9952658)" />
+  <path
+     sodipodi:type="arc"
+     style="opacity:0.34016395;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:none"
+     id="path4131"
+     sodipodi:cx="49.05526"
+     sodipodi:cy="48.59893"
+     sodipodi:rx="26.010695"
+     sodipodi:ry="20.991087"
+     d="m 43.631232,69.128546 a 26.010695,20.991087 0 1 1 0.64826,0.104614"
+     sodipodi:start="1.7808687"
+     sodipodi:end="8.0386371"
+     sodipodi:open="true"
+     transform="translate(0.64534523,0)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#000080;fill-opacity:0;fill-rule:nonzero;stroke:none"
+     id="path4135"
+     sodipodi:cx="35.365417"
+     sodipodi:cy="102.78788"
+     sodipodi:rx="16.655972"
+     sodipodi:ry="11.750445"
+     d="m 31.892136,114.28 a 16.655972,11.750445 0 1 1 0.415114,0.0586"
+     sodipodi:start="1.7808687"
+     sodipodi:end="8.0386371"
+     sodipodi:open="true"
+     transform="translate(0.64534523,0)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#009400;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path4149"
+     sodipodi:cx="52.705883"
+     sodipodi:cy="52.021389"
+     sodipodi:rx="34.452763"
+     sodipodi:ry="33.540108"
+     d="m 45.521425,84.824145 a 34.452763,33.540108 0 1 1 0.85866,0.167155"
+     sodipodi:start="1.7808687"
+     sodipodi:end="8.0386371"
+     sodipodi:open="true"
+     transform="matrix(0.97020484,0,0,1.0272058,-4.0587829,-5.7503824)" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path4184"
+     sodipodi:cx="64.211853"
+     sodipodi:cy="68.789574"
+     sodipodi:rx="34.203297"
+     sodipodi:ry="36.623341"
+     d="m 57.079416,104.60778 a 34.203297,36.623341 0 1 1 0.852443,0.18252"
+     sodipodi:start="1.7808687"
+     sodipodi:end="8.0386371"
+     sodipodi:open="true"
+     transform="matrix(0.64629924,0,0,0.61681122,5.1261236,4.9013803)" />
+</svg>

assets/themes/aed/aed.json

@@ -13,7 +13,7 @@
     "ru": "Открытая карта АВД (Автоматизированных внешних дефибрилляторов)",
     "ja": "オープンAEDマップ",
     "zh_Hant": "開放AED地圖",
-    "nb_NO": "Åpent AED-kart",
+    "nb_NO": "Åpne AED-kart",
     "sv": "Öppna AED-karta",
     "pl": "Otwórz mapę AED",
     "pt_BR": "Abrir mapa AED"

assets/themes/aed/aed_brugge.json

@@ -15,9 +15,6 @@
   "startLat": 51.25634,
   "startLon": 3.195682,
   "startZoom": 12,
-  "clustering": {
-    "maxZoom": 0
-  },
   "layers": [
     "defibrillator",
     {
@@ -45,9 +42,30 @@
       "iconSize": "20,20,center",
       "tagRenderings": [
         "all_tags"
+      ],
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "circle:red",
+            "mappings": [
+              {
+                "if": "_has_closeby_feature=yes",
+                "then": "circle:#008000aa"
+              }
+            ]
+          },
+          "iconSize": "20,20,center",
+          "location": [
+            "point"
+          ]
+        },
+        {}
       ]
     }
   ],
   "hideFromOverview": true,
-  "defaultBackgroundId": "HDM_HOT"
+  "defaultBackgroundId": "HDM_HOT",
+  "clustering": {
+    "maxZoom": 0
+  }
 }

assets/themes/artwork/artwork.json

@@ -19,7 +19,7 @@
     "en": "Welcome to Open Artwork Map, a map of statues, busts, grafittis and other artwork all over the world",
     "nl": "Welkom op de open kunstwerken-kaart, een kaart van standbeelden, bustes, graffiti en andere kunstwerken over de hele wereld",
     "fr": "Bienvenue sur la carte ouverte des œuvres d'art, une carte des statues, fresques, ... du monde entier",
-    "de": "Willkommen bei der Freien Kunstwerk-Karte, einer Karte von Statuen, Büsten, Grafitti, ... auf der ganzen Welt",
+    "de": "Willkommen bei der Freien Kunst-Karte, einer Karte mit Statuen, Büsten, Grafitti, ... auf der ganzen Welt",
     "id": "Selamat datang di Open Artwork Map, peta untuk patung, grafiti, dan karya seni lain di seluruh dunia",
     "it": "Benvenuto/a sulla mappa libera dell’arte, una mappa delle statue, i busti, i graffiti e le altre realizzazioni artistiche di tutto il mondo",
     "ru": "Добро пожаловать на Open Artwork Map, карту статуй, бюстов, граффити и других произведений искусства по всему миру",

assets/themes/bookcases/bookcases.json

@@ -29,7 +29,7 @@
   "description": {
     "en": "A public bookcase is a small streetside cabinet, box, old phone boot or some other objects where books are stored. Everyone can place or take a book. This map aims to collect all these bookcases. You can discover new bookcases nearby and, with a free OpenStreetMap account, quickly add your favourite bookcases.",
     "nl": "Een boekenruilkast is een kastje waar iedereen een boek kan nemen of achterlaten. Op deze kaart kan je deze boekenruilkasten terugvinden en met een gratis OpenStreetMap-account, ook boekenruilkasten toevoegen of informatie verbeteren",
-    "de": "Ein Bücherschrank ist ein kleiner Schaltschrank, eine alte Telefonzelle oder eine andere Einrichtung, in der Bücher aufbewahrt werden. Jeder kann ein Buch hinstellen oder mitnehmen. Diese Karte zielt darauf ab, alle Orte mit Bücherschränken zu sammeln. Sie können neue Bücherschränke in der Nähe entdecken und mit einem kostenlosen OpenStreetMap-Konto schnell Ihre Lieblingsbücherschränke hinzufügen.",
+    "de": "Bücherschränke sind alte Schaltschränke, Telefonzellen oder andere Einrichtungen, zur Aufbewahrung von Büchern. Jeder kann Bücher abstellen oder mitnehmen. Die Karte zielt darauf ab, alle Orte mit Bücherschränken zu sammeln. Sie können neue Bücherschränke in der Nähe entdecken und mit einem kostenlosen OpenStreetMap-Konto schnell Ihre Lieblingsbücherschränke hinzufügen.",
     "fr": "Une microbibliothèques, également appelée boite à livre, est un élément de mobilier urbain (étagère, armoire, etc) dans lequel sont stockés des livres et autres objets en accès libre. Découvrez les boites à livres prêt de chez vous, ou ajouter en une nouvelle à l'aide de votre compte OpenStreetMap.",
     "ru": "Общественный книжный шкаф - это небольшой уличный шкаф, коробка, старый телефонный аппарат или другие предметы, где хранятся книги. Каждый может положить или взять книгу. Цель этой карты - собрать все эти книжные шкафы. Вы можете обнаружить новые книжные шкафы поблизости и, имея бесплатный аккаунт OpenStreetMap, быстро добавить свои любимые книжные шкафы.",
     "ja": "公共の本棚とは、本が保管されている小さな街角のキャビネット、箱、古い電話のトランク、その他の物のことです。誰でも本を置いたり持ったりすることができます。このマップは、すべての公共の本棚を収集することを目的としています。近くで新しい本棚を見つけることができ、無料のOpenStreetMapアカウントを使えば、お気に入りの本棚を簡単に追加できます。",

assets/themes/buurtnatuur/buurtnatuur.json

@@ -123,6 +123,51 @@
             "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"
+          ]
+        },
+        {
+          "color": {
+            "render": "#3c3",
+            "mappings": [
+              {
+                "if": {
+                  "and": [
+                    "name=",
+                    "noname=",
+                    "operator=",
+                    "access=",
+                    "access:description=",
+                    "leisure=park"
+                  ]
+                },
+                "then": "#cc1100"
+              },
+              {
+                "if": {
+                  "and": [
+                    "name=",
+                    "noname="
+                  ]
+                },
+                "then": "#fccb37"
+              }
+            ]
+          },
+          "width": {
+            "render": "5"
+          }
+        }
       ]
     },
     {
@@ -221,6 +266,38 @@
             "nl": "Voeg een ontbrekend park toe"
           }
         }
+      ],
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "circle:#ffffff;./assets/themes/buurtnatuur/park.svg"
+          },
+          "iconSize": {
+            "render": "40,40,center"
+          },
+          "location": [
+            "point"
+          ]
+        },
+        {
+          "color": {
+            "render": "#3c3",
+            "mappings": [
+              {
+                "if": {
+                  "and": [
+                    "name=",
+                    "noname="
+                  ]
+                },
+                "then": "#fccb37"
+              }
+            ]
+          },
+          "width": {
+            "render": "5"
+          }
+        }
       ]
     },
     {
@@ -338,6 +415,56 @@
             "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"
+          ]
+        },
+        {
+          "color": {
+            "render": "#3a3",
+            "mappings": [
+              {
+                "if": {
+                  "and": [
+                    "operator=",
+                    "access=",
+                    "access:description="
+                  ]
+                },
+                "then": "#cc1100"
+              },
+              {
+                "if": {
+                  "and": [
+                    "operator="
+                  ]
+                },
+                "then": "#cccc00"
+              },
+              {
+                "if": {
+                  "and": [
+                    "name=",
+                    "noname="
+                  ]
+                },
+                "then": "#fccb37"
+              }
+            ]
+          },
+          "width": {
+            "render": "5"
+          }
+        }
       ]
     },
     "viewpoint"

assets/themes/campersite/campersite.json

@@ -180,8 +180,7 @@
                 "nl": "Gebruik is betalend",
                 "fr": "L’utilisation est payante",
                 "pt_BR": "Você precisa pagar para usar",
-                "de": "Sie müssen für die Nutzung bezahlen",
-                "nb_NO": "Man må betale for bruk"
+                "de": "Sie müssen für die Nutzung bezahlen"
               }
             },
             {
@@ -336,8 +335,7 @@
             "fr": "Cet endroit offre-t-il un accès à Internet ?",
             "zh_Hant": "這個地方有提網路連線嗎？",
             "pt_BR": "Este lugar fornece acesso a internet?",
-            "de": "Ist an diesem Ort ein Internetzugang vorhanden?",
-            "nb_NO": "Tilbyr dette stedet tilgang til Internett?"
+            "de": "Ist an diesem Ort ein Internetzugang vorhanden?"
           },
           "mappings": [
             {
@@ -356,8 +354,7 @@
                 "fr": "Il y a un accès internet",
                 "pt_BR": "Há acesso à internet",
                 "de": "Internetzugang ist vorhanden",
-                "nl": "Er is internettoegang",
-                "nb_NO": "Det finnes tilgang til Internett"
+                "nl": "Er is internettoegang"
               }
             },
             {
@@ -377,8 +374,7 @@
                 "fr": "Il y a un accès internet",
                 "pt_BR": "Há acesso à Internet",
                 "de": "Internetzugang ist vorhanden",
-                "nl": "Er is internettoegang",
-                "nb_NO": "Det er tilgang til Internett"
+                "nl": "Er is internettoegang"
               },
               "hideInAnswer": true
             },
@@ -397,8 +393,7 @@
                 "zh_Hant": "這裡沒有網路連線",
                 "fr": "Il n’y a pas d’accès internet",
                 "pt_BR": "Não há acesso à internet",
-                "de": "Kein Internetzugang vorhanden",
-                "nb_NO": "Det er tilgang til Internett"
+                "de": "Kein Internetzugang vorhanden"
               }
             }
           ]
@@ -413,8 +408,7 @@
             "zh_Hant": "你需要為網路連線付費嗎？",
             "fr": "L’accès internet est-il payant ?",
             "pt_BR": "Você tem que pagar pelo acesso à internet?",
-            "de": "Ist der Internetzugang gebührenpflichtig?",
-            "nb_NO": "Må man betale for tilgang til Internett?"
+            "de": "Ist der Internetzugang gebührenpflichtig?"
           },
           "mappings": [
             {
@@ -431,8 +425,7 @@
                 "zh_Hant": "你需要額外付費來使用網路連線",
                 "fr": "L’accès internet est en supplément",
                 "pt_BR": "Você precisa pagar um extra pelo acesso à internet",
-                "de": "Der Internetzugang ist gebührenpflichtig",
-                "nb_NO": "Man må betale ekstra for tilgang til Internett"
+                "de": "Der Internetzugang ist gebührenpflichtig"
               }
             },
             {
@@ -449,8 +442,7 @@
                 "zh_Hant": "你不需要額外付費來使用網路連線",
                 "fr": "L’accès internet est inclus",
                 "pt_BR": "Você não precisa pagar um extra pelo acesso à internet",
-                "de": "Der Internetzugang ist kostenlos",
-                "nb_NO": "Man må ikke betale ekstra for tilgang til Internett"
+                "de": "Der Internetzugang ist kostenlos"
               }
             }
           ],
@@ -643,28 +635,6 @@
         "questions",
         "reviews"
       ],
-      "icon": {
-        "render": "circle:white;./assets/themes/campersite/caravan.svg",
-        "mappings": [
-          {
-            "if": {
-              "and": [
-                "fee=no"
-              ]
-            },
-            "then": "circle:white;./assets/themes/campersite/caravan_green.svg"
-          }
-        ]
-      },
-      "width": {
-        "render": "8"
-      },
-      "iconSize": {
-        "render": "40,40,center"
-      },
-      "color": {
-        "render": "#00f"
-      },
       "presets": [
         {
           "tags": [
@@ -687,12 +657,43 @@
             "ja": "新しい公式キャンプサイトを追加します。お客様のキャンピングカーで一泊する指定の場所です。本物のキャンプのように見えるかもしれないし、単なる駐車場のように見えるかもしれない。それらは全く署名されていないかもしれませんが、自治体の決定で定義されているだけです。夜を過ごすことが予想されないキャンパー向けの通常の駐車場は、キャンプサイトではない ",
             "it": "Aggiungi una nuova area di sosta ufficiale per camper. Si tratta di aree destinate alla sosta notturna dei camper. Potrebbe trattarsi di luoghi di campeggio o semplici parcheggi. Potrebbero anche non essere segnalati sul posto, ma semplicemente indicati in una delibera comunale. Un parcheggio destinato ai camper in cui non è però consentito trascorrere la notte -non- va considerato un'area di sosta per camper. ",
             "fr": "Ajouter une nouvelle aire de camping officielle, destinée à y passer la nuit avec un camping-car. Elle ne nécessite pas d’infrastructures particulières et peut être simplement désignée sous arrêté municipal, un simple parking ne suffit pas à rentrer dans cette catégorie ",
-            "de": "Fügen Sie einen neuen offiziellen Wohnmobilstellplatz hinzu. Dies sind ausgewiesene Plätze, an denen Sie in Ihrem Wohnmobil übernachten können. Sie können wie ein richtiger Campingplatz oder nur wie ein Parkplatz aussehen. Möglicherweise sind sie gar nicht ausgeschildert, sondern nur in einem Gemeindebeschluss festgelegt. Ein normaler Parkplatz für Wohnmobile, auf dem Übernachten nicht zulässig ist, ist kein Wohnmobilstellplatz. ",
+            "de": "Fügen Sie einen neuen offiziellen Wohnmobilstellplatz hinzu. Dies sind ausgewiesene Plätze, an denen Sie in Ihrem Wohnmobil übernachten können. Sie können wie ein richtiger Campingplatz oder nur wie ein Parkplatz aussehen. Möglicherweise sind sie gar nicht ausgeschildert, sondern nur in einem Gemeindebeschluss festgelegt. Ein normaler Parkplatz für Wohnmobile, auf dem übernachten nicht zulässig ist, ist kein Wohnmobilstellplatz. ",
             "nl": "Voeg een nieuwe officiële camperplaats toe. Dit zijn speciaal aangeduide plaatsen waar het toegestaan is om te overnachten met een camper. Ze kunnen er uitzien als een parking, of soms eerder als een camping. Soms staan ze niet ter plaatse aangeduid, maar heeft de gemeente wel degelijk beslist  dat dit een camperplaats is. Een parking voor campers waar je niet mag overnachten is géén camperplaats. "
           }
         }
       ],
-      "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"
+          ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "8"
+          }
+        }
+      ]
     },
     {
       "id": "dumpstations",
@@ -1059,18 +1060,6 @@
           "id": "dumpstations-network"
         }
       ],
-      "icon": {
-        "render": "circle:white;./assets/themes/campersite/sanitary_dump_station.svg"
-      },
-      "width": {
-        "render": "8"
-      },
-      "iconSize": {
-        "render": "32,32,center"
-      },
-      "color": {
-        "render": "#00f"
-      },
       "presets": [
         {
           "tags": [
@@ -1091,6 +1080,27 @@
             "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"
+          ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "8"
+          }
+        }
       ]
     }
   ],

assets/themes/cycle_highways/cycle_highways.json

@@ -104,8 +104,7 @@
       ],
       "name": {
         "en": "cycle highways",
-        "de": "Radschnellwege",
-        "it": "strade per velocipedi"
+        "de": "Radschnellwege"
       },
       "source": {
         "osmTags": "cycle_network=BE-VLG:cycle_highway"
@@ -114,43 +113,9 @@
       "title": {
         "render": {
           "en": "cycle highway",
-          "de": "Radschnellweg",
-          "it": "strada per velocipedi"
+          "de": "Radschnellweg"
         }
       },
-      "width": {
-        "render": "4"
-      },
-      "color": {
-        "render": "#ff7392",
-        "mappings": [
-          {
-            "if": "state=",
-            "then": "#00acfc"
-          },
-          {
-            "if": "state=temporary",
-            "then": "#00acfc"
-          }
-        ]
-      },
-      "dashArray": {
-        "render": "",
-        "mappings": [
-          {
-            "if": "state=temporary",
-            "then": "12 10"
-          },
-          {
-            "if": "note:state=has_highway_no",
-            "then": "0 8"
-          },
-          {
-            "if": "note:state=has_highway_under_construction",
-            "then": "12 10"
-          }
-        ]
-      },
       "filter": [
         {
           "id": "name-alt",
@@ -238,6 +203,43 @@
             }
           ]
         }
+      ],
+      "mapRendering": [
+        {
+          "color": {
+            "render": "#ff7392",
+            "mappings": [
+              {
+                "if": "state=",
+                "then": "#00acfc"
+              },
+              {
+                "if": "state=temporary",
+                "then": "#00acfc"
+              }
+            ]
+          },
+          "width": {
+            "render": "4"
+          },
+          "dashArray": {
+            "render": "",
+            "mappings": [
+              {
+                "if": "state=temporary",
+                "then": "12 10"
+              },
+              {
+                "if": "note:state=has_highway_no",
+                "then": "0 8"
+              },
+              {
+                "if": "note:state=has_highway_under_construction",
+                "then": "12 10"
+              }
+            ]
+          }
+        }
       ]
     }
   ],

assets/themes/cyclestreets/cyclestreets.json

@@ -7,8 +7,8 @@
     "ja": "Cyclestreets",
     "zh_Hant": "單車街道",
     "de": "Fahrradstraßen",
-    "it": "Strade ciclabili",
-    "nb_NO": "Sykkelgater"
+    "nb_NO": "Sykkelgater",
+    "it": "Strade ciclabili"
   },
   "shortDescription": {
     "nl": "Een kaart met alle gekende fietsstraten",
@@ -21,7 +21,7 @@
   },
   "description": {
     "nl": "Een fietsstraat is een straat waar <ul><li><b>automobilisten geen fietsers mogen inhalen</b></li><li>Er een maximumsnelheid van <b>30km/u</b> geldt</li><li>Fietsers gemotoriseerde voertuigen links mogen inhalen</li><li>Fietsers nog steeds voorrang aan rechts moeten verlenen - ook aan auto's en voetgangers op het zebrapad</li></ul><br/><br/>Op deze open kaart kan je alle gekende fietsstraten zien en kan je ontbrekende fietsstraten aanduiden. Om de kaart aan te passen, moet je je aanmelden met OpenStreetMap en helemaal inzoomen tot straatniveau. ",
-    "en": "A cyclestreet is a street where <b>motorized traffic is not allowed to overtake cyclists</b>. They are signposted by a special traffic sign. Cyclestreets can be found in the Netherlands and Belgium, but also in Germany and France. ",
+    "en": "A cyclestreet is is a street where <b>motorized traffic is not allowed to overtake cyclists</b>. They are signposted by a special traffic sign. Cyclestreets can be found in the Netherlands and Belgium, but also in Germany and France. ",
     "ja": "cyclestreetとは、<b>自動車がサイクリストを追い越すことができない</b>道です。専用の道路標識で表示されます。Cyclestreetsはオランダやベルギーにもありますが、ドイツやフランスにもあります。 ",
     "zh_Hant": "單車街道是<b>機動車輛受限制，只允許單車通行</b>的道路。通常會有路標顯示特別的交通指標。單車街道通常在荷蘭、比利時看到，但德國與法國也有。 ",
     "de": "Eine Fahrradstraße ist eine Straße, auf der <b>motorisierter Verkehr Radfahrer nicht überholen darf</b>. Sie sind durch ein spezielles Verkehrsschild gekennzeichnet. Fahrradstraßen gibt es in den Niederlanden und Belgien, aber auch in Deutschland und Frankreich. ",
@@ -57,8 +57,7 @@
         "ja": "Cyclestreets",
         "zh_Hant": "單車街道",
         "it": "Strade ciclabili",
-        "de": "Fahrradstraßen",
-        "nb_NO": "Sykkelgater"
+        "de": "Fahrradstraßen"
       },
       "minzoom": 7,
       "source": {
@@ -85,11 +84,20 @@
         "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"
+          ]
+        },
+        {
+          "color": "#0000ff",
+          "width": "10"
+        }
       ]
     },
     {
@@ -108,11 +116,9 @@
         "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",
-        "nb_NO": "Denne gaten vil bli sykkelgate snart"
+        "de": "Diese Straße wird bald eine Fahrradstraße sein"
       },
       "minzoom": 9,
-      "wayHandling": 0,
       "source": {
         "osmTags": "proposed:cyclestreet=yes"
       },
@@ -132,18 +138,26 @@
               "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",
-              "nb_NO": "{name} vil bli sykkelgate snart"
+              "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"
+          ]
+        },
+        {
+          "color": "#09f9dd",
+          "width": "5"
+        }
       ]
     },
     {
@@ -176,7 +190,6 @@
         }
       },
       "minzoom": 18,
-      "wayHandling": 0,
       "title": {
         "render": {
           "nl": "Straat",
@@ -185,8 +198,7 @@
           "it": "Strada",
           "ru": "Улица",
           "de": "Straße",
-          "eo": "Strato",
-          "nb_NO": "Gate"
+          "eo": "Strato"
         },
         "mappings": [
           {
@@ -195,23 +207,32 @@
           }
         ]
       },
-      "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"
+          ]
+        },
+        {
+          "color": {
+            "render": "#aaaaaa",
+            "mappings": [
+              {
+                "then": "#0000ff",
+                "if": "cyclestreet=yes"
+              },
+              {
+                "then": "#09f9dd",
+                "if": "proposed:cyclestreet=yes"
+              }
+            ]
+          },
+          "width": "5"
+        }
       ]
     }
   ],
@@ -225,8 +246,7 @@
           "en": "Is this street a cyclestreet?",
           "ja": "この通りはcyclestreetですか?",
           "nb_NO": "Er denne gaten en sykkelvei?",
-          "de": "Ist diese Straße eine Fahrradstraße?",
-          "it": "È una strada ciclabile?"
+          "de": "Ist diese Straße eine Fahrradstraße?"
         },
         "mappings": [
           {
@@ -243,8 +263,7 @@
               "en": "This street is a cyclestreet (and has a speed limit of 30 km/h)",
               "ja": "cyclestreet(最高速度は30km/h)",
               "nb_NO": "Denne gaten er en sykkelvei (og har en fartsgrense på 30 km/t)",
-              "de": "Diese Straße ist eine Fahrradstraße (mit einer Geschwindigkeitsbegrenzung von 30 km/h)",
-              "it": "Questa è una strada ciclabile (e ha un limite di velocità massima di 30 km/h)"
+              "de": "Diese Straße ist eine Fahrradstraße (mit einer Geschwindigkeitsbegrenzung von 30 km/h)"
             }
           },
           {
@@ -259,8 +278,7 @@
               "en": "This street is a cyclestreet",
               "ja": "この通りはcyclestreetだ",
               "nb_NO": "Denne gaten er en sykkelvei",
-              "de": "Diese Straße ist eine Fahrradstraße",
-              "it": "Questa è una strada ciclabile"
+              "de": "Diese Straße ist eine Fahrradstraße"
             },
             "hideInAnswer": true
           },
@@ -276,8 +294,7 @@
               "en": "This street will become a cyclstreet soon",
               "ja": "この通りはまもなくcyclstreetになるだろう",
               "nb_NO": "Denne gaten vil bli sykkelvei ganske snart",
-              "de": "Diese Straße wird bald eine Fahrradstraße sein",
-              "it": "Diverrà tra poco una strada ciclabile"
+              "de": "Diese Straße wird bald eine Fahrradstraße sein"
             }
           },
           {

assets/themes/cyclofix/cyclofix.json

@@ -1,7 +1,7 @@
 {
   "id": "cyclofix",
   "title": {
-    "en": "Cyclofix — an open map for cyclists",
+    "en": "Cyclofix - an open map for cyclists",
     "nl": "Cyclofix - een open kaart voor fietsers",
     "fr": "Cyclofix - Une carte ouverte pour les cyclistes",
     "gl": "Cyclofix - Un mapa aberto para os ciclistas",
@@ -9,7 +9,7 @@
     "ru": "Cyclofix - открытая карта для велосипедистов",
     "ja": "Cyclofix - サイクリストのためのオープンマップ",
     "zh_Hant": "單車修正 - 單車騎士的開放地圖",
-    "it": "Cyclofix — una mappa libera per chi va in bici",
+    "it": "Cyclofix - una mappa libera per chi va in bici",
     "nb_NO": "Cyclofix — et åpent kart for syklister"
   },
   "description": {

assets/themes/etymology.json

@@ -13,7 +13,7 @@
     "it": "Qual è l’origine di un toponimo?"
   },
   "description": {
-    "en": "On this map, you can see what an object is named after. The streets, buildings, ... come from OpenStreetMap which got linked with Wikidata. In the popup, you'll see the Wikipedia article (if it exists) or a Wikidata box of what the object is named after. If the object itself has a Wikipedia page, that'll be shown too.<br/><br/><b>You can help contribute too!</b>Zoom in enough and <i>all</i> streets will show up. You can click one and a Wikidata-search box will popup. With a few clicks, you can add an etymology link. Note that you need a free OpenStreetMap account to do this.",
+    "en": "On this map, you can see what an object is named after. The streets, buildings, ... come from OpenStreetMap which got linked with Wikidata. In the popup, you'll see the Wikipedia article (if it exists) or a wikidata box of what the object is named after. If the object itself has a wikipedia page, that'll be shown too.<br/><br/><b>You can help contribute too!</b>Zoom in enough and <i>all</i> streets will show up. You can click one and a Wikidata-search box will popup. With a few clicks, you can add an etymology link. Note that you need a free OpenStreetMap account to do this.",
     "nl": "Op deze kaart zie je waar een plaats naar is vernoemd. De straten, gebouwen, ... komen uit OpenStreetMap, waar een link naar Wikidata werd gelegd. In de popup zie je het Wikipedia-artikel van hetgeen naarwaar het vernoemd is of de Wikidata-box.<br/><br/><b>Je kan zelf ook meehelpen!</b>Als je ver inzoomt, krijg je alle straten te zien. Klik je een straat aan, dan krijg je een zoekfunctie waarmee je snel een nieuwe link kan leggen. Je hebt hiervoor een gratis OpenStreetMap account nodig.",
     "de": "Auf dieser Karte können Sie sehen, wonach ein Objekt benannt ist. Die Straßen, Gebäude, ... stammen von OpenStreetMap, das mit Wikidata verknüpft wurde. In dem Popup sehen Sie den Wikipedia-Artikel (falls vorhanden) oder ein Wikidata-Feld, nach dem das Objekt benannt ist. Wenn das Objekt selbst eine Wikipedia-Seite hat, wird auch diese angezeigt.<br/><br/><b>Sie können auch einen Beitrag leisten!</b>Zoomen Sie genug hinein und <i>alle</i> Straßen werden angezeigt. Wenn Sie auf eine Straße klicken, öffnet sich ein Wikidata-Suchfeld. Mit ein paar Klicks können Sie einen Etymologie-Link hinzufügen. Beachten Sie, dass Sie dazu ein kostenloses OpenStreetMap-Konto benötigen.",
     "it": "Su questa cartina sono visibili i nomi a cui sono riferiti gli oggetti. Le strade, gli edifici, etc. provengono da OpenStreetMap che è a sua volta collegata a Wikidata. Nel popup, se esiste, verrà mostrato l’articolo Wikipedia o l'elemento Wikidata a cui si riferisce il nome di quell’oggetto. Se l’oggetto stesso ha una pagina Wikpedia, anch’essa verrà mostrata.<br/><br/><b>Anche tu puoi contribuire!</b>Ingrandisci abbastanza e <i>tutte</i> le strade appariranno. Puoi cliccare su una e apparirà un popup con la ricerca Wikidata. Con pochi clic puoi aggiungere un collegamento etimologico. Tieni presente che per farlo, hai bisogno di un account gratuito su OpenStreetMap."

assets/themes/facadegardens/facadegardens.json

@@ -16,15 +16,15 @@
     "zh_Hant": "這地圖顯示立面花園的照片以及其他像是方向、日照以及植栽種類等實用訊息。",
     "it": "Questa mappa mostra i giardini verticali, con foto e informazioni utili sulla loro orientazione, sull'illuminazione solare e sui tipi di piante.",
     "fr": "Cette carte indique les murs végétalisés avec des photos et des informations comme leur orientation, l’ensoleillement et le type de plantes.",
-    "de": "Diese Karte zeigt Fassadengärten mit Bildern und nützlichen Informationen über Ausrichtung, Sonneneinstrahlung und Pflanzenarten."
+    "de": "Diese Karte zeigt Fassadengärten mit Bildern und Details zu Ausrichtung, Sonneneinstrahlung und Pflanzen."
   },
   "description": {
     "nl": "Ontharde voortuintjes, groene gevels en bomen ín de stad brengen naast rust ook een mooiere stad, een grotere biodiversiteit, een verkoelend effect en een betere luchtkwaliteit. <br/> Klimaan VZW en 'Mechelen Klimaatneutraal' willen met het project Klim(t)aan je Gevel bestaande en nieuwe geveltuintjes in kaart brengen als voorbeeld voor mensen zelf een tuintje willen aanleggen of voor stadwandelaars die houden van de natuur. <br/>Meer info over het project op <a href='https://klimaan.be/' target=_blank>klimaan.be</a>.",
     "en": "<a href='https://nl.wikipedia.org/wiki/Geveltuin' target=_blank>Facade gardens</a>, green facades and trees in the city not only bring peace and quiet, but also a more beautiful city, greater biodiversity, a cooling effect and better air quality. <br/> Klimaan VZW and Mechelen Klimaatneutraal want to map existing and new facade gardens as an example for people who want to build their own garden or for city walkers who love nature.<br/>More info about the project at <a href='https://klimaan.be/' target=_blank>klimaan.be</a>.",
     "ja": "<a href='https://nl.wikipedia.org/wiki/Geveltuin' target=_blank>ファサード庭園</a>、都市の緑のファサードと樹木は、平和と静けさをもたらすだけでなく、より美しい都市、より大きな生物多様性、冷却効果、より良い大気質をもたらす。<br/>KlimaanのVZWとMechelenのKlimaatneutraalは、自分で庭を作りたい人や自然を愛する都市の歩行者のために、既存のファサード庭園と新しいファサード庭園のマッピングしたいと考えています。<br/>このプロジェクトに関する詳細情報は<a href='https://klimaan.be/' target=_blank>klimaan</a>にあります。",
     "fr": "Les <a href='https://nl.wikipedia.org/wiki/Geveltuin' target=_blank>jardins muraux</a> en ville n’apportent pas seulement paix et tranquillité mais contribuent à embellir la ville, favoriser la biodiversité, régule la température et assainit l’air. <br/> Klimaan VZW et Mechelen Klimaatneutraal veulent cartographier les jardins muraux comme exemple pour les personnes souhaitant en construire ainsi que celles aimant la nature.<br/>Plus d’infos sur <a href='https://klimaan.be/' target=_blank>klimaan.be</a>.",
-    "de": "<a href='https://nl.wikipedia.org/wiki/Geveltuin' target=_blank>Fassadengärten</a>, grüne Fassaden und Bäume in der Stadt bringen nicht nur Ruhe und Frieden, sondern auch eine schönere Stadt, eine größere Artenvielfalt, einen Kühleffekt und eine bessere Luftqualität. <br/> Klimaan VZW und Mechelen Klimaatneutraal wollen bestehende und neue Fassadengärten als Beispiel für Menschen, die ihren eigenen Garten anlegen wollen, oder für naturverbundene Stadtspaziergänger kartieren.<br/>Mehr Informationen über das Projekt unter <a href='https://klimaan.be/' target=_blank>klimaan.be</a>.",
-    "it": "I <a href='https://nl.wikipedia.org/wiki/Geveltuin' target=_blank>giardini veritcali</a> e gli alberi in città non solo portano pace e tranquillità ma creano anche un ambiente più bello, aumentano la biodiversità, rendono il clima più fresco e migliorano la qualità dell’aria. <br/> Klimaan VZW e Mechelen Klimaatneutraal vogliono mappare sia i giardini verticali esistenti che quelli nuovi per mostrarli a quanti vogliono costruire un loro proprio giardino o per quelli che amano la natura e vogliono camminare per la città.<br/>Per ulteriori informazioni visita <a href='https://klimaan.be/' target=_blank>klimaan.be</a>."
+    "it": "I <a href='https://nl.wikipedia.org/wiki/Geveltuin' target=_blank>giardini veritcali</a> e gli alberi in città non solo portano pace e tranquillità ma creano anche un ambiente più bello, aumentano la biodiversità, rendono il clima più fresco e migliorano la qualità dell’aria. <br/> Klimaan VZW e Mechelen Klimaatneutraal vogliono mappare sia i giardini verticali esistenti che quelli nuovi per mostrarli a quanti vogliono costruire un loro proprio giardino o per quelli che amano la natura e vogliono camminare per la città.<br/>Per ulteriori informazioni visita <a href='https://klimaan.be/' target=_blank>klimaan.be</a>.",
+    "de": "<a href='https://nl.wikipedia.org/wiki/Geveltuin' target=_blank>Fassadengärten</a>, grüne Fassaden und Bäume in der Stadt bringen nicht nur Ruhe und Frieden, sondern auch eine schönere Stadt, eine größere Artenvielfalt, einen Kühleffekt und eine bessere Luftqualität. <br/> Klimaan VZW und Mechelen Klimaatneutraal wollen bestehende und neue Fassadengärten als Beispiel für Menschen, die ihren eigenen Garten anlegen wollen, oder für naturverbundene Stadtspaziergänger kartieren.<br/>Mehr Informationen über das Projekt unter <a href='https://klimaan.be/' target=_blank>klimaan.be</a>."
   },
   "language": [
     "nl",
@@ -55,8 +55,7 @@
         "ja": "ファサード庭園",
         "zh_Hant": "立面花園",
         "fr": "Jardins muraux",
-        "de": "Fassadengärten",
-        "it": "Giardini verticali"
+        "de": "Fassadengärten"
       },
       "minzoom": 12,
       "source": {
@@ -74,8 +73,7 @@
           "ja": "ファサード庭園",
           "zh_Hant": "立面花園",
           "fr": "Jardin mural",
-          "de": "Fassadengarten",
-          "it": "Giardino verticale"
+          "de": "Fassadengarten"
         }
       },
       "description": {
@@ -84,59 +82,24 @@
         "ja": "ファサード庭園",
         "zh_Hant": "立面花園",
         "fr": "Jardins muraux",
-        "de": "Fassadengärten",
-        "it": "Giardini verticali"
+        "de": "Fassadengärten"
       },
-      "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
-        }
-      ],
       "tagRenderings": [
         "images",
         {
           "render": {
             "nl": "Oriëntatie: {direction} (waarbij 0=N en 90=O)",
-            "en": "Orientation: {direction} (where 0=N and 90=E)",
+            "en": "Orientation: {direction} (where 0=N and 90=O)",
             "ja": "方向: {direction} (0=N で 90=O)",
             "fr": "Orientation : {direction} (0 pour le Nord et 90 pour l’Ouest)",
-            "de": "Ausrichtung: {direction} (wobei 0=N und 90=O)",
-            "it": "Orientamento: {direction} (0 per il Nord e 90 per l’Est)"
+            "de": "Ausrichtung: {direction} (wobei 0=N und 90=O)"
           },
           "question": {
             "nl": "Hoe is de tuin georiënteerd?",
             "en": "What is the orientation of the garden?",
             "ja": "庭の向きはどうなっていますか?",
             "fr": "Quelle est l’orientation du jardin ?",
-            "de": "Wie ist der Garten ausgerichtet?",
-            "it": "Com’è orientato questo giardino?"
+            "de": "Wie ist der Garten ausgerichtet?"
           },
           "freeform": {
             "type": "direction",
@@ -211,8 +174,7 @@
             "en": "Is there a water barrel installed for the garden?",
             "ja": "庭に水桶が設置されているのですか?",
             "fr": "Des réserves d’eau ont-elles été installées pour le jardin ?",
-            "de": "Gibt es ein Wasserfass für den Garten?",
-            "it": "È stata installata una riserva d’acqua per il giardino?"
+            "de": "Gibt es ein Wasserfass für den Garten?"
           },
           "mappings": [
             {
@@ -402,44 +364,6 @@
           "id": "facadegardens-description"
         }
       ],
-      "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"
-          }
-        ]
-      },
-      "width": {
-        "render": "8"
-      },
-      "iconSize": {
-        "render": "50,50,center"
-      },
-      "color": {
-        "render": "#00f"
-      },
       "presets": [
         {
           "tags": [
@@ -464,7 +388,71 @@
           }
         }
       ],
-      "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"
+              }
+            ]
+          },
+          "iconBadges": [
+            {
+              "if": "plant~.*vine.*",
+              "then": "circle:white;./assets/themes/facadegardens/klimplant.svg"
+            },
+            {
+              "if": "plant~.*groundcover.*",
+              "then": "circle:white;./assets/themes/facadegardens/bodembedekker.svg"
+            },
+            {
+              "if": "edible=true",
+              "then": "circle:white;./assets/themes/facadegardens/eetbaar.svg"
+            },
+            {
+              "if": "rain_barel=yes",
+              "then": "circle:white;./assets/themes/facadegardens/gevelton.svg"
+            },
+            {
+              "if": "plant~.*shrub.*",
+              "then": "circle:white;./assets/themes/facadegardens/struik.svg"
+            },
+            {
+              "if": "plant~.*flower.*",
+              "then": "circle:white;./assets/themes/facadegardens/bloei.svg"
+            }
+          ],
+          "iconSize": {
+            "render": "50,50,center"
+          },
+          "location": [
+            "point"
+          ]
+        }
+      ]
     }
   ]
 }

assets/themes/fruit_trees/fruit_trees.json

@@ -68,6 +68,27 @@
             "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"
+          ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "8"
+          }
+        }
       ]
     },
     {
@@ -170,6 +191,27 @@
             "nl": "Voeg hier een boom toe"
           }
         }
+      ],
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/fruit_trees/fruit_tree.svg"
+          },
+          "iconSize": {
+            "render": "40,40,center"
+          },
+          "location": [
+            "point"
+          ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "8"
+          }
+        }
       ]
     }
   ]

assets/themes/ghostbikes/ghostbikes.json

@@ -43,7 +43,7 @@
   "description": {
     "en": "A <b>ghost bike</b> is a memorial for a cyclist who died in a traffic accident, in the form of a white bicycle placed permanently near the accident location.<br/><br/>On this map, one can see all the ghost bikes which are known by OpenStreetMap. Is a ghost bike missing? Everyone can add or update information here - you only need to have a (free) OpenStreetMap account.",
     "nl": "Een <b>Witte Fiets</b> of <b>Spookfiets</b> is een aandenken aan een fietser die bij een verkeersongeval om het leven kwam. Het gaat om een fiets die volledig wit is geschilderd en in de buurt van het ongeval werd geinstalleerd.<br/><br/>Op deze kaart zie je alle witte fietsen die door OpenStreetMap gekend zijn. Ontbreekt er een Witte Fiets of wens je informatie aan te passen? Meld je dan aan met een (gratis) OpenStreetMap account.",
-    "de": "Ein <b>Geisterrad</b> ist ein Denkmal für einen Radfahrer, der bei einem Verkehrsunfall ums Leben kam, in Form eines weißen Fahrrades, das dauerhaft in der Nähe des Unfallortes aufgestellt ist.<br/><br/> Auf dieser Karte kann man alle Geisterräder sehen, die in OpenStreetMap eingetragen sind. Fehlt ein Geisterrad? Jeder kann hier Informationen hinzufügen oder aktualisieren - Sie benötigen lediglich einen (kostenlosen) OpenStreetMap-Account.",
+    "de": "Ein <b>Geisterrad</b> ist ein weißes Fahrrad, dass zum Gedenken eines tödlich verunglückten Radfahrers vor Ort aufgestellt wurde.<br/><br/> Auf dieser Karte kann man alle Geisterräder sehen, die OpenStreetMap eingetragen sind. Fehlt ein Geisterrad? Jeder kann hier Informationen hinzufügen oder aktualisieren - Sie benötigen lediglich einen (kostenlosen) OpenStreetMap-Account.",
     "ja": "<b>ゴーストバイク</b>は、交通事故で死亡したサイクリストを記念するもので、事故現場の近くに恒久的に置かれた白い自転車の形をしています。<br/><br/>このマップには、OpenStreetMapで知られているゴーストバイクがすべて表示されます。ゴーストバイクは行方不明ですか?誰でもここで情報の追加や更新ができます。必要なのは(無料の)OpenStreetMapアカウントだけです。",
     "zh_Hant": "<b>幽靈單車</b>是用來紀念死於交通事故的單車騎士，在事發地點附近放置白色單車。<br/><br/>在這份地圖上面，你可以看到所有在開放街圖已知的幽靈單車。有缺漏的幽靈單車嗎？所有人都可以在這邊新增或是更新資訊-只有你有(免費)開放街圖帳號。",
     "fr": "Les <b>vélos fantômes</b> sont des mémoriaux pour les cyclistes tuées sur la route, prenant la forme de vélos blancs placés à proximité des faits.<br/><br/>Cette carte indique leur emplacement à partir d’OpenStreetMap. Il est possible de contribuer aux informations ici, sous réserve d’avoir un compte OpenStreetMap (gratuit).",
@@ -57,5 +57,8 @@
   "layers": [
     "ghost_bike"
   ],
-  "defaultBackgroundId": "CartoDB.Positron"
+  "defaultBackgroundId": "CartoDB.Positron",
+  "clustering": {
+    "maxZoom": 0
+  }
 }

assets/themes/grb_import/grb.json

@@ -7,10 +7,12 @@
     "nl": "Grb Fixup"
   },
   "description": {
-    "nl": "GRB Fixup"
+    "nl": "GRB Fixup",
+    "en": "This theme is an attempt to help automating the GRB import.<br/>Note that this is very hacky and 'steals' the GRB data from an external site; in order to do this, you need to install and activate <a href='https://addons.mozilla.org/en-US/firefox/addon/cors-everywhere/'>this firefox extension</a> for it to work."
   },
   "language": [
-    "nl"
+    "nl",
+    "en"
   ],
   "maintainer": "",
   "icon": "./assets/svg/bug.svg",
@@ -20,13 +22,186 @@
   "startZoom": 14,
   "widenFactor": 2,
   "socialImage": "",
+  "clustering": {
+    "maxZoom": 15
+  },
+  "overrideAll": {
+    "minzoom": 18
+  },
+  "trackAllNodes": true,
+  "enableGeolocation": false,
   "layers": [
+    {
+      "builtin": "type_node",
+      "isShown": {
+        "render": "no"
+      },
+      "override": {
+        "calculatedTags": [
+          "_is_part_of_building=feat.get('parent_ways')?.some(p => p.building !== undefined && p.building !== '') ?? false",
+          "_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"
+          }
+        ]
+      }
+    },
+    {
+      "id": "OSM-buildings",
+      "name": "All OSM-buildings",
+      "source": {
+        "osmTags": "building~*",
+        "maxCacheAge": 0
+      },
+      "mapRendering": [
+        {
+          "width": {
+            "render": "2"
+          },
+          "color": {
+            "render": "#00c",
+            "mappings": [
+              {
+                "if": "building=house",
+                "then": "#a00"
+              },
+              {
+                "if": "building=shed",
+                "then": "#563e02"
+              },
+              {
+                "if": {
+                  "or": [
+                    "building=garage",
+                    "building=garages"
+                  ]
+                },
+                "then": "#f9bfbb"
+              },
+              {
+                "if": "building=yes",
+                "then": "#0774f2"
+              }
+            ]
+          }
+        }
+      ],
+      "title": "OSM-gebouw",
+      "tagRenderings": [
+        {
+          "id": "building type",
+          "freeform": {
+            "key": "building"
+          },
+          "render": "The building type is <b>{building}</b>",
+          "question": {
+            "en": "What kind of building is this?"
+          },
+          "mappings": [
+            {
+              "if": "building=house",
+              "then": "A normal house"
+            },
+            {
+              "if": "building=detached",
+              "then": "A house detached from other building"
+            },
+            {
+              "if": "building=semidetached_house",
+              "then": "A house sharing only one wall with another house"
+            },
+            {
+              "if": "building=apartments",
+              "then": "An apartment building - highrise for living"
+            },
+            {
+              "if": "building=office",
+              "then": "An office building - highrise for work"
+            },
+            {
+              "if": "building=apartments",
+              "then": "An apartment building"
+            },
+            {
+              "if": "building=shed",
+              "then": "A small shed, e.g. in a garden"
+            },
+            {
+              "if": "building=garage",
+              "then": "A single garage to park a car"
+            },
+            {
+              "if": "building=garages",
+              "then": "A building containing only garages; typically they are all identical"
+            },
+            {
+              "if": "building=yes",
+              "then": "A building - no specification"
+            }
+          ]
+        },
+        "all_tags"
+      ]
+    },
+    {
+      "id": "All OSM objects",
+      "name": "All OSM Objects",
+      "source": {
+        "osmTags": {
+          "and": [
+            "id~*",
+            "landuse=",
+            "place=",
+            "disused:power=",
+            "power=",
+            "type!=boundary",
+            "boundary=",
+            {
+              "or": [
+                "level=",
+                "level=0"
+              ]
+            },
+            {
+              "or": [
+                "layer=0",
+                "layer="
+              ]
+            }
+          ]
+        },
+        "maxCacheAge": 0
+      },
+      "mapRendering": [
+        {
+          "color": {
+            "render": "#00c"
+          },
+          "width": {
+            "render": "1"
+          }
+        }
+      ],
+      "title": {
+        "render": {
+          "*": "OSM-Object"
+        }
+      },
+      "tagRenderings": [
+        "all_tags"
+      ]
+    },
     {
       "id": "osm-fixmes",
       "name": {
         "nl": "Fixmes op gebouwen"
       },
-      "minzoom": 12,
       "source": {
         "maxCacheAge": 0,
         "osmTags": {
@@ -178,26 +353,34 @@
           }
         }
       ],
-      "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>"
+      "mapRendering": [
+        {
+          "location": [
+            "point",
+            "centroid"
+          ],
+          "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"
           }
-        ]
-      },
-      "width": {
-        "render": "2"
-      },
-      "iconSize": {
-        "render": "40,40,center"
-      },
-      "dashes": "2 2",
-      "color": {
-        "render": "#00f"
-      },
-      "wayHandling": 2,
-      "presets": []
+        },
+        {
+          "dashes": "2 2",
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "2"
+          }
+        }
+      ]
     },
     {
       "id": "crab-addresses 2021-10-26",
@@ -208,22 +391,252 @@
         "geoJsonZoomLevel": 18,
         "maxCacheAge": 0
       },
-      "minzoom": 19,
       "name": "CRAB-addressen",
       "title": "CRAB-adres",
-      "icon": "circle:#bb3322",
-      "iconSize": "15,15,center",
+      "mapRendering": [
+        {
+          "location": [
+            "point"
+          ],
+          "icon": "circle:#bb3322",
+          "iconSize": "15,15,center"
+        }
+      ],
+      "calculatedTags": [
+        "_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_id=feat.get('_embedded_in').id"
+      ],
+      "isShown": {
+        "render": "yes",
+        "mappings": [
+          {
+            "if": {
+              "and": [
+                "_embedding_nr:={HUISNR}",
+                "_embedding_street:={STRAATNM}"
+              ]
+            },
+            "then": "no"
+          }
+        ]
+      },
       "tagRenderings": [
+        {
+          "id": "render_crab",
+          "render": "Volgens het CRAB ligt hier <b>{STRAATNM}</b> {HUISNR} (label: {HNRLABEL})"
+        },
+        {
+          "id": "render_embedded",
+          "render": "Het omliggende object met addres heeft <b>{_embedding_street}</b> {_embedding_nr}",
+          "condition": {
+            "and": [
+              "_embedding_street~*",
+              "_embedding_nr~*"
+            ]
+          }
+        },
         "all_tags",
         {
           "id": "import-button",
-          "render": "{import_button(addr:street=$STRAATNM; addr:housenumber=$HUISNR)}"
+          "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!="
+        }
+      ]
+    },
+    {
+      "id": "grb-fixmes",
+      "name": {
+        "nl": "Fixmes op gebouwen"
+      },
+      "source": {
+        "maxCacheAge": 0,
+        "osmTags": {
+          "and": [
+            "fixme~*",
+            "building~*"
+          ]
+        }
+      },
+      "calculatedTags": [
+        "_grbNumber=(feat.properties.fixme?.match(/GRB thinks that this has number ([^;]+)/ ) ?? ['','none']) [1]"
+      ],
+      "title": {
+        "render": {
+          "nl": "{addr:street} {addr:housenumber}"
+        },
+        "mappings": [
+          {
+            "if": {
+              "and": [
+                "fixme~*"
+              ]
+            },
+            "then": {
+              "nl": "{fixme}"
+            }
+          }
+        ]
+      },
+      "description": {
+        "nl": "Dit gebouw heeft een foutmelding"
+      },
+      "tagRenderings": [
+        {
+          "id": "grb-housenumber",
+          "render": {
+            "nl": "Het huisnummer is <b>{addr:housenumber}</b>"
+          },
+          "question": {
+            "nl": "Wat is het huisnummer?"
+          },
+          "freeform": {
+            "key": "addr:housenumber"
+          },
+          "mappings": [
+            {
+              "if": {
+                "and": [
+                  "not:addr:housenumber=yes",
+                  "addr:housenumber="
+                ]
+              },
+              "then": {
+                "nl": "Geen huisnummer"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "addr:housenumber:={_grbNumber}",
+                  "fixme="
+                ]
+              },
+              "then": "Het huisnummer is <b>{_grbNumber}</b>, wat overeenkomt met het GRB",
+              "hideInAnswer": {
+                "or": [
+                  "_grbNumber=",
+                  "_grbNumber=none",
+                  "_grbNumber=no number"
+                ]
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "addr:housenumber=",
+                  "not:addr:housenumber=yes",
+                  "fixme="
+                ]
+              },
+              "then": "Dit gebouw heeft geen nummer, net zoals in het GRB",
+              "hideInAnswer": "_grbNumber!=no number"
+            }
+          ]
+        },
+        {
+          "id": "grb-unit",
+          "question": "Wat is de wooneenheid-aanduiding?",
+          "render": {
+            "nl": "De wooneenheid-aanduiding is <b>{addr:unit}</b> "
+          },
+          "freeform": {
+            "key": "addr:unit"
+          },
+          "mappings": [
+            {
+              "if": "addr:unit=",
+              "then": "Geen wooneenheid-nummer"
+            }
+          ]
+        },
+        {
+          "id": "grb-street",
+          "render": {
+            "nl": "De straat is <b>{addr:street}</b>"
+          },
+          "freeform": {
+            "key": "addr:street"
+          },
+          "question": {
+            "nl": "Wat is de straat?"
+          }
+        },
+        {
+          "id": "grb-fixme",
+          "render": {
+            "nl": "De fixme is <b>{fixme}</b>"
+          },
+          "question": {
+            "nl": "Wat zegt de fixme?"
+          },
+          "freeform": {
+            "key": "fixme"
+          },
+          "mappings": [
+            {
+              "if": {
+                "and": [
+                  "fixme="
+                ]
+              },
+              "then": {
+                "nl": "Geen fixme"
+              }
+            }
+          ]
+        },
+        {
+          "id": "grb-min-level",
+          "render": {
+            "nl": "Dit gebouw begint maar op de {building:min_level} verdieping"
+          },
+          "question": {
+            "nl": "Hoeveel verdiepingen ontbreken?"
+          },
+          "freeform": {
+            "key": "building:min_level",
+            "type": "pnat"
+          }
+        }
+      ],
+      "mapRendering": [
+        {
+          "location": [
+            "point",
+            "centroid"
+          ],
+          "iconSize": {
+            "render": "40,40,center"
+          },
+          "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>"
+              }
+            ]
+          }
+        },
+        {
+          "width": {
+            "render": "2"
+          },
+          "color": {
+            "render": "#00f"
+          }
         }
       ]
     },
     {
       "id": "GRB",
       "source": {
+        "osmTags": "HUISNR~*",
         "geoJson": "https://betadata.grbosm.site/grb?bbox={x_min},{y_min},{x_max},{y_max}",
         "geoJsonZoomLevel": 18,
         "mercatorCrs": true,
@@ -231,12 +644,98 @@
       },
       "name": "GRB geometries",
       "title": "GRB outline",
-      "minzoom": 19,
+      "calculatedTags": [
+        "_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']",
+        "_osm_obj:source:date=feat.get('_overlaps_with')?.feat?.properties['source:geometry:date'].replace(/\\//g, '-')",
+        "_osm_obj:building=feat.get('_overlaps_with')?.feat?.properties.building",
+        "_osm_obj:id=feat.get('_overlaps_with')?.feat?.properties.id",
+        "_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",
+        "_target_building_type=feat.properties['_osm_obj:building'] === 'yes' ? feat.properties.building : (feat.properties['_osm_obj:building'] ?? feat.properties.building)"
+      ],
       "tagRenderings": [
+        {
+          "id": "Building info",
+          "render": "This is a <b>{building}</b> <span class='subtle'>detected by {detection_method}</span>"
+        },
+        {
+          "id": "overlapping building type",
+          "render": "<div>The overlapping openstreetmap-building is a <b>{_osm_obj:building}</b> and covers <b>{_overlap_percentage}%</b> of the GRB building<div><h3>GRB geometry:</h3>{minimap(21, id):height:10rem;border-radius:1rem;overflow:hidden}<h3>OSM geometry:</h3>{minimap(21,_osm_obj:id):height:10rem;border-radius:1rem;overflow:hidden}",
+          "condition": "_overlaps_with!=null"
+        },
+        {
+          "id": "apply-id",
+          "render": "{tag_apply(source:geometry:date=$_grb_date; source:geometry:ref=$_grb_ref,Mark the OSM-building as imported,,_osm_obj:id)}",
+          "condition": {
+            "and": [
+              "_overlaps_with!=null"
+            ]
+          }
+        },
+        {
+          "id": "apply-building-type",
+          "render": "{tag_apply(building=$building,Use the building type from GRB,,_osm_obj:id)}",
+          "condition": {
+            "and": [
+              "_overlaps_with!=null",
+              "_osm_obj:building=yes",
+              "building!=yes"
+            ]
+          }
+        },
+        {
+          "id": "Import-button",
+          "render": "{import_button(OSM-buildings,building=$building; source:geometry:date=$_grb_date; source:geometry:ref=$_grb_ref, Upload this building to OpenStreetMap)}",
+          "mappings": [
+            {
+              "if": "_overlaps_with!=null",
+              "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)}"
+            }
+          ]
+        },
         "all_tags"
+      ],
+      "isShown": {
+        "render": "yes",
+        "mappings": [
+          {
+            "if": {
+              "and": [
+                "_imported_osm_object_found=true",
+                "_imported_osm_still_fresh=true"
+              ]
+            },
+            "then": "no"
+          }
+        ]
+      },
+      "mapRendering": [
+        {
+          "color": {
+            "render": "#00a",
+            "mappings": [
+              {
+                "if": {
+                  "and": [
+                    "_imported_osm_object_found=true",
+                    "_imported_osm_still_fresh=true"
+                  ]
+                },
+                "then": "#0f0"
+              }
+            ]
+          }
+        }
       ]
     }
   ],
   "hideFromOverview": true,
-  "defaultBackgroundId": "AGIVFlandersGRB"
+  "defaultBackgroundId": "AGIVFlandersGRB",
+  "overpassMaxZoom": 15,
+  "osmApiTileSize": 17
 }

assets/themes/hackerspaces/hackerspaces.json

@@ -34,15 +34,13 @@
       "id": "hackerspaces",
       "name": {
         "en": "Hackerspace",
-        "de": "Hackerspace",
-        "it": "Hackerspace"
+        "de": "Hackerspace"
       },
       "minzoom": 8,
       "title": {
         "render": {
           "en": "Hackerspace",
-          "de": "Hackerspace",
-          "it": "Hackerspace"
+          "de": "Hackerspace"
         },
         "mappings": [
           {
@@ -53,41 +51,35 @@
             },
             "then": {
               "en": " {name}",
-              "de": " {name}",
-              "eo": " {name}",
-              "it": " {name}"
+              "de": " {name}"
             }
           }
         ]
       },
       "description": {
         "en": "Hackerspace",
-        "de": "Hackerspace",
-        "it": "Hackerspace"
+        "de": "Hackerspace"
       },
       "tagRenderings": [
         {
           "id": "is_makerspace",
           "question": {
             "en": "Is this a hackerspace or a makerspace?",
-            "de": "Ist dies ein Hackerspace oder ein Makerspace?",
-            "it": "È un hackerspace o un makerspace?"
+            "de": "Ist dies ein Hackerspace oder ein Makerspace?"
           },
           "mappings": [
             {
               "if": "hackerspace=makerspace",
               "then": {
                 "en": "This is a makerspace",
-                "de": "Dies ist ein Makerspace",
-                "it": "Si tratta di un makerspace"
+                "de": "Dies ist ein Makerspace"
               }
             },
             {
               "if": "hackerspace=",
               "then": {
                 "en": "This is a traditional (software oriented) hackerspace",
-                "de": "Dies ist ein traditioneller (softwareorientierter) Hackerspace",
-                "it": "Si tratta di un hackerspace tradizionale (orientato al software)"
+                "de": "Dies ist ein traditioneller (softwareorientierter) Hackerspace"
               }
             }
           ]
@@ -95,13 +87,11 @@
         {
           "question": {
             "en": "What is the name of this hackerspace?",
-            "de": "Wie lautet der Name dieses Hackerspace?",
-            "it": "Qual è il nome di questo hackerspace?"
+            "de": "Wie lautet der Name dieses Hackerspace?"
           },
           "render": {
             "en": "This hackerspace is named <b>{name}</b>",
-            "de": "Dieser Hackerspace heißt <b>{name}</b>",
-            "it": "Questo hackerspace si chiama <b>{name}</b>"
+            "de": "Dieser Hackerspace heißt <b>{name}</b>"
           },
           "freeform": {
             "key": "name"
@@ -114,8 +104,7 @@
         {
           "question": {
             "en": "When is this hackerspace opened?",
-            "de": "Wann hat dieser Hackerspace geöffnet?",
-            "it": "Quando è aperto questo hackerspace?"
+            "de": "Wann hat dieser Hackerspace geöffnet?"
           },
           "freeform": {
             "key": "opening_hours",
@@ -123,9 +112,7 @@
           },
           "render": {
             "en": "{opening_hours_table()}",
-            "de": "{opening_hours_table()}",
-            "eo": "{opening_hours_table()}",
-            "it": "{opening_hours_table()}"
+            "de": "{opening_hours_table()}"
           },
           "mappings": [
             {
@@ -136,8 +123,7 @@
               },
               "then": {
                 "en": "Opened 24/7",
-                "de": "durchgehend geöffnet",
-                "it": "Aperto sempre"
+                "de": "durchgehend geöffnet"
               }
             }
           ],
@@ -148,8 +134,7 @@
           "id": "hs-club-mate",
           "question": {
             "en": "Does this hackerspace serve Club Mate?",
-            "de": "Gibt es in diesem Hackerspace Club Mate?",
-            "it": "In questo hackerspace si serve Club-Mate?"
+            "de": "Gibt es in diesem Hackerspace Club Mate?"
           },
           "mappings": [
             {
@@ -160,8 +145,7 @@
               },
               "then": {
                 "en": "This hackerspace serves club mate",
-                "de": "In diesem Hackerspace gibt es Club Mate",
-                "it": "In questo hackerspace viene servito Club-Mate"
+                "de": "In diesem Hackerspace gibt es Club Mate"
               }
             },
             {
@@ -172,8 +156,7 @@
               },
               "then": {
                 "en": "This hackerspace does not serve club mate",
-                "de": "In diesem Hackerspace gibt es kein Club Mate",
-                "it": "In questo hackerspace non viene servito Club-Mate"
+                "de": "In diesem Hackerspace gibt es kein Club Mate"
               }
             }
           ]
@@ -181,13 +164,11 @@
         {
           "render": {
             "en": "This hackerspace was founded at {start_date}",
-            "de": "Dieser Hackerspace wurde gegründet am {start_date}",
-            "it": "Questo hackerspace è stato creato il {start_date}"
+            "de": "Dieser Hackerspace wurde gegründet am {start_date}"
           },
           "question": {
             "en": "When was this hackerspace founded?",
-            "de": "Wann wurde dieser Hackerspace gegründet?",
-            "it": "Quando è stato creato questo hackerspace?"
+            "de": "Wann wurde dieser Hackerspace gegründet?"
           },
           "freeform": {
             "key": "start_date",
@@ -196,33 +177,6 @@
           "id": "hackerspaces-start_date"
         }
       ],
-      "icon": {
-        "render": "./assets/themes/hackerspaces/glider.svg",
-        "mappings": [
-          {
-            "if": {
-              "and": [
-                "hackerspace=makerspace"
-              ]
-            },
-            "then": {
-              "en": "./assets/themes/hackerspaces/led.png",
-              "de": "./assets/themes/hackerspaces/led.png",
-              "eo": "./assets/themes/hackerspaces/led.png",
-              "it": "./assets/themes/hackerspaces/led.png"
-            }
-          }
-        ]
-      },
-      "width": {
-        "render": "8"
-      },
-      "iconSize": {
-        "render": "40,40,center"
-      },
-      "color": {
-        "render": "#00f"
-      },
       "presets": [
         {
           "tags": [
@@ -230,13 +184,11 @@
           ],
           "title": {
             "en": "Hackerspace",
-            "de": "Hackerspace",
-            "it": "Hackerspace"
+            "de": "Hackerspace"
           },
           "description": {
             "en": "A hackerspace is an area where people interested in software gather",
-            "de": "Ein Hackerspace ist ein Ort, an dem sich Menschen treffen, die sich für Software interessieren",
-            "it": "Un hackerspace è un’area dove si ritrovano le persone interessate al software"
+            "de": "Ein Hackerspace ist ein Ort, an dem sich Menschen treffen, die sich für Software interessieren"
           }
         },
         {
@@ -246,24 +198,53 @@
           ],
           "title": {
             "en": "Makerspace",
-            "de": "Makerspace",
-            "it": "Makerspace"
+            "de": "Makerspace"
           },
           "description": {
             "en": "A makerspace is a place where DIY-enthusiasts gather to experiment with electronics such as arduino, LEDstrips, ...",
-            "de": "Ein Makerspace ist ein Ort, an dem Heimwerker-Enthusiasten zusammenkommen, um mit Elektronik zu experimentieren, wie Arduino, LED-Strips, ...",
-            "it": "Un makerspace è un luogo dove gli amanti del fai-da-te si ritrovano per sperimentare con dispositivi di elettronica come arduino, strisce LED, etc."
+            "de": "Ein Makerspace ist ein Ort, an dem Heimwerker-Enthusiasten zusammenkommen, um mit Elektronik zu experimentieren, wie Arduino, LED-Strips, ..."
           }
         }
       ],
-      "wayHandling": 2,
       "source": {
         "osmTags": {
           "and": [
             "leisure=hackerspace"
           ]
         }
-      }
+      },
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/hackerspaces/glider.svg",
+            "mappings": [
+              {
+                "if": {
+                  "and": [
+                    "hackerspace=makerspace"
+                  ]
+                },
+                "then": "./assets/themes/hackerspaces/led.png"
+              }
+            ]
+          },
+          "iconSize": {
+            "render": "40,40,center"
+          },
+          "location": [
+            "point",
+            "centroid"
+          ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "8"
+          }
+        }
+      ]
     }
   ]
 }

assets/themes/hailhydrant/hailhydrant.json

@@ -6,8 +6,8 @@
     "zh_Hant": "消防栓、滅火器、消防隊、以及急救站。",
     "ru": "Пожарные гидранты, огнетушители, пожарные станции и станции скорой помощи.",
     "fr": "Bornes incendies, extincteurs, casernes de pompiers et ambulanciers.",
-    "it": "Idranti, estintori, caserme dei vigili del fuoco e stazioni delle ambulanze.",
-    "nb_NO": "Hydranter, brannslukkere, brannstasjoner, og ambulansestasjoner."
+    "nb_NO": "Hydranter, brannslukkere, brannstasjoner, og ambulansestasjoner.",
+    "it": "Idranti, estintori, caserme dei vigili del fuoco e stazioni delle ambulanze."
   },
   "shortDescription": {
     "en": "Map to show hydrants, extinguishers, fire stations, and ambulance stations.",
@@ -15,8 +15,8 @@
     "zh_Hant": "顯示消防栓、滅火器、消防隊與急救站的地圖。",
     "ru": "Карта пожарных гидрантов, огнетушителей, пожарных станций и станций скорой помощи.",
     "fr": "Carte indiquant les bornes incendies, extincteurs, casernes de pompiers et ambulanciers.",
-    "de": "Hydranten, Feuerlöscher, Feuerwachen und Rettungswachen.",
-    "it": "Carta che mostra gli idranti, gli estintori, le caserme dei vigili del fuoco e le stazioni delle ambulanze."
+    "it": "Carta che mostra gli idranti, gli estintori, le caserme dei vigili del fuoco e le stazioni delle ambulanze.",
+    "de": "Hydranten, Feuerlöscher, Feuerwachen und Rettungswachen."
   },
   "description": {
     "en": "On this map you can find and update hydrants, fire stations, ambulance stations, and extinguishers in your favorite neighborhoods.\n\nYou can track your precise location (mobile only) and select layers that are relevant for you in the bottom left corner. You can also use this tool to add or edit pins (points of interest) to the map and provide additional details by answering available questions.\n\nAll changes you make will automatically be saved in the global database of OpenStreetMap and can be freely re-used by others.",
@@ -56,8 +56,7 @@
         "nb_NO": "Kart over brannhydranter",
         "ru": "Карта пожарных гидрантов",
         "fr": "Carte des bornes incendie",
-        "de": "Karte der Hydranten",
-        "it": "Mappa degli idranti"
+        "de": "Karte der Hydranten"
       },
       "minzoom": 14,
       "source": {
@@ -74,8 +73,7 @@
           "ja": "消火栓",
           "nb_NO": "Brannhydrant",
           "fr": "Bornes incendie",
-          "de": "Hydrant",
-          "it": "Idrante"
+          "de": "Hydrant"
         }
       },
       "description": {
@@ -85,8 +83,7 @@
         "nb_NO": "Kartlag for å vise brannhydranter.",
         "ru": "Слой карты, отображающий пожарные гидранты.",
         "fr": "Couche des bornes incendie.",
-        "de": "Kartenebene zur Anzeige von Hydranten.",
-        "it": "Livello della mappa che mostra gli idranti antincendio."
+        "de": "Kartenebene zur Anzeige von Hydranten."
       },
       "tagRenderings": [
         {
@@ -97,8 +94,7 @@
             "nb_NO": "Hvilken farge har brannhydranten?",
             "ru": "Какого цвета гидрант?",
             "fr": "Quelle est la couleur de la borne ?",
-            "de": "Welche Farbe hat der Hydrant?",
-            "it": "Qual è il colore dell’idrante?"
+            "de": "Welche Farbe hat der Hydrant?"
           },
           "render": {
             "en": "The hydrant color is {colour}",
@@ -106,8 +102,7 @@
             "nb_NO": "Brannhydranter er {colour}",
             "ru": "Цвет гидранта {colour}",
             "fr": "La borne est {colour}",
-            "de": "Der Hydrant hat die Farbe {colour}",
-            "it": "Il colore dell’idrante è {colour}"
+            "de": "Der Hydrant hat die Farbe {colour}"
           },
           "freeform": {
             "key": "colour"
@@ -124,8 +119,7 @@
                 "ja": "消火栓の色は不明です。",
                 "ru": "Цвет гидранта не определён.",
                 "fr": "La borne est de couleur inconnue.",
-                "de": "Die Farbe des Hydranten ist unbekannt.",
-                "it": "Il colore dell’idrante è sconosciuto."
+                "de": "Die Farbe des Hydranten ist unbekannt."
               },
               "hideInAnswer": true
             },
@@ -140,8 +134,7 @@
                 "ja": "消火栓の色は黄色です。",
                 "ru": "Гидрант жёлтого цвета.",
                 "fr": "La borne est jaune.",
-                "de": "Die Farbe des Hydranten ist gelb.",
-                "it": "Il colore dell’idrante è giallo."
+                "de": "Die Farbe des Hydranten ist gelb."
               }
             },
             {
@@ -209,8 +202,7 @@
                 "en": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Pillar type.",
                 "ja": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> ピラー型。",
                 "fr": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Pilier.",
-                "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Säulenart.",
-                "it": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Soprasuolo."
+                "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_pillar.svg\" /> Säulenart."
               }
             },
             {
@@ -223,8 +215,7 @@
                 "en": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Pipe type.",
                 "ja": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> パイプ型。",
                 "fr": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Tuyau.",
-                "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Rohrtyp.",
-                "it": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Tubo."
+                "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Rohrtyp."
               }
             },
             {
@@ -239,8 +230,7 @@
                 "ru": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Тип стены.",
                 "ja": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> 壁型。",
                 "fr": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Mural.",
-                "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Wandtyp.",
-                "it": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> A muro."
+                "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_unknown.svg\" /> Wandtyp."
               }
             },
             {
@@ -253,8 +243,7 @@
                 "en": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Underground type.",
                 "ja": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" />地下式。",
                 "fr": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Enterré.",
-                "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Untergrundtyp.",
-                "it": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Sottosuolo."
+                "de": "<img style=\"width:15px\" src=\"./assets/themes/hailhydrant/hydrant_underground.svg\" /> Untergrundtyp."
               }
             }
           ]
@@ -265,15 +254,13 @@
             "en": "Update the lifecycle status of the hydrant.",
             "ja": "消火栓のライフサイクルステータスを更新します。",
             "fr": "Mettre à jour l’état de la borne.",
-            "de": "Aktualisieren Sie den Lebenszyklusstatus des Hydranten.",
-            "it": "Aggiorna lo stato di funzionamento dell’idrante."
+            "de": "Aktualisieren Sie den Lebenszyklusstatus des Hydranten."
           },
           "render": {
             "en": "Lifecycle status",
             "ja": "ライフサイクルステータス",
             "fr": "État",
-            "de": "Lebenszyklus-Status",
-            "it": "Stato di funzionamento"
+            "de": "Lebenszyklus-Status"
           },
           "freeform": {
             "key": "disused:emergency"
@@ -290,8 +277,7 @@
                 "ja": "消火栓は(完全にまたは部分的に)機能しています。",
                 "ru": "Гидрант (полностью или частично) в рабочем состоянии.",
                 "fr": "La borne est en état, ou partiellement en état, de fonctionner.",
-                "de": "Der Hydrant ist (ganz oder teilweise) in Betrieb.",
-                "it": "L’idrante è (parzialmente o completamente) funzionante."
+                "de": "Der Hydrant ist (ganz oder teilweise) in Betrieb."
               }
             },
             {
@@ -305,8 +291,7 @@
                 "en": "The hydrant is unavailable.",
                 "ja": "消火栓は使用できません。",
                 "fr": "La borne est hors-service.",
-                "de": "Der Hydrant ist nicht verfügbar.",
-                "it": "L’idrante è fuori servizio."
+                "de": "Der Hydrant ist nicht verfügbar."
               }
             },
             {
@@ -321,26 +306,13 @@
                 "ja": "消火栓が撤去されました。",
                 "ru": "Гидрант демонтирован.",
                 "fr": "La borne a été retirée.",
-                "de": "Der Hydrant wurde entfernt.",
-                "it": "L’idrante è stato rimosso."
+                "de": "Der Hydrant wurde entfernt."
               }
             }
           ]
         },
         "images"
       ],
-      "icon": {
-        "render": "./assets/themes/hailhydrant/hydrant.svg"
-      },
-      "width": {
-        "render": "8"
-      },
-      "iconSize": {
-        "render": "20,20,center"
-      },
-      "color": {
-        "render": "#00f"
-      },
       "presets": [
         {
           "tags": [
@@ -352,19 +324,38 @@
             "ja": "消火栓",
             "nb_NO": "Brannhydrant",
             "fr": "Borne incendie",
-            "de": "Löschwasser-Hydrant",
-            "it": "Idrante antincendio"
+            "de": "Löschwasser-Hydrant"
           },
           "description": {
             "en": "A hydrant is a connection point where firefighters can tap water. It might be located underground.",
             "ja": "消火栓は消防士が水を汲み上げることができる接続点です。地下にあるかもしれません。",
             "fr": "Une borne incendie est un point où les pompiers peuvent s’alimenter en eau. Elle peut être enterrée.",
-            "de": "Ein Hydrant ist ein Anschlusspunkt, an dem die Feuerwehr Wasser zapfen kann. Er kann sich unterirdisch befinden.",
-            "it": "Un idrante è un punto di collegamento dove i pompieri possono estrarre acqua. Potrebbe trovarsi sottoterra."
+            "de": "Ein Hydrant ist ein Anschlusspunkt, an dem die Feuerwehr Wasser zapfen kann. Er kann sich unterirdisch befinden."
           }
         }
       ],
-      "wayHandling": 2
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/hailhydrant/hydrant.svg"
+          },
+          "iconSize": {
+            "render": "20,20,center"
+          },
+          "location": [
+            "point",
+            "centroid"
+          ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "8"
+          }
+        }
+      ]
     },
     {
       "id": "extinguisher",
@@ -374,8 +365,7 @@
         "nb_NO": "Kart over brannhydranter",
         "ru": "Карта огнетушителей.",
         "fr": "Couche des extincteurs.",
-        "de": "Karte mit Feuerlöschern.",
-        "it": "Cartina degli estintori."
+        "de": "Karte mit Feuerlöschern."
       },
       "minzoom": 14,
       "source": {
@@ -392,8 +382,7 @@
           "ja": "消火器",
           "nb_NO": "Brannslokkere",
           "fr": "Exctincteurs",
-          "de": "Feuerlöscher",
-          "it": "Estintori"
+          "de": "Feuerlöscher"
         }
       },
       "description": {
@@ -403,8 +392,7 @@
         "nb_NO": "Kartlag for å vise brannslokkere.",
         "ru": "Слой карты, отображающий огнетушители.",
         "fr": "Couche des lances à incendie.",
-        "de": "Kartenebene zur Anzeige von Hydranten.",
-        "it": "Livello della mappa che mostra gli idranti antincendio."
+        "de": "Kartenebene zur Anzeige von Hydranten."
       },
       "tagRenderings": [
         {
@@ -414,17 +402,14 @@
             "ja": "場所:{location}",
             "ru": "Местоположение: {location}",
             "fr": "Emplacement : {location}",
-            "de": "Standort: {location}",
-            "eo": "Loko: {location}",
-            "it": "Posizione: {location}"
+            "de": "Standort: {location}"
           },
           "question": {
             "en": "Where is it positioned?",
             "ja": "どこにあるんですか?",
             "ru": "Где это расположено?",
             "fr": "Où est-elle positionnée ?",
-            "de": "Wo befindet er sich?",
-            "it": "Dove è posizionato?"
+            "de": "Wo befindet er sich?"
           },
           "mappings": [
             {
@@ -438,8 +423,7 @@
                 "ja": "屋内にある。",
                 "ru": "Внутри.",
                 "fr": "Intérieur.",
-                "de": "Im Innenraum vorhanden.",
-                "it": "Si trova all’interno."
+                "de": "Im Innenraum vorhanden."
               }
             },
             {
@@ -453,8 +437,7 @@
                 "ja": "屋外にある。",
                 "ru": "Снаружи.",
                 "fr": "Extérieur.",
-                "de": "Im Außenraum vorhanden.",
-                "it": "Si trova all’esterno."
+                "de": "Im Außenraum vorhanden."
               }
             }
           ],
@@ -464,18 +447,6 @@
         },
         "images"
       ],
-      "icon": {
-        "render": "./assets/themes/hailhydrant/Twemoji12_1f9ef.svg"
-      },
-      "width": {
-        "render": "8"
-      },
-      "iconSize": {
-        "render": "20,20,center"
-      },
-      "color": {
-        "render": "#00f"
-      },
       "presets": [
         {
           "tags": [
@@ -487,20 +458,30 @@
             "nb_NO": "Brannslukker",
             "ru": "Огнетушитель",
             "fr": "Extincteur",
-            "de": "Feuerlöscher",
-            "it": "Estintore"
+            "de": "Feuerlöscher"
           },
           "description": {
             "en": "A fire extinguisher is a small, portable device used to stop a fire",
             "ja": "消火器は、火災を止めるために使用される小型で携帯可能な装置である",
             "ru": "Огнетушитель - небольшое переносное устройство для тушения огня",
             "fr": "Un extincteur est un appareil portatif servant à éteindre un feu",
-            "de": "Ein Feuerlöscher ist ein kleines, tragbares Gerät, das dazu dient, ein Feuer zu löschen",
-            "it": "Un estintore è un dispositivo portatile di piccole dimensioni usato per spegnere un incendio"
+            "de": "Ein Feuerlöscher ist ein kleines, tragbares Gerät, das dazu dient, ein Feuer zu löschen"
           }
         }
       ],
-      "wayHandling": 1
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/hailhydrant/Twemoji12_1f9ef.svg"
+          },
+          "iconSize": {
+            "render": "20,20,center"
+          },
+          "location": [
+            "point"
+          ]
+        }
+      ]
     },
     {
       "id": "fire_stations",
@@ -521,7 +502,6 @@
           ]
         }
       },
-      "wayHandling": 2,
       "title": {
         "render": {
           "en": "Fire Station",
@@ -560,8 +540,7 @@
             "ja": "このステーションの名前は{name}です。",
             "it": "Questa caserma si chiama {name}.",
             "ru": "Эта часть называется {name}.",
-            "fr": "Cette station s’appelle {name}.",
-            "nb_NO": "Denne stasjonen heter {name}."
+            "fr": "Cette station s’appelle {name}."
           }
         },
         {
@@ -580,8 +559,7 @@
             "en": "This station is along a highway called {addr:street}.",
             "ja": "{addr:street} 沿いにあります。",
             "ru": "Часть расположена вдоль шоссе {addr:street}.",
-            "fr": "La station fait partie de la {addr:street}.",
-            "it": "La stazione si trova in una strada chiamata {addr:street}."
+            "fr": "La station fait partie de la {addr:street}."
           }
         },
         {
@@ -590,8 +568,7 @@
             "en": "Where is the station located? (e.g. name of neighborhood, villlage, or town)",
             "ja": "このステーションの住所は?(例: 地区、村、または町の名称)",
             "ru": "Где расположена часть? (напр., название населённого пункта)",
-            "fr": "Dans quelle localité la station est-elle située ?",
-            "it": "In che località si trova la stazione? (ad es. quartiere, paese o città)"
+            "fr": "Dans quelle localité la station est-elle située ?"
           },
           "freeform": {
             "key": "addr:place"
@@ -600,8 +577,7 @@
             "en": "This station is found within {addr:place}.",
             "ja": "このステーションは{addr:place}にあります。",
             "ru": "Эта часть расположена в {addr:place}.",
-            "fr": "La station fait partie de {addr:place}.",
-            "it": "La stazione si trova a {addr:place}."
+            "fr": "La station fait partie de {addr:place}."
           }
         },
         {
@@ -609,14 +585,12 @@
           "question": {
             "en": "What agency operates this station?",
             "ja": "このステーションを運営しているのはどこですか?",
-            "fr": "Quel est l’exploitant de la station ?",
-            "it": "Quale agenzia gestisce questa stazione?"
+            "fr": "Quel est l’exploitant de la station ?"
           },
           "render": {
             "en": "This station is operated by {operator}.",
             "ja": "このステーションは{operator}によって運営されています。",
-            "fr": "Cette station est opérée par {operator}.",
-            "it": "Questa stazione è gestita da {operator}."
+            "fr": "Cette station est opérée par {operator}."
           },
           "freeform": {
             "key": "operator"
@@ -632,9 +606,7 @@
               "then": {
                 "en": "Bureau of Fire Protection",
                 "ja": "消防局(消防庁)",
-                "fr": "Brigade de Protection du Feu",
-                "de": "Brandschutzbehörde",
-                "it": "Servizio antincendio governativo"
+                "fr": "Brigade de Protection du Feu"
               }
             }
           ]
@@ -644,14 +616,12 @@
           "question": {
             "en": "How is the station operator classified?",
             "ja": "ステーションの運営の分類は?",
-            "fr": "Quel est le type d’exploitant ?",
-            "it": "Com’è classificato il gestore di questa stazione?"
+            "fr": "Quel est le type d’exploitant ?"
           },
           "render": {
             "en": "The operator is a(n) {operator:type} entity.",
             "ja": "運営者は、{operator:type} です。",
-            "fr": "L’exploitant est de type {operator:type}.",
-            "it": "Il gestore è un ente {operator:type}."
+            "fr": "L’exploitant est de type {operator:type}."
           },
           "freeform": {
             "key": "operator:type"
@@ -666,9 +636,7 @@
               "then": {
                 "en": "The station is operated by the government.",
                 "ja": "ステーションは自治体が運営する。",
-                "fr": "La station est opérée par le gouvernement.",
-                "it": "Questa stazione è gestita dal governo.",
-                "nb_NO": "Stasjonen drives av myndighetene."
+                "fr": "La station est opérée par le gouvernement."
               }
             },
             {
@@ -680,8 +648,7 @@
               "then": {
                 "en": "The station is operated by a community-based, or informal organization.",
                 "ja": "任意団体やコミュニティが運営しているステーションである。",
-                "fr": "La station est opérée par une organisation informelle.",
-                "it": "Questa stazione è gestita dalla comunità oppure un’associazione informale."
+                "fr": "La station est opérée par une organisation informelle."
               }
             },
             {
@@ -693,8 +660,7 @@
               "then": {
                 "en": "The station is operated by a formal group of volunteers.",
                 "ja": "公益団体が運営しているステーションである。",
-                "fr": "La station est opérée par un groupe officiel de bénévoles.",
-                "it": "Questa stazione è gestita da un gruppo di volontari ufficiale."
+                "fr": "La station est opérée par un groupe officiel de bénévoles."
               }
             },
             {
@@ -706,26 +672,13 @@
               "then": {
                 "en": "The station is privately operated.",
                 "ja": "個人が運営しているステーションである。",
-                "fr": "La station est opérée par un groupe privé.",
-                "it": "Questa stazione è gestita da privati."
+                "fr": "La station est opérée par un groupe privé."
               }
             }
           ]
         },
         "images"
       ],
-      "icon": {
-        "render": "./assets/themes/hailhydrant/Twemoji12_1f692.svg"
-      },
-      "width": {
-        "render": "1"
-      },
-      "iconSize": {
-        "render": "35,35,center"
-      },
-      "color": {
-        "render": "#c22"
-      },
       "presets": [
         {
           "tags": [
@@ -736,16 +689,35 @@
             "ja": "消防署",
             "ru": "Пожарная часть",
             "fr": "Caserne de pompiers",
-            "de": "Feuerwache",
-            "it": "Caserma dei vigili del fuoco",
-            "nb_NO": "Brannstasjon"
+            "de": "Feuerwache"
           },
           "description": {
             "en": "A fire station is a place where the fire trucks and firefighters are located when not in operation.",
             "ja": "消防署は、運転していないときに消防車や消防士がいる場所です。",
             "fr": "Une caserne de pompiers est un lieu où les pompiers et leur équipements sont situés en dehors des missions.",
-            "de": "Eine Feuerwache ist ein Ort, an dem die Feuerwehrfahrzeuge und die Feuerwehrleute untergebracht sind, wenn sie nicht im Einsatz sind.",
-            "it": "Una caserma dei pompieri è un luogo dove si trovano i mezzi antincendio e i pompieri tra una missione e l’altra."
+            "de": "Eine Feuerwache ist ein Ort, an dem die Feuerwehrfahrzeuge und die Feuerwehrleute untergebracht sind, wenn sie nicht im Einsatz sind."
+          }
+        }
+      ],
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/hailhydrant/Twemoji12_1f692.svg"
+          },
+          "iconSize": {
+            "render": "35,35,center"
+          },
+          "location": [
+            "point",
+            "centroid"
+          ]
+        },
+        {
+          "color": {
+            "render": "#c22"
+          },
+          "width": {
+            "render": "1"
           }
         }
       ]
@@ -756,9 +728,7 @@
         "en": "Map of ambulance stations",
         "ja": "救急ステーションの地図",
         "ru": "Карта станций скорой помощи",
-        "fr": "Couche des ambulances",
-        "de": "Karte der Rettungswachen",
-        "it": "Carta delle stazioni delle ambulanze"
+        "fr": "Couche des ambulances"
       },
       "minzoom": 12,
       "source": {
@@ -773,17 +743,13 @@
           "en": "Ambulance Station",
           "ru": "Станция скорой помощи",
           "ja": "救急ステーション",
-          "fr": "Station d’ambulances",
-          "de": "Rettungswache",
-          "it": "Stazione delle ambulanze"
+          "fr": "Station d’ambulances"
         }
       },
       "description": {
         "en": "An ambulance station is an area for storage of ambulance vehicles, medical equipment, personal protective equipment, and other medical supplies.",
         "ja": "救急ステーションは、救急車、医療機器、個人用保護具、およびその他の医療用品を保管する場所です。",
-        "fr": "Une station d’ambulance est un lieu où sont stockés les véhicules d’urgence ainsi que de l’équipement médical.",
-        "de": "Eine Rettungswache ist ein Ort, an dem Rettungsfahrzeuge, medizinische Ausrüstung, persönliche Schutzausrüstung und anderes medizinisches Material untergebracht sind.",
-        "it": "La stazione delle ambulanze è un’area per lo stoccaggio delle ambulanze, dell’equipaggiamento medico, dei dispositivi di protezione individuale e di altre forniture medicali."
+        "fr": "Une station d’ambulance est un lieu où sont stockés les véhicules d’urgence ainsi que de l’équipement médical."
       },
       "tagRenderings": [
         {
@@ -795,15 +761,13 @@
             "en": "What is the name of this ambulance station?",
             "ja": "この救急ステーションの名前は何ですか?",
             "ru": "Как называется эта станция скорой помощи?",
-            "fr": "Quel est le nom de cette station ?",
-            "it": "Qual è il nome di questa stazione delle ambulanze?"
+            "fr": "Quel est le nom de cette station ?"
           },
           "render": {
             "en": "This station is called {name}.",
             "ja": "このステーションの名前は{name}です。",
             "ru": "Эта станция называется {name}.",
-            "fr": "Cette station s’appelle {name}.",
-            "it": "Questa stazione è chiamata {name}."
+            "fr": "Cette station s’appelle {name}."
           }
         },
         {
@@ -815,15 +779,13 @@
             "en": " What is the street name where the station located?",
             "ja": " 救急ステーションの所在地はどこですか?",
             "ru": " По какому адресу расположена эта станция?",
-            "fr": " Quel est le nom de la rue où la station se situe ?",
-            "it": " Come si chiama la strada in cui si trova questa stazione?"
+            "fr": " Quel est le nom de la rue où la station se situe ?"
           },
           "render": {
             "en": "This station is along a highway called {addr:street}.",
             "ja": "{addr:street} 沿いにあります。",
             "ru": "Эта станция расположена вдоль шоссе {addr:street}.",
-            "fr": "La station fait partie de {addr:street}.",
-            "it": "Questa stazione si trova in {addr:street}."
+            "fr": "La station fait partie de {addr:street}."
           }
         },
         {
@@ -832,8 +794,7 @@
             "en": "Where is the station located? (e.g. name of neighborhood, villlage, or town)",
             "ja": "このステーションの住所は?(例: 地区、村、または町の名称)",
             "ru": "Где расположена станция? (напр., название населённого пункта)",
-            "fr": "Dans quelle localité la station est-elle située ?",
-            "it": "Dove si trova la stazione? (ad es. quartiere, paese o città)"
+            "fr": "Dans quelle localité la station est-elle située ?"
           },
           "freeform": {
             "key": "addr:place"
@@ -841,8 +802,7 @@
           "render": {
             "en": "This station is found within {addr:place}.",
             "ja": "このステーションは{addr:place}にあります。",
-            "fr": "La station fait partie de {addr:place}.",
-            "it": "La stazione si trova a {addr:place}."
+            "fr": "La station fait partie de {addr:place}."
           }
         },
         {
@@ -850,14 +810,12 @@
           "question": {
             "en": "What agency operates this station?",
             "ja": "このステーションを運営しているのはどこですか?",
-            "fr": "Quel est l’exploitant de la station ?",
-            "it": "Quale agenzia gestisce questa stazione?"
+            "fr": "Quel est l’exploitant de la station ?"
           },
           "render": {
             "en": "This station is operated by {operator}.",
             "ja": "このステーションは{operator}によって運営されています。",
-            "fr": "Cette station est opérée par {operator}.",
-            "it": "Questa stazione è gestita da {operator}."
+            "fr": "Cette station est opérée par {operator}."
           },
           "freeform": {
             "key": "operator"
@@ -869,14 +827,12 @@
           "question": {
             "en": "How is the station operator classified?",
             "ja": "ステーションの運営の分類は?",
-            "fr": "Quel est le type d’exploitant ?",
-            "it": "Com’è classificato il gestore della stazione?"
+            "fr": "Quel est le type d’exploitant ?"
           },
           "render": {
             "en": "The operator is a(n) {operator:type} entity.",
             "ja": "運営者は、{operator:type} です。",
-            "fr": "L’exploitant est de type {operator:type}.",
-            "it": "L’operatore è un ente {operator:type}."
+            "fr": "L’exploitant est de type {operator:type}."
           },
           "freeform": {
             "key": "operator:type"
@@ -891,8 +847,7 @@
               "then": {
                 "en": "The station is operated by the government.",
                 "ja": "ステーションは自治体が運営する。",
-                "fr": "La station est opérée par le gouvernement.",
-                "it": "La stazione è gestita dal governo."
+                "fr": "La station est opérée par le gouvernement."
               }
             },
             {
@@ -904,8 +859,7 @@
               "then": {
                 "en": "The station is operated by a community-based, or informal organization.",
                 "ja": "任意団体やコミュニティが運営しているステーションである。",
-                "fr": "La station est opérée par une organisation informelle.",
-                "it": "La stazione è gestita dalla comunità o un’organizzazione non ufficiale."
+                "fr": "La station est opérée par une organisation informelle."
               }
             },
             {
@@ -917,8 +871,7 @@
               "then": {
                 "en": "The station is operated by a formal group of volunteers.",
                 "ja": "公益団体が運営しているステーションである。",
-                "fr": "La station est opérée par un groupe officiel de bénévoles.",
-                "it": "La stazione è gestita da un gruppo ufficiale di volontari."
+                "fr": "La station est opérée par un groupe officiel de bénévoles."
               }
             },
             {
@@ -930,26 +883,13 @@
               "then": {
                 "en": "The station is privately operated.",
                 "ja": "個人が運営しているステーションである。",
-                "fr": "La station est opérée par un groupe privé.",
-                "it": "La stazione è gestita da un privato."
+                "fr": "La station est opérée par un groupe privé."
               }
             }
           ]
         },
         "images"
       ],
-      "icon": {
-        "render": "./assets/themes/hailhydrant/Twemoji_1f691.svg"
-      },
-      "width": {
-        "render": "1"
-      },
-      "iconSize": {
-        "render": "35,35,center"
-      },
-      "color": {
-        "render": "#00f"
-      },
       "presets": [
         {
           "tags": [
@@ -959,21 +899,39 @@
             "en": "Ambulance station",
             "ru": "Станция скорой помощи",
             "ja": "救急ステーション(消防署)",
-            "fr": "Station d’ambulances",
-            "de": "Rettungswache",
-            "it": "Stazione delle ambulanze"
+            "fr": "Station d’ambulances"
           },
           "description": {
             "en": "Add an ambulance station to the map",
             "ja": "救急ステーション(消防署)をマップに追加する",
             "ru": "Добавить станцию скорой помощи на карту",
             "fr": "Ajouter une station d’ambulances à la carte",
-            "de": "Eine Rettungsstation der Karte hinzufügen",
-            "it": "Aggiungi una stazione delle ambulanza alla mappa"
+            "de": "Eine Rettungsstation der Karte hinzufügen"
           }
         }
       ],
-      "wayHandling": 2
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/hailhydrant/Twemoji_1f691.svg"
+          },
+          "iconSize": {
+            "render": "35,35,center"
+          },
+          "location": [
+            "point",
+            "centroid"
+          ]
+        },
+        {
+          "color": {
+            "render": "#00f"
+          },
+          "width": {
+            "render": "1"
+          }
+        }
+      ]
     }
   ],
   "defaultBackgroundId": "HDM_HOT"

assets/themes/natuurpunt/natuurpunt.json

@@ -5,8 +5,8 @@
     "nl": "Natuurgebieden",
     "en": "Nature Reserves",
     "de": "Naturschutzgebiete",
-    "it": "Riserve naturali",
-    "nb_NO": "Naturreservater"
+    "nb_NO": "Naturreservater",
+    "it": "Riserve naturali"
   },
   "shortDescription": {
     "nl": "Deze kaart toont de natuurgebieden van Natuurpunt",
@@ -17,8 +17,8 @@
   "description": {
     "nl": "Op deze kaart vind je alle natuurgebieden die Natuurpunt ter beschikking stelt",
     "en": "On this map you can find all the nature reserves that Natuurpunt offers ",
-    "de": "Auf dieser Karte können Sie alle Naturschutzgebiete von Natuurpunt finden ",
-    "it": "In questa cartina è possibile trovare tutte le riserve naturali offerte da Natuupunt. "
+    "it": "In questa cartina è possibile trovare tutte le riserve naturali offerte da Natuupunt. ",
+    "de": "Auf dieser Karte können Sie alle Naturschutzgebiete von Natuurpunt finden "
   },
   "language": [
     "nl",
@@ -42,9 +42,9 @@
   "enablePdfDownload": true,
   "enableDownload": true,
   "hideFromOverview": true,
-  "#": "Disable clustering for this theme",
   "clustering": {
-    "maxZoom": 0
+    "maxZoom": 0,
+    "#": "Disable clustering for this theme"
   },
   "layers": [
     {

assets/themes/openwindpowermap/openwindpowermap.json

@@ -37,56 +37,39 @@
         "en": "wind turbine",
         "nl": "windturbine",
         "fr": "Éolienne",
-        "de": "Windrad",
-        "it": "pala eolica"
+        "de": "Windrad"
       },
       "source": {
         "osmTags": "generator:source=wind"
       },
       "minzoom": 10,
-      "wayHandling": 1,
       "title": {
         "render": {
           "en": "wind turbine",
           "nl": "windturbine",
           "fr": "éolienne",
-          "de": "Windrad",
-          "it": "pala eolica"
+          "de": "Windrad"
         },
         "mappings": [
           {
             "if": "name~*",
             "then": {
               "en": "{name}",
-              "fr": "{name}",
-              "eo": "{name}",
-              "it": "{name}"
+              "fr": "{name}"
             }
           }
         ]
       },
-      "icon": "./assets/themes/openwindpowermap/wind_turbine.svg",
-      "iconSize": "40, 40, bottom",
-      "label": {
-        "mappings": [
-          {
-            "if": "generator:output:electricity~^[0-9]+.*[W]$",
-            "then": "<div style='background-color: rgba(0,0,0,0.3); color: white; font-size: 8px; padding: 0.25em; border-radius:0.5em'>{generator:output:electricity}</div>"
-          }
-        ]
-      },
       "tagRenderings": [
         {
           "id": "turbine-output",
           "render": {
             "en": "The power output of this wind turbine is {generator:output:electricity}.",
-            "fr": "La puissance générée par cette éolienne est de {generator:output:electricity}.",
-            "it": "La potenza generata da questa pala eolica è {generator:output:electricity}."
+            "fr": "La puissance générée par cette éolienne est de {generator:output:electricity}."
           },
           "question": {
             "en": "What is the power output of this wind turbine? (e.g. 2.3 MW)",
-            "fr": "Quel est la puissance générée par cette éolienne ?",
-            "it": "Quant’è la potenza generata da questa pala eolica? (ad es. 2.3 MW)"
+            "fr": "Quel est la puissance générée par cette éolienne ?"
           },
           "freeform": {
             "key": "generator:output:electricity",
@@ -97,13 +80,11 @@
           "id": "turbine-operator",
           "render": {
             "en": "This wind turbine is operated by {operator}.",
-            "fr": "Cette éolienne est opérée par {operator}.",
-            "it": "Questa pala eolica è gestita da {operator}."
+            "fr": "Cette éolienne est opérée par {operator}."
           },
           "question": {
             "en": "Who operates this wind turbine?",
-            "fr": "Qui est l’exploitant de cette éolienne ?",
-            "it": "Chi gestisce questa pala eolica?"
+            "fr": "Qui est l’exploitant de cette éolienne ?"
           },
           "freeform": {
             "key": "operator"
@@ -113,13 +94,11 @@
           "id": "turbine-height",
           "render": {
             "en": "The total height (including rotor radius) of this wind turbine is {height} metres.",
-            "fr": "La hauteur totale, incluant les pales, est de {height} mètres.",
-            "it": "L’altezza totale (raggio del rotore incluso) di questa pala eolica è di {height} metri."
+            "fr": "La hauteur totale, incluant les pales, est de {height} mètres."
           },
           "question": {
             "en": "What is the total height of this wind turbine (including rotor radius), in metres?",
-            "fr": "Quelle est la hauteur totale de l’éolienne en mètres, pales incluses ?",
-            "it": "Qual è l’altezza (in metri e raggio del rotore incluso) di questa pala eolica?"
+            "fr": "Quelle est la hauteur totale de l’éolienne en mètres, pales incluses ?"
           },
           "freeform": {
             "key": "height",
@@ -130,13 +109,11 @@
           "id": "turbine-diameter",
           "render": {
             "en": "The rotor diameter of this wind turbine is {rotor:diameter} metres.",
-            "fr": "Le diamètre du rotor est de {rotor:diameter} mètres.",
-            "it": "Il diametro del rotore di questa pala eolica è di {rotor:diameter} metri."
+            "fr": "Le diamètre du rotor est de {rotor:diameter} mètres."
           },
           "question": {
             "en": "What is the rotor diameter of this wind turbine, in metres?",
-            "fr": "Quel est le diamètre du rotor en mètres ?",
-            "it": "Qual è il diametro (in metri) del rotore di questa pala eolica?"
+            "fr": "Quel est le diamètre du rotor en mètres ?"
           },
           "freeform": {
             "key": "rotor:diameter",
@@ -147,13 +124,11 @@
           "id": "turbine-start-date",
           "render": {
             "en": "This wind turbine went into operation on/in {start_date}.",
-            "fr": "L’éolienne est active depuis {start_date}.",
-            "it": "Questa pala eolica è entrata in funzione in data {start_date}."
+            "fr": "L’éolienne est active depuis {start_date}."
           },
           "question": {
             "en": "When did this wind turbine go into operation?",
-            "fr": "Depuis quand l’éolienne est-elle en fonctionnement ?",
-            "it": "Quando è entrata in funzione questa pala eolica?"
+            "fr": "Depuis quand l’éolienne est-elle en fonctionnement ?"
           },
           "freeform": {
             "key": "start_date",
@@ -172,8 +147,7 @@
             "en": "wind turbine",
             "nl": "windturbine",
             "fr": "Éolienne",
-            "de": "Windrad",
-            "it": "pala eolica"
+            "de": "Windrad"
           }
         }
       ],
@@ -193,9 +167,7 @@
                 "en": " megawatts",
                 "nl": " megawatt",
                 "fr": " megawatts",
-                "de": " Megawatt",
-                "eo": " megavatoj",
-                "it": " megawatt"
+                "de": " Megawatt"
               }
             },
             {
@@ -208,10 +180,7 @@
                 "en": " kilowatts",
                 "nl": " kilowatt",
                 "fr": " kilowatts",
-                "de": " Kilowatt",
-                "eo": " kilovatoj",
-                "it": " kilowatt",
-                "nb_NO": " kilowatt"
+                "de": " Kilowatt"
               }
             },
             {
@@ -224,9 +193,7 @@
                 "en": " watts",
                 "nl": " watt",
                 "fr": " watts",
-                "de": " Watt",
-                "eo": " vatoj",
-                "it": " watt"
+                "de": " Watt"
               }
             },
             {
@@ -239,9 +206,7 @@
                 "en": " gigawatts",
                 "nl": " gigawatt",
                 "fr": " gigawatts",
-                "de": " Gigawatt",
-                "eo": " gigavatoj",
-                "it": " gigawatt"
+                "de": " Gigawatt"
               }
             }
           ],
@@ -262,13 +227,28 @@
                 "en": " meter",
                 "nl": " meter",
                 "fr": " mètres",
-                "de": " Meter",
-                "eo": " metro",
-                "it": " metri"
+                "de": " Meter"
               }
             }
           ]
         }
+      ],
+      "mapRendering": [
+        {
+          "icon": "./assets/themes/openwindpowermap/wind_turbine.svg",
+          "label": {
+            "mappings": [
+              {
+                "if": "generator:output:electricity~^[0-9]+.*[W]$",
+                "then": "<div style='background-color: rgba(0,0,0,0.3); color: white; font-size: 8px; padding: 0.25em; border-radius:0.5em'>{generator:output:electricity}</div>"
+              }
+            ]
+          },
+          "iconSize": "40, 40, bottom",
+          "location": [
+            "point"
+          ]
+        }
       ]
     }
   ],

assets/themes/postboxes/postboxes.json

@@ -3,8 +3,8 @@
   "title": {
     "en": "Postbox and Post Office Map",
     "de": "Karte mit Briefkästen und Poststellen",
-    "it": "Buche delle lettere e uffici postali",
-    "nb_NO": "Postboks og postkontor-kart"
+    "nb_NO": "Postboks og postkontor-kart",
+    "it": "Buche delle lettere e uffici postali"
   },
   "shortDescription": {
     "en": "A map showing postboxes and post offices",
@@ -38,9 +38,7 @@
       "id": "postboxes",
       "name": {
         "en": "Postboxes",
-        "de": "Brieflästen",
-        "it": "Buche delle lettere",
-        "nb_NO": "Postbokser"
+        "de": "Brieflästen"
       },
       "minzoom": 12,
       "source": {
@@ -49,16 +47,12 @@
       "title": {
         "render": {
           "en": "Postbox",
-          "de": "Briefkasten",
-          "it": "Buca delle lettere",
-          "nb_NO": "Postboks"
+          "de": "Briefkasten"
         }
       },
       "description": {
         "en": "The layer showing postboxes.",
-        "de": "Die Ebene zeigt Briefkästen.",
-        "it": "Il livello che mostra le buche delle lettere.",
-        "nb_NO": "Laget viser postbokser."
+        "de": "Die Ebene zeigt Briefkästen."
       },
       "tagRenderings": [
         "images",
@@ -67,18 +61,6 @@
           "render": "{minimap(18): height: 5rem; overflow: hidden; border-radius:3rem; }"
         }
       ],
-      "icon": {
-        "render": "./assets/themes/postboxes/postbox.svg"
-      },
-      "width": {
-        "render": "1"
-      },
-      "iconSize": {
-        "render": "40,40,bottom"
-      },
-      "color": {
-        "render": "#DADADA"
-      },
       "presets": [
         {
           "tags": [
@@ -86,13 +68,10 @@
           ],
           "title": {
             "en": "postbox",
-            "de": "Briefkasten",
-            "it": "Buca delle lettere",
-            "nb_NO": "postboks"
+            "de": "Briefkasten"
           }
         }
       ],
-      "wayHandling": 2,
       "deletion": {
         "softDeletionTags": {
           "and": [
@@ -100,15 +79,35 @@
             "razed:amenity=post_box"
           ]
         }
-      }
+      },
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/postboxes/postbox.svg"
+          },
+          "iconSize": {
+            "render": "40,40,bottom"
+          },
+          "location": [
+            "point",
+            "centroid"
+          ]
+        },
+        {
+          "color": {
+            "render": "#DADADA"
+          },
+          "width": {
+            "render": "1"
+          }
+        }
+      ]
     },
     {
       "id": "postoffices",
       "name": {
         "en": "Post offices",
-        "de": "Poststellen",
-        "it": "Uffici postali",
-        "nb_NO": "Postkontor"
+        "de": "Poststellen"
       },
       "minzoom": 12,
       "source": {
@@ -117,16 +116,12 @@
       "title": {
         "render": {
           "en": "Post Office",
-          "de": "Poststelle",
-          "it": "Ufficio postale",
-          "nb_NO": "Postkontor"
+          "de": "Poststelle"
         }
       },
       "description": {
         "en": "A layer showing post offices.",
-        "de": "Eine Ebene mit Postämtern.",
-        "it": "Un livello che mostra gli uffici postali.",
-        "nb_NO": "Et lag som viser postkontor."
+        "de": "Eine Ebene mit Postämtern."
       },
       "tagRenderings": [
         "images",
@@ -136,49 +131,27 @@
         },
         {
           "render": {
-            "en": "Opening Hours: {opening_hours_table()}",
-            "it": "Orari di apertura: {opening_hours_table()}"
+            "en": "Opening Hours: {opening_hours_table()}"
           },
           "freeform": {
             "key": "opening_hours",
             "type": "opening_hours"
           },
           "question": {
-            "en": "What are the opening hours for this post office?",
-            "it": "Quali sono gli orari di apertura di questo ufficio postale?"
+            "en": "What are the opening hours for this post office?"
           },
           "mappings": [
             {
               "if": "opening_hours=24/7",
               "then": {
                 "en": "24/7 opened (including holidays)",
-                "de": "durchgehend geöffnet (auch an Feiertagen)",
-                "it": "aperto 24/24h (feste incluse)"
+                "de": "durchgehend geöffnet (auch an Feiertagen)"
               }
             }
           ],
           "id": "OH"
         }
       ],
-      "icon": {
-        "render": "square:white;./assets/themes/postboxes/post_office.svg"
-      },
-      "iconOverlays": [
-        {
-          "if": "opening_hours~*",
-          "then": "isOpen",
-          "badge": true
-        }
-      ],
-      "width": {
-        "render": "1"
-      },
-      "iconSize": {
-        "render": "40,40,bottom"
-      },
-      "color": {
-        "render": "#DADADA"
-      },
       "presets": [
         {
           "tags": [
@@ -186,13 +159,10 @@
           ],
           "title": {
             "en": "Post Office",
-            "de": "Poststelle",
-            "it": "Ufficio postale",
-            "nb_NO": "Postkontor"
+            "de": "Poststelle"
           }
         }
       ],
-      "wayHandling": 2,
       "filter": [
         {
           "id": "is_open",
@@ -200,13 +170,40 @@
             {
               "question": {
                 "en": "Currently open",
-                "de": "Aktuell geöffnet",
-                "it": "Aperto adesso"
+                "de": "Aktuell geöffnet"
               },
               "osmTags": "_isOpen=yes"
             }
           ]
         }
+      ],
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "square:white;./assets/themes/postboxes/post_office.svg"
+          },
+          "iconBadges": [
+            {
+              "if": "opening_hours~*",
+              "then": "isOpen"
+            }
+          ],
+          "iconSize": {
+            "render": "40,40,bottom"
+          },
+          "location": [
+            "point",
+            "centroid"
+          ]
+        },
+        {
+          "color": {
+            "render": "#DADADA"
+          },
+          "width": {
+            "render": "1"
+          }
+        }
       ]
     }
   ]

assets/themes/sidewalks/sidewalks.json

@@ -0,0 +1,181 @@
+{
+  "id": "sidewalks",
+  "title": {
+    "en": "Sidewalks"
+  },
+  "shortDescription": {
+    "en": "Sidewalk mapping"
+  },
+  "description": {
+    "en": "Experimental theme"
+  },
+  "language": [
+    "en"
+  ],
+  "maintainer": "",
+  "icon": "./assets/svg/bug.svg",
+  "version": "0",
+  "startLat": 0,
+  "startLon": 0,
+  "startZoom": 1,
+  "widenFactor": 0.05,
+  "socialImage": "",
+  "hideFromOverview": true,
+  "layers": [
+    {
+      "id": "sidewalks",
+      "name": {
+        "en": "Sidewalks"
+      },
+      "minzoom": 12,
+      "source": {
+        "osmTags": {
+          "or": [
+            "highway=residential",
+            "highway=unclassified",
+            "highway=tertiary",
+            "highway=secondary"
+          ]
+        }
+      },
+      "title": {
+        "render": {
+          "en": "{name}"
+        },
+        "mappings": [
+          {
+            "if": "name=",
+            "then": "Nameless street"
+          }
+        ]
+      },
+      "description": {
+        "en": "Layer showing sidewalks of highways"
+      },
+      "tagRenderings": [
+        {
+          "id": "streetname",
+          "render": {
+            "en": "This street is named {name}"
+          }
+        },
+        {
+          "rewrite": {
+            "sourceString": "left|right",
+            "into": [
+              "left",
+              "right"
+            ]
+          },
+          "renderings": [
+            {
+              "id": "sidewalk_minimap",
+              "render": "{sided_minimap(left|right):height:8rem;border-radius:0.5rem;overflow:hidden}"
+            },
+            {
+              "id": "has_sidewalk",
+              "question": "Is there a sidewalk on this side of the road?",
+              "mappings": [
+                {
+                  "if": "sidewalk:left|right=yes",
+                  "then": "Yes, there is a sidewalk on this side of the road"
+                },
+                {
+                  "if": "sidewalk:left|right=no",
+                  "then": "No, there is no seperated sidewalk to walk on"
+                }
+              ]
+            },
+            {
+              "id": "sidewalk_width",
+              "question": "What is the width of the sidewalk on this side of the road?",
+              "render": "This sidewalk is {sidewalk:left|right:width}m wide",
+              "condition": "sidewalk:left|right=yes",
+              "freeform": {
+                "key": "sidewalk:left|right:width",
+                "type": "length",
+                "helperArgs": [
+                  "21",
+                  "map"
+                ]
+              }
+            }
+          ]
+        }
+      ],
+      "mapRendering": [
+        {
+          "location": [
+            "start",
+            "end"
+          ],
+          "icon": "circle:#ccc",
+          "iconSize": "20,20,center"
+        },
+        {
+          "#": "The center line",
+          "color": "#ffffff55",
+          "width": 8
+        },
+        {
+          "#": "left",
+          "color": {
+            "render": "#888"
+          },
+          "dashArray": {
+            "render": "",
+            "mappings": [
+              {
+                "if": "sidewalk:left=",
+                "then": "1,12"
+              }
+            ]
+          },
+          "width": {
+            "render": 6,
+            "mappings": [
+              {
+                "if": {
+                  "or": [
+                    "sidewalk:left=no",
+                    "sidewalk:left=separate"
+                  ]
+                },
+                "then": 0
+              }
+            ]
+          },
+          "offset": -6
+        },
+        {
+          "color": "#888",
+          "dashArray": {
+            "render": "",
+            "mappings": [
+              {
+                "if": "sidewalk:right=",
+                "then": "1,12"
+              }
+            ]
+          },
+          "width": {
+            "render": 6,
+            "mappings": [
+              {
+                "if": {
+                  "or": [
+                    "sidewalk:right=no",
+                    "sidewalk:right=separate"
+                  ]
+                },
+                "then": 0
+              }
+            ]
+          },
+          "offset": 6
+        }
+      ],
+      "allowSplit": true
+    }
+  ]
+}

assets/themes/speelplekken/speelplekken.json

@@ -36,7 +36,15 @@
       "color": "#444444",
       "width": {
         "render": "1"
-      }
+      },
+      "mapRendering": [
+        {
+          "color": "#444444",
+          "width": {
+            "render": "1"
+          }
+        }
+      ]
     },
     {
       "builtin": "play_forest",
@@ -252,7 +260,33 @@
       },
       "width": {
         "render": "9"
-      }
+      },
+      "mapRendering": [
+        {
+          "icon": "./assets/themes/speelplekken/walking_route.svg",
+          "location": [
+            "point"
+          ]
+        },
+        {
+          "color": {
+            "render": "#6d6",
+            "mappings": [
+              {
+                "if": "color~*",
+                "then": "{color}"
+              },
+              {
+                "if": "colour~*",
+                "then": "{colour}"
+              }
+            ]
+          },
+          "width": {
+            "render": "9"
+          }
+        }
+      ]
     }
   ],
   "clustering": {

assets/themes/street_lighting/street_lighting.json

@@ -0,0 +1,179 @@
+{
+  "id": "street_lighting",
+  "maintainer": "Robin van der Linde",
+  "version": "2021-10-22",
+  "language": [
+    "en",
+    "nl"
+  ],
+  "title": {
+    "en": "Street Lighting",
+    "nl": "Straatverlichting"
+  },
+  "description": {
+    "en": "On this map you can find everything about street lighting",
+    "nl": "Op deze kaart vind je alles over straatlantaarns"
+  },
+  "icon": "./assets/layers/street_lamps/street_lamp.svg",
+  "startZoom": 19,
+  "startLat": 52.99319,
+  "startLon": 6.56113,
+  "layers": [
+    "street_lamps",
+    {
+      "id": "lit_streets",
+      "name": {
+        "en": "Lit streets",
+        "nl": "Verlichte straten"
+      },
+      "source": {
+        "osmTags": {
+          "and": [
+            "highway!=",
+            "lit!=no",
+            "lit!=",
+            "service!=driveway"
+          ]
+        }
+      },
+      "minZoom": 16,
+      "title": {
+        "render": {
+          "en": "Lit street",
+          "nl": "Verlichte straat"
+        },
+        "mappings": [
+          {
+            "if": "name~*",
+            "then": "{name}"
+          }
+        ]
+      },
+      "mapRendering": [
+        {
+          "color": "#ff0"
+        }
+      ],
+      "tagRenderings": [
+        {
+          "id": "lit",
+          "question": {
+            "en": "Is this street lit?",
+            "nl": "Is deze straat verlicht?"
+          },
+          "mappings": [
+            {
+              "if": "lit=yes",
+              "then": {
+                "en": "This street is lit",
+                "nl": "Deze straat is verlicht"
+              }
+            },
+            {
+              "if": "lit=no",
+              "then": {
+                "en": "This street is not lit",
+                "nl": "Deze straat is niet verlicht"
+              }
+            },
+            {
+              "if": "lit=sunset-sunrise",
+              "then": {
+                "en": "This street is lit at night",
+                "nl": "Deze straat is 's nachts verlicht"
+              },
+              "hideInAnswer": true
+            },
+            {
+              "if": "lit=24/7",
+              "then": {
+                "en": "This street is lit 24/7",
+                "nl": "Deze straat is 24/7 verlicht"
+              }
+            }
+          ]
+        }
+      ],
+      "allowSplit": true
+    },
+    {
+      "id": "all_streets",
+      "name": {
+        "en": "All streets",
+        "nl": "Alle straten"
+      },
+      "source": {
+        "osmTags": {
+          "and": ["highway!=", "service!=driveway", "highway!=platform"]
+        }
+      },
+      "minZoom": 19,
+      "title": {
+        "render": {
+          "en": "Street",
+          "nl": "Straat"
+        },
+        "mappings": [
+          {
+            "if": "name~*",
+            "then": "{name}"
+          }
+        ]
+      },
+      "mapRendering": [
+        {
+          "color": {
+            "render":"#a9a9a9",
+            "mappings": [
+              {
+                "if":"lit=no",
+                "then": "#303030"
+              }
+            ]
+          }
+        }
+      ],
+      "tagRenderings": [
+        {
+          "id": "lit",
+          "question": {
+            "en": "Is this street lit?",
+            "nl": "Is deze straat verlicht?"
+          },
+          "mappings": [
+            {
+              "if": "lit=yes",
+              "then": {
+                "en": "This street is lit",
+                "nl": "Deze straat is verlicht"
+              }
+            },
+            {
+              "if": "lit=no",
+              "then": {
+                "en": "This street is not lit",
+                "nl": "Deze straat is niet verlicht"
+              }
+            },
+            {
+              "if": "lit=sunset-sunrise",
+              "then": {
+                "en": "This street is lit at night",
+                "nl": "Deze straat is 's nachts verlicht"
+              },
+              "hideInAnswer": true
+            },
+            {
+              "if": "lit=24/7",
+              "then": {
+                "en": "This street is lit 24/7",
+                "nl": "Deze straat is 24/7 verlicht"
+              }
+            }
+          ]
+        }
+      ],
+      "allowSplit": true
+    }
+  ]
+}

assets/themes/street_lighting/street_lighting_assen.json

@@ -0,0 +1,58 @@
+{
+  "id": "street_lighting_assen",
+  "maintainer": "Robin van der Linde",
+  "version": "2021-10-22",
+  "language": [
+    "nl",
+    "en"
+  ],
+  "title": {
+    "nl": "Straatverlichting - Assen"
+  },
+  "description": {
+    "nl": "Op deze kaart vind je alles over straatlantaarns + een dataset van Assen"
+  },
+  "icon": "./assets/layers/street_lamps/street_lamp.svg",
+  "startZoom": 19,
+  "startLat": 52.99319,
+  "startLon": 6.56113,
+  "layers": [
+    "street_lamps",
+    {
+      "id": "Assen",
+      "name": "Dataset Assen",
+      "source": {
+        "osmTags": "Lichtmastnummer~*",
+        "#geoJson": "https://opendata.arcgis.com/datasets/ba37cdb372064b3199c548b75d16a609_0.geojson",
+        "geoJson": "https://robinlinde.github.io/tiles/assen_street_lighting/{z}/{x}/{y}.json",
+        "geoJsonZoomLevel": 16,
+        "isOsmCache": false
+      },
+      "calculatedTags": [
+        "_closest_osm_street_lamp=feat.closest('street_lamps')?.properties?.id",
+        "_closest_osm_street_lamp_distance=feat.distanceTo(feat.properties._closest_osm_street_lamp) * 1000",
+        "_has_closeby_feature=Number(feat.properties._closest_osm_street_lamp_distance) < 5 ? 'yes' : 'no'"
+      ],
+      "title": "Straatlantaarn in dataset",
+      "mapRendering": [
+        {
+          "location": "point",
+          "icon": {
+            "render": "circle:red",
+            "mappings": [
+              {
+                "if": "_has_closeby_feature=yes",
+                "then": "circle:#008000aa"
+              }
+            ]
+          },
+          "iconSize": "20,20,center"
+        }
+      ],
+      "tagRenderings": [
+        "all_tags"
+      ]
+    }
+  ],
+  "hideFromOverview": true
+}

assets/themes/uk_addresses/license_info.json

@@ -1,4 +1,34 @@
 [
+  {
+    "path": "Commemorative_plaque_on_Elizabeth_House_-_geograph.org.uk_-_2693028.jpg",
+    "license": "CC-BY-SA 2.0 Unported",
+    "authors": [
+      "Basher Eyre"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Commemorative_plaque_on_Elizabeth_House_-_geograph.org.uk_-_2693028.jpg"
+    ]
+  },
+  {
+    "path": "Plaque,_Raphoe_House_-_geograph.org.uk_-_1925685.jpg",
+    "license": "CC-BY-SA 2.0",
+    "authors": [
+      "Kenneth Allen"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Plaque,_Raphoe_House_-_geograph.org.uk_-_1925685.jpg"
+    ]
+  },
+  {
+    "path": "Plaque,_Séamus_Roddy_House_-_geograph.org.uk_-_2000318.jpg",
+    "license": "CC-BY-SA 2.0 Unported",
+    "authors": [
+      "Kenneth Allen"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Plaque,_S%C3%A9amus_Roddy_House_-_geograph.org.uk_-_2000318.jpg"
+    ]
+  },
   {
     "path": "housenumber_add.svg",
     "license": "CC0",

assets/themes/uk_addresses/uk_addresses.json

@@ -46,16 +46,42 @@
       "defaultState": false,
       "name": {
         "en": "Property boundaries by osmuk.org",
-        "de": "Grenzverläufe gemäß osmuk.org",
-        "it": "Confini delle proprietà di osmuk.org"
+        "de": "Grenzverläufe gemäß osmuk.org"
       }
     }
   ],
   "layers": [
+    {
+      "id": "raw_inspire_polygons",
+      "source": {
+        "geoJson": "https://osm-uk-addresses.russss.dev/inspire/{z}/{x}/{y}.json",
+        "osmTags": "inspireid~*",
+        "geoJsonZoomLevel": 18,
+        "isOsmCache": false
+      },
+      "minzoom": 18,
+      "calculatedTags": [
+        "_has_address=feat.overlapWith('addresses').length > 0"
+      ],
+      "#mapRendering": [
+        {
+          "width": 2,
+          "color": {
+            "render": "#00f",
+            "mappings": [
+              {
+                "if": "_has_address=true",
+                "then": "#0f0"
+              }
+            ]
+          }
+        }
+      ],
+      "mapRendering": []
+    },
     {
       "id": "to_import",
       "source": {
-        "#geoJson": "https://raw.githubusercontent.com/pietervdvn/MapComplete/develop/assets/themes/uk_addresses/islington_small_piece.geojson",
         "geoJson": "https://osm-uk-addresses.russss.dev/addresses/{z}/{x}/{y}.json",
         "osmTags": "inspireid~*",
         "geoJsonZoomLevel": 16,
@@ -63,23 +89,6 @@
       },
       "name": "Addresses to check",
       "minzoom": 14,
-      "wayHandling": 1,
-      "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"
-      },
       "title": {
         "render": "Address to be determined"
       },
@@ -91,18 +100,29 @@
         {
           "id": "uk_addresses_embedding_outline",
           "render": "An outline embedding this point with an address already exists in OpenStreetMap.<br>This <a href='https://openstreetmap.org/{_embedding_object:id}' target='blank'>object</a> has address <b>{_embedding_object:addr:street} {_embedding_object:addr:housenumber}</b>",
+          "mappings": [
+            {
+              "if": "_embedding_object:id=true",
+              "then": "The INSPIRE-polygon containing this point has at least one address contained"
+            },
+            {
+              "if": "_embedding_object:id=false",
+              "then": "The INSPIRE-polygon containing this point has <b>no</b> addresses contained"
+            }
+          ],
           "condition": "_embedding_object:id~*"
         },
         {
           "id": "uk_addresses_import_button",
-          "render": "{import_button(ref:inspireid=$inspireid, Add this address, ./assets/themes/uk_addresses/housenumber_add.svg)}"
+          "render": "{import_button(addresses,ref:inspireid=$inspireid, Add this address, ./assets/themes/uk_addresses/housenumber_add.svg)}"
         }
       ],
       "calculatedTags": [
         "_embedding_object=feat.overlapWith('addresses')[0]?.feat?.properties ?? null",
         "_embedding_object:addr:housenumber=JSON.parse(feat.properties._embedding_object)?.['addr:housenumber']",
         "_embedding_object:addr:street=JSON.parse(feat.properties._embedding_object)?.['addr:street']",
-        "_embedding_object:id=JSON.parse(feat.properties._embedding_object)?.id"
+        "_embedding_inspire_polygon_has_address=feat.overlapWith('raw_inspire_polygons')[0]?.feat?.properties?._has_address",
+        "_embedding_object:id=feat.get('_embedding_object')?.id ?? feat.properties._embedding_inspire_polygon_has_address"
       ],
       "filter": [
         {
@@ -113,21 +133,52 @@
               "osmTags": {
                 "and": [
                   "_imported=",
-                  "_embedding_object:id="
+                  {
+                    "or": [
+                      "_embedding_object:id=",
+                      "_embedding_object:id=false"
+                    ]
+                  }
                 ]
               }
             }
           ]
         }
+      ],
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/uk_addresses/housenumber_unknown.svg",
+            "mappings": [
+              {
+                "if": {
+                  "and": [
+                    "_embedding_object:id~*",
+                    "_embedding_object:id!=false"
+                  ]
+                },
+                "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"
+          ]
+        }
       ]
     },
     {
       "id": "addresses",
       "name": {
         "en": "Known addresses in OSM",
-        "de": "Bekannte Adressen in OSM",
-        "it": "Indirizzo presente su OSM",
-        "nb_NO": "Kjente adresser i OSM"
+        "de": "Bekannte Adressen in OSM"
       },
       "minzoom": 18,
       "source": {
@@ -148,25 +199,20 @@
       "title": {
         "render": {
           "en": "Known address",
-          "de": "Bekannte Adresse",
-          "it": "Indirizzo conosciuto",
-          "nb_NO": "Kjent adresse"
+          "de": "Bekannte Adresse"
         }
       },
       "description": {
         "en": "Addresses",
         "nl": "Adressen",
-        "de": "Adressen",
-        "it": "Indirizzi",
-        "nb_NO": "Adresser"
+        "de": "Adressen"
       },
       "tagRenderings": [
         {
           "id": "uk_addresses_explanation_osm",
           "render": {
             "en": "This address is saved in OpenStreetMap",
-            "de": "Diese Adresse ist in OpenStreetMap gespeichert",
-            "it": "Questo indirizzo è salvato su OpenStreetMap"
+            "de": "Diese Adresse ist in OpenStreetMap gespeichert"
           }
         },
         {
@@ -174,13 +220,11 @@
           "render": {
             "en": "The housenumber is <b>{addr:housenumber}</b>",
             "nl": "Het huisnummer is <b>{addr:housenumber}</b>",
-            "de": "Die Hausnummer ist <b>{addr:housenumber}</b>",
-            "it": "Il numero civico è <b>{addr:housenumber}</b>"
+            "de": "Die Hausnummer ist <b>{addr:housenumber}</b>"
           },
           "question": {
             "en": "What is the number of this house?",
-            "de": "Wie lautet die Nummer dieses Hauses?",
-            "it": "Qual è il numero civico di questa casa?"
+            "de": "Wie lautet die Nummer dieses Hauses?"
           },
           "freeform": {
             "key": "addr:housenumber",
@@ -198,23 +242,47 @@
               "then": {
                 "en": "This building has no house number",
                 "nl": "Dit gebouw heeft geen huisnummer",
-                "de": "Dieses Gebäude hat keine Hausnummer",
-                "it": "Questo edificio non ha indirizzo"
+                "de": "Dieses Gebäude hat keine Hausnummer"
               }
             }
           ]
         },
+        {
+          "id": "uk_addresses_housename",
+          "question": "What is the name of this house?<br/>This is normally indicated on a plaque.<br><div class='subtle'>Do NOT add names of inhabitants!</div>",
+          "render": "This house is named <b>{addr:housename}</b>",
+          "freeform": {
+            "key": "addr:housename",
+            "addExtraTags": [
+              "nohousename="
+            ]
+          },
+          "mappings": [
+            {
+              "if": "nohousename=yes",
+              "then": "This building has no housename"
+            },
+            {
+              "if": {
+                "and": [
+                  "addr:housename=",
+                  "nohousenumber!=yes"
+                ]
+              },
+              "then": "This building has no housename",
+              "hideInAnswer": true
+            }
+          ]
+        },
         {
           "id": "uk_addresses_street",
           "render": {
             "en": "This address is in street <b>{addr:street}</b>",
-            "de": "Diese Adresse befindet sich in der Straße <b>{addr:street}</b>",
-            "it": "L’indirizzo è in via <b>{addr:street}</b>"
+            "de": "Diese Adresse befindet sich in der Straße <b>{addr:street}</b>"
           },
           "question": {
             "en": "What street is this address located in?",
-            "de": "In welcher Straße befindet sich diese Adresse?",
-            "it": "Qual è la via in cui si trova?"
+            "de": "In welcher Straße befindet sich diese Adresse?"
           },
           "freeform": {
             "key": "addr:street"
@@ -241,52 +309,84 @@
               "nohousenumber!~yes"
             ]
           }
+        },
+        {
+          "id": "fixme",
+          "render": "<b>Fixme description</b>{render}",
+          "question": {
+            "en": "What should be fixed here? Please explain"
+          },
+          "freeform": {
+            "key": "fixme"
+          },
+          "mappings": [
+            {
+              "if": "fixme=",
+              "then": "No fixme - write something here to explain complicated cases"
+            }
+          ]
+        },
+        "questions",
+        {
+          "id": "address-sign-image",
+          "render": {
+            "en": "{image_carousel(image:address)}<br/>{image_upload(image:address, Add image of the address)}"
+          }
         }
       ],
-      "icon": {
-        "render": "./assets/themes/uk_addresses/housenumber_ok.svg",
-        "mappings": [
-          {
-            "if": {
-              "or": [
-                {
-                  "and": [
-                    "addr:housenumber=",
-                    "nohousenumber!=yes"
+      "mapRendering": [
+        {
+          "icon": {
+            "render": "./assets/themes/uk_addresses/housenumber_ok.svg",
+            "mappings": [
+              {
+                "if": {
+                  "or": [
+                    {
+                      "and": [
+                        "addr:housenumber=",
+                        "nohousenumber!=yes"
+                      ]
+                    },
+                    "addr:street="
                   ]
                 },
-                "addr:street="
-              ]
-            },
-            "then": "./assets/themes/uk_addresses/housenumber_unknown.svg"
-          }
-        ]
-      },
-      "width": {
-        "render": "8"
-      },
-      "iconSize": {
-        "render": "40,40,center"
-      },
-      "color": {
-        "render": "#00f",
-        "mappings": [
-          {
-            "if": {
-              "or": [
-                {
-                  "and": [
-                    "addr:housenumber=",
-                    "nohousenumber!=yes"
+                "then": "./assets/themes/uk_addresses/housenumber_unknown.svg"
+              }
+            ]
+          },
+          "iconSize": {
+            "render": "40,40,center"
+          },
+          "location": [
+            "point"
+          ]
+        },
+        {
+          "color": {
+            "render": "#00f",
+            "mappings": [
+              {
+                "if": {
+                  "or": [
+                    {
+                      "and": [
+                        "addr:housenumber=",
+                        "nohousenumber!=yes"
+                      ]
+                    },
+                    "addr:street="
                   ]
                 },
-                "addr:street="
-              ]
-            },
-            "then": "#ff0"
+                "then": "#ff0"
+              }
+            ]
+          },
+          "width": {
+            "render": "8"
           }
-        ]
-      }
+        }
+      ]
     },
     {
       "id": "named_streets",
@@ -299,12 +399,18 @@
           ]
         }
       },
-      "color": {
-        "render": "#ccc"
-      },
-      "width": {
-        "render": "0"
-      }
+      "mapRendering": [
+        {
+          "color": {
+            "render": "#ccc"
+          },
+          "width": {
+            "render": "0"
+          }
+        }
+      ]
     }
-  ]
+  ],
+  "enableShareScreen": false,
+  "enableMoreQuests": false
 }