Merge pull request #1284 from pietervdvn/RobinLinde-patch-7

Add some questions to waste theme, remove bicycle_rental from bike_shop

assets/layers/bike_shop/bike_shop.json

@@ -21,13 +21,6 @@
       "#": "We select all bicycle shops, sport shops (but we try to weed out non-bicycle related shops), and any shop with a bicycle related tag",
       "or": [
         "shop=bicycle",
-        {
-          "#": "A bicycle rental with a network is something such as villo, bluebike, ... We don't want them",
-          "and": [
-            "amenity=bicycle_rental",
-            "network="
-          ]
-        },
         {
           "#": "if sport is defined and is not bicycle, it is not matched; if bicycle retail/repair is marked as 'no', it is not shown to too.",
           "##": "There will be a few false-positives with this. They will get filtered out by people marking both 'not selling bikes' and 'not repairing bikes'. Furthermore, the OSMers will add a sports-subcategory on it",

assets/layers/recycling/recycling.json

@@ -1053,6 +1053,44 @@
           "it": "Quali sono gli orari di apertura di questo impianto di raccolta e riciclo?"
         }
       }
+    },
+    {
+      "id": "access",
+      "question": {
+        "en": "Who can use this recycling facility?",
+        "nl": "Wie kan deze recyclingfaciliteit gebruiken?"
+      },
+      "mappings": [
+        {
+          "if": "access=yes",
+          "then": {
+            "en": "Everyone can use this recycling facility",
+            "nl": "Iedereen mag deze recyclingfaciliteit gebruiken"
+          }
+        },
+        {
+          "if": "access=residents",
+          "then": {
+            "en": "Only residents can use this recycling facility",
+            "nl": "Enkel bewoners kunnen deze recyclingfaciliteit gebruiken"
+          }
+        },
+        {
+          "if": "access=private",
+          "then": {
+            "en": "This recycling facility is only for private use",
+            "nl": "Deze recyclingfaciliteit is alleen voor privégebruik"
+          }
+        }
+      ],
+      "freeform": {
+        "key": "access",
+        "type": "string"
+      },
+      "render": {
+        "en": "This recycling facility can be used by {access}",
+        "nl": "Deze recyclingfaciliteit kan gebruikt worden door {access}"
+      }
     }
   ],
   "filter": [
@@ -1262,6 +1300,28 @@
           "osmTags": "recycling:waste=yes"
         }
       ]
+    },
+    {
+      "#": "ignore-possible-duplicate",
+      "id": "public-access",
+      "options": [
+        {
+          "question": {
+            "en": "Only public access",
+            "nl": "Enkel publiek toegankelijke afvalcontainers",
+            "de": "Nur öffentliche Mülltonnen",
+            "it": "Solo accesso pubblico",
+            "id": "Hanya akses publik",
+            "da": "Kun offentlig adgang"
+          },
+          "osmTags": {
+            "or": [
+              "access=yes",
+              "access="
+            ]
+          }
+        }
+      ]
     }
   ],
   "deletion": {

assets/layers/waste_disposal/waste_disposal.json

@@ -64,6 +64,31 @@
     }
   ],
   "tagRenderings": [
+    "images",
+    {
+      "id": "type",
+      "description": "Mapping allowing to change between waste_disposal and recycling",
+      "question": {
+        "en": "What kind of waste disposal bin is this?"
+      },
+      "mappings": [
+        {
+          "if": "amenity=waste_disposal",
+          "then": {
+            "en": "This is a medium to large bin for disposal of (household) waste"
+          }
+        },
+        {
+          "if": "amenity=recycling",
+          "then": {
+            "en": "This is actually a recycling container"
+          },
+          "addExtraTags": [
+            "recycling_type=container"
+          ]
+        }
+      ]
+    },
     {
       "id": "access",
       "render": {