Merge pull request 'Some patches' (#2383) from Robin-patch-1 into develop

Reviewed-on: #2383
Reviewed-by: Pieter Vander Vennet <pietervdvn@posteo.net>

assets/layers/excrement_bag_dispenser/excrement_bag_dispenser.json

@@ -0,0 +1,88 @@
+{
+  "id": "excrement_bag_dispenser",
+  "name": {
+    "en": "Excrement bag dispensers"
+  },
+  "description": {
+    "en": "Dispensers giving out bags for animal waste"
+  },
+  "source": {
+    "osmTags": {
+      "and": [
+        "amenity=vending_machine",
+        "vending=excrement_bags"
+      ]
+    }
+  },
+  "minzoom": 16,
+  "title": {
+    "render": {
+      "en": "Excrement bag dispenser"
+    }
+  },
+  "tagRenderings": [
+    {
+      "id": "fee",
+      "question": {
+        "en": "Does it cost money to use this dispenser?"
+      },
+      "mappings": [
+        {
+          "if": "fee=",
+          "then": {
+            "en": "This dispenser probably gives out bags for free."
+          }
+        },
+        {
+          "if": "fee=yes",
+          "then": {
+            "en": "This dispenser give out bags for a fee."
+          }
+        },
+        {
+          "if": "fee=no",
+          "then": {
+            "en": "This dispenser gives out bags for free."
+          }
+        }
+      ]
+    },
+    "check_date"
+  ],
+  "presets": [
+    {
+      "tags": [
+        "amenity=vending_machine",
+        "vending=excrement_bags"
+      ],
+      "title": {
+        "en": "an excrement bag dispenser"
+      },
+      "description": {
+        "en": "A stand-alone dispenser giving out bags for animal waste."
+      }
+    }
+  ],
+  "pointRendering": [
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "marker": [
+        {
+          "icon": "square",
+          "color": "white"
+        },
+        {
+          "icon": "./assets/layers/excrement_bag_dispenser/excrement_bags.svg"
+        }
+      ],
+      "iconSize": "30,30"
+    }
+  ],
+  "allowMove": {
+    "enableImproveAccuracy": true,
+    "enableRelocation": true
+  }
+}

assets/layers/excrement_bag_dispenser/excrement_bags.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
+  <path d="M 0,0 C 0,1 0,2 0,3 H 1 V 1 h 12 v 2 h 1 V 0 C 9.3333333,0 4.6666667,0 0,0 Z m 2,2 v 10 l -1,2 c 4,0 8,0 12,0 L 12,12 V 2 C 8.6666667,2 5.3333333,2 2,2 Z m 1,1 h 8 V 4 H 3 Z m 0,2 h 8 c 0,2.5 0,5 0,7.5 0,0.277 -0.223,0.5 -0.5,0.5 h -7 C 3.223,13 3,12.777 3,12.5 3,10 3,7.5 3,5 Z M 7,6 C 7,7 6.7426357,7.5622251 6,8 5.4460001,8 5,8.4460001 5,9 5,9.5539999 5.4460001,10 6,10 H 5 c -0.554,0 -1,0.446 -1,1 0,0.554 0.446,1 1,1 h 4 c 0.554,0 1,-0.446 1,-1 0,-0.554 -0.446,-1 -1,-1 H 8 C 8.5539999,10 9,9.5539999 9,9 9,8.4460001 8.5539999,8 8,8 8.000334,7 7.7168863,6.4764131 7,6 Z"/>
+</svg>

assets/layers/excrement_bag_dispenser/excrement_bags.svg.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Jérémy Ragusa
+SPDX-License-Identifier: CC0-1.0

assets/layers/excrement_bag_dispenser/license_info.json

@@ -0,0 +1,12 @@
+[
+  {
+    "path": "excrement_bags.svg",
+    "license": "CC0-1.0",
+    "authors": [
+      "Jérémy Ragusa"
+    ],
+    "sources": [
+      "https://github.com/gravitystorm/openstreetmap-carto/blob/master/symbols/amenity/excrement_bags.svg"
+    ]
+  }
+]

assets/layers/mobility_hub/mobility_hub.json

@@ -73,8 +73,20 @@
         "placeholder": {
           "en": "Name of the mobility hub",
           "nl": "Naam van de mobiliteitshub"
+        },
+        "addExtraTags": [
+          "noname="
+        ]
+      },
+      "mappings": [
+        {
+          "if": "noname=yes",
+          "then": {
+            "en": "This mobility hub does not have a name",
+            "nl": "Deze mobiliteitshub heeft geen naam"
+          }
         }
-      }
+      ]
     },
     {
       "question": {
@@ -90,7 +102,8 @@
           "nl": "Netwerk van deze mobiliteitshub"
         },
         "addExtraTags": [
-          "network:wikidata="
+          "network:wikidata=",
+          "nonetwork="
         ]
       },
       "render": {
@@ -98,6 +111,16 @@
         "nl": "Deze mobiliteitshub hoort bij het netwerk {network}"
       },
       "mappings": [
+        {
+          "if": "nonetwork=yes",
+          "then": {
+            "en": "This mobility hub does not belong to a network",
+            "nl": "Deze mobiliteitshub hoort niet bij een netwerk"
+          },
+          "addExtraTags": [
+            "network:wikidata="
+          ]
+        },
         {
           "if": "network=Groningen-Drenthe",
           "then": {
@@ -107,7 +130,8 @@
           "hideInAnswer": "_country!=nl",
           "icon": "./assets/layers/mobility_hub/hub-gd.svg",
           "addExtraTags": [
-            "network:wikidata=Q108742233"
+            "network:wikidata=Q108742233",
+            "nonetwork="
           ]
         },
         {
@@ -119,7 +143,8 @@
           "hideInAnswer": "_country!=be",
           "icon": "./assets/layers/mobility_hub/logo-hoppin.svg",
           "addExtraTags": [
-            "network:wikidata=Q124310711"
+            "network:wikidata=Q124310711",
+            "nonetwork="
           ]
         },
         {
@@ -130,7 +155,8 @@
           },
           "hideInAnswer": "_country!=de",
           "addExtraTags": [
-            "network:wikidata=Q110948933"
+            "network:wikidata=Q110948933",
+            "nonetwork="
           ]
         }
       ]
@@ -179,7 +205,8 @@
             "nl": "Deze mobiliteitshub is gemarkeerd door een eenvoudig bord met alleen simpele informatie zoals het logo of de naam"
           }
         }
-      ]
+      ],
+      "condition": "_geometry:type=Point"
     }
   ],
   "lineRendering": [

assets/themes/waste/waste.json

@@ -46,6 +46,7 @@
       }
     },
     "recycling",
-    "waste_disposal"
+    "waste_disposal",
+    "excrement_bag_dispenser"
   ]
 }

assets/themes/waste_basket/waste_basket.json

@@ -60,7 +60,8 @@
       "override": {
         "minzoom": 12
       }
-    }
+    },
+    "excrement_bag_dispenser"
   ],
   "widenFactor": 2
 }