Merge master

assets/layers/advertising/advertising.json

@@ -291,10 +291,15 @@
             "mappings": [
               {
                 "if": {
-                  "or": [
+                  "and": [
+                    "_referencing_ways~*",
                     "advertising=billboard"
                   ]
                 },
+                "then": "./assets/themes/advertising/billboard_wall.svg"
+              },
+              {
+                "if": "advertising=billboard",
                 "then": "./assets/themes/advertising/billboard.svg"
               },
               {
@@ -454,6 +459,25 @@
         "./assets/themes/advertising/Repsol_Billboard.jpg"
       ]
     },
+    {
+      "tags": [
+        "advertising=billboard"
+      ],
+      "snapToLayer": [
+        "walls_and_buildings"
+      ],
+      "title": {
+        "en": "a billboard mounted to a wall",
+        "de": "Eine an einer Wand montierte Werbetafel"
+      },
+      "description": {
+        "en": "A large outdoor advertising structure, typically found in high-traffic areas such as alongside busy roads mounted on a wall",
+        "de": "Eine große Außenwerbestruktur, die typischerweise in stark frequentierten Bereichen wie an vielbefahrenen Straßen auf einer Wand montiert zu finden ist"
+      },
+      "exampleImages": [
+        "./assets/themes/advertising/billboard_wall.jpg"
+      ]
+    },
     {
       "tags": [
         "advertising=poster_box"

assets/layers/ice_cream/ice_cream.json

@@ -2,11 +2,13 @@
   "id": "ice_cream",
   "name": {
     "en": "Ice cream parlors",
-    "de": "Eisdielen"
+    "de": "Eisdielen",
+    "nl": "IJssalon"
   },
   "description": {
     "en": "A place where ice cream is sold over the counter",
-    "de": "Ein Ort, an dem Eiscreme an der Theke verkauft wird"
+    "de": "Ein Ort, an dem Eiscreme an der Theke verkauft wird",
+    "nl": "Een plaats waar voornamelijk ijsjes verkocht worden, bedoeld voor onmiddelijke consumptie"
   },
   "source": {
     "osmTags": "amenity=ice_cream"
@@ -15,15 +17,17 @@
   "title": {
     "render": {
       "en": "Ice cream parlor",
-      "de": "Eisdiele"
+      "de": "Eisdiele",
+      "nl": "IJssalon"
     },
     "mappings": [
       {
         "if": "name~*",
         "then": {
           "en": "{name}",
           "de": "{name}",
-          "pl": "{name}"
+          "pl": "{name}",
+          "nl": "{name}"
         }
       }
     ]
@@ -56,14 +60,16 @@
       "title": {
         "en": "an ice cream parlor",
         "de": "eine Eisdiele",
-        "fr": "un glacier"
+        "fr": "un glacier",
+        "nl": "een ijssalon"
       },
       "tags": [
         "amenity=ice_cream"
       ],
       "description": {
         "en": "A shop where one can buy only icecream and related items. Ice cream is normally hand-scooped.",
-        "de": "Ein Geschäft, in dem man nur Eiscreme und damit verbundene Artikel kaufen kann. Normalerweise wird das Eis mit der Hand portioniert."
+        "de": "Ein Geschäft, in dem man nur Eiscreme und damit verbundene Artikel kaufen kann. Normalerweise wird das Eis mit der Hand portioniert.",
+        "nl": "Een plaats waar men voornamelijk ijsjes koopt, meestal met de hand geschept en bedoeld om onmiddellijk op te eten."
       }
     }
   ],

assets/layers/usersettings/usersettings.json

@@ -376,7 +376,8 @@
         "da": "Hvilket baggrundslag skal vises som standard?"
       },
       "questionHint": {
-        "en": "To set a specific background as default, select it in the background menu first after which it will appear here."
+        "en": "To set a specific background as default, select it in the background menu first after which it will appear here.",
+        "de": "Um einen bestimmten Hintergrund als Standard festzulegen, wähle ihn zuerst im Hintergrundmenü aus, danach wird er hier angezeigt."
       },
       "condition": "_theme:backgroundLayer=",
       "mappings": [

assets/themes/advertising/billboard_wall.jpeg.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: https://www.openstreetmap.org/user/GEO%20ECLA
+SPDX-License-Identifier: CC0-1.0

assets/themes/advertising/billboard_wall.jpg.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: https://www.openstreetmap.org/user/GEO%20ECLA
+SPDX-License-Identifier: CC0-1.0

assets/themes/advertising/billboard_wall.svg.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Barnes38
+SPDX-License-Identifier: CC-BY-SA-3.0

assets/themes/advertising/license_info.json

@@ -249,6 +249,26 @@
       "https://wiki.openstreetmap.org/wiki/File:Billboard_trunk.svg"
     ]
   },
+  {
+    "path": "billboard_wall.jpg",
+    "license": "CC0-1.0",
+    "authors": [
+      "https://www.openstreetmap.org/user/GEO%20ECLA"
+    ],
+    "sources": [
+      "https://imgur.com/billboard-eHdb1ir"
+    ]
+  },
+  {
+    "path": "billboard_wall.svg",
+    "license": "CC-BY-SA-3.0",
+    "authors": [
+      "Barnes38"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Billboard_trunk.svg"
+    ]
+  },
   {
     "path": "board.svg",
     "license": "CC-BY-SA-3.0",

assets/themes/circular_economy/circular_economy.json

@@ -2,11 +2,13 @@
   "id": "circular_economy",
   "title": {
     "en": "Circular economy",
-    "es": "Economía circular"
+    "es": "Economía circular",
+    "de": "Kreislaufwirtschaft"
   },
   "description": {
     "en": "Various items which help people to share, reuse or recycle.",
-    "es": "Varios elementos que ayudan a la gente a compartir, reutilizar o reciclar."
+    "es": "Varios elementos que ayudan a la gente a compartir, reutilizar o reciclar.",
+    "de": "Verschiedene Gegenstände, die den Menschen helfen, zu teilen, wiederzuverwenden oder zu recyceln."
   },
   "icon": "./assets/themes/circular_economy/circular.svg",
   "layers": [
@@ -34,7 +36,8 @@
         "id": "shops_second_hand",
         "=name": {
           "en": "Second hand shops",
-          "es": "Tiendas de segunda mano"
+          "es": "Tiendas de segunda mano",
+          "de": "Second-Hand-Läden"
         },
         "filter": null,
         "source": {