Fix filters, add plastic

assets/layers/waste_basket/waste_basket.json

@@ -86,6 +86,14 @@
             "nl": "Een vuilnisbak voor injectienaalden en andere scherpe voorwerpen",
             "de": "Ein Abfalleimer für Nadeln und andere scharfe Gegenstände"
           }
+        },
+        {
+          "if": "waste=plastic",
+          "then": {
+            "en": "A waste basket for plastic",
+            "nl": "Een vuilnisbak voor plastic",
+            "de": "Ein Abfalleimer für Plastik"
+          }
         }
       ]
     },
@@ -176,7 +184,7 @@
             "nl": "Vuilnisbak voor sigarettenpeuken",
             "de": "Mülleimer für Zigaretten"
           },
-          "osmTags": "waste=cigarettes"
+          "osmTags": "waste~.*cigarettes.*"
         },
         {
           "question": {
@@ -184,7 +192,7 @@
             "nl": "Vuilnisbak voor (vervallen) medicatie en drugs",
             "de": "Mülleimer für Drogen"
           },
-          "osmTags": "waste=drugs"
+          "osmTags": "waste~.*drugs.*"
         },
         {
           "question": {
@@ -192,7 +200,7 @@
             "nl": "Vuilnisbak voor hondenuitwerpselen",
             "de": "Mülleimer für Hundekot"
           },
-          "osmTags": "waste=dog_excrement"
+          "osmTags": "waste~.*dog_excrement.*"
         },
         {
           "question": {
@@ -200,7 +208,7 @@
             "nl": "Vuilnisbak voor zwerfvuil",
             "de": "Mülleimer für allgemeinen Müll"
           },
-          "osmTags": "waste=trash"
+          "osmTags": "waste~.*trash.*"
         },
         {
           "question": {
@@ -208,7 +216,15 @@
             "nl": "Vuilnisbak voor injectienaalden en andere scherpe voorwerpen",
             "de": "Mülleimer für Nadeln und andere scharfe Gegenstände"
           },
-          "osmTags": "waste=sharps"
+          "osmTags": "waste~.*sharps.*"
+        },
+        {
+          "question": {
+            "en": "Waste basket for plastic",
+            "nl": "Vuilnisbak voor plastic",
+            "de": "Mülleimer für Plastik"
+          },
+          "osmTags": "waste~.*plastic.*"
         }
       ]
     },

assets/themes/mapcomplete-changes/mapcomplete-changes.json

@@ -299,6 +299,14 @@
                 "if": "theme=uk_addresses",
                 "then": "./assets/themes/uk_addresses/housenumber_unknown.svg"
               },
+              {
+                "if": "theme=waste",
+                "then": "./assets/layers/recycling/recycling-14.svg"
+              },
+              {
+                "if": "theme=waste_assen",
+                "then": "./assets/layers/recycling/recycling-14.svg"
+              },
               {
                 "if": "theme=waste_basket",
                 "then": "./assets/themes/waste_basket/waste_basket.svg"

langs/layers/de.json

@@ -3214,6 +3214,9 @@
                     },
                     "5": {
                         "question": "Mülleimer für Nadeln und andere scharfe Gegenstände"
+                    },
+                    "6": {
+                        "question": "Mülleimer für Plastik"
                     }
                 }
             },
@@ -3276,6 +3279,9 @@
                     },
                     "5": {
                         "then": "Ein Abfalleimer für Nadeln und andere scharfe Gegenstände"
+                    },
+                    "6": {
+                        "then": "Ein Abfalleimer für Plastik"
                     }
                 },
                 "question": "Um was für einen Abfalleimer handelt es sich?"

langs/layers/en.json

@@ -1123,6 +1123,7 @@
         }
     },
     "birdhide": {
+        "description": "A birdhide",
         "filter": {
             "0": {
                 "options": {
@@ -1130,7 +1131,84 @@
                         "question": "Wheelchair accessible"
                     }
                 }
+            },
+            "1": {
+                "options": {
+                    "0": {
+                        "question": "Only covered birdhides"
+                    }
+                }
             }
+        },
+        "name": "Bird watching places",
+        "presets": {
+            "0": {
+                "description": "A covered shelter where one can watch birds comfortably",
+                "title": "Birdhide"
+            },
+            "1": {
+                "description": "A screen or wall with openings to watch birds",
+                "title": "Bird blind"
+            }
+        },
+        "tagRenderings": {
+            "bird-hide-shelter-or-wall": {
+                "mappings": {
+                    "0": {
+                        "then": "Bird blind"
+                    },
+                    "1": {
+                        "then": "Bird hide"
+                    },
+                    "2": {
+                        "then": "Bird tower hide"
+                    },
+                    "3": {
+                        "then": "Bird hide shelter"
+                    }
+                },
+                "question": "Is this a bird blind or a bird watching shelter?"
+            },
+            "bird-hide-wheelchair": {
+                "mappings": {
+                    "0": {
+                        "then": "There are special provisions for wheelchair users"
+                    },
+                    "1": {
+                        "then": "A wheelchair can easily use this birdhide"
+                    },
+                    "2": {
+                        "then": "This birdhide is reachable by wheelchair, but it is not easy"
+                    },
+                    "3": {
+                        "then": "Not accessible to wheelchair users"
+                    }
+                },
+                "question": "Is this bird hide accessible to wheelchair users?"
+            },
+            "birdhide-operator": {
+                "mappings": {
+                    "0": {
+                        "then": "Operated by Natuurpunt"
+                    },
+                    "1": {
+                        "then": "Operated by the Agency for Nature and Forests"
+                    }
+                },
+                "question": "Who operates this birdhide?",
+                "render": "Operated by {operator}"
+            }
+        },
+        "title": {
+            "mappings": {
+                "1": {
+                    "then": "Bird hide {name}"
+                },
+                "2": {
+                    "then": "Bird blind {name}"
+                }
+            },
+            "render": "Bird watching place"
         }
     },
     "cafe_pub": {
@@ -3515,6 +3593,35 @@
     },
     "nature_reserve": {
         "description": "A nature reserve is an area where nature can take its course",
+        "filter": {
+            "0": {
+                "options": {
+                    "0": {
+                        "question": "Freely accesible"
+                    }
+                }
+            },
+            "1": {
+                "options": {
+                    "0": {
+                        "question": "All nature reserves"
+                    },
+                    "1": {
+                        "question": "Dogs are allowed to roam freely"
+                    },
+                    "2": {
+                        "question": "Dogs are allowed if they are leashed"
+                    }
+                }
+            }
+        },
+        "name": "Nature reserve",
+        "presets": {
+            "0": {
+                "description": "Add a missing nature reserve",
+                "title": "nature reserve"
+            }
+        },
         "tagRenderings": {
             "Access tag": {
                 "mappings": {
@@ -3558,6 +3665,10 @@
                 },
                 "question": "Are dogs allowed in this nature reserve?"
             },
+            "Editable description": {
+                "question": "Is there some extra info?",
+                "render": "Extra info: <i>{description:0}</i>"
+            },
             "Email": {
                 "question": "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",
                 "render": "<a href='mailto:{email}' target='_blank'>{email}</a>"
@@ -3571,6 +3682,9 @@
                 "question": "What is the name of this area?",
                 "render": "This area is named {name}"
             },
+            "Non-editable description": {
+                "render": "Extra information: <i>{description}</i>"
+            },
             "Operator tag": {
                 "mappings": {
                     "0": {
@@ -3764,6 +3878,7 @@
     },
     "parking": {
         "description": "A layer showing car parkings",
+        "name": "Parking",
         "presets": {
             "0": {
                 "title": "car parking"
@@ -5088,6 +5203,9 @@
                     },
                     "5": {
                         "question": "Waste basket for sharps"
+                    },
+                    "6": {
+                        "question": "Waste basket for plastic"
                     }
                 }
             },
@@ -5150,6 +5268,9 @@
                     },
                     "5": {
                         "then": "A waste basket for needles and other sharp objects"
+                    },
+                    "6": {
+                        "then": "A waste basket for plastic"
                     }
                 },
                 "question": "What kind of waste basket is this?"

langs/layers/nl.json

@@ -3473,6 +3473,7 @@
                 "question": "Zijn honden toegelaten in dit gebied?"
             },
             "Editable description": {
+                "question": "Is er extra info die je kwijt wil?",
                 "render": "Extra info: <i>{description:0}</i>"
             },
             "Email": {
@@ -4999,6 +5000,9 @@
                     },
                     "5": {
                         "question": "Vuilnisbak voor injectienaalden en andere scherpe voorwerpen"
+                    },
+                    "6": {
+                        "question": "Vuilnisbak voor plastic"
                     }
                 }
             },
@@ -5061,6 +5065,9 @@
                     },
                     "5": {
                         "then": "Een vuilnisbak voor injectienaalden en andere scherpe voorwerpen"
+                    },
+                    "6": {
+                        "then": "Een vuilnisbak voor plastic"
                     }
                 },
                 "question": "Wat voor soort vuilnisbak is dit?"

langs/themes/en.json

@@ -1286,6 +1286,10 @@
         "shortDescription": "Map all the trees",
         "title": "Trees"
     },
+    "waste": {
+        "description": "Map showing waste baskets and recycling facilities.",
+        "title": "Waste"
+    },
     "waste_basket": {
         "description": "On this map, you'll find waste baskets near you. If a waste basket is missing on this map, you can add it yourself",
         "shortDescription": "A map with waste baskets",

langs/themes/nl.json

@@ -1050,6 +1050,14 @@
         "shortDescription": "Breng bomen in kaart",
         "title": "Bomen"
     },
+    "waste": {
+        "description": "Kaart met afvalbakken en recyclingfaciliteiten.",
+        "title": "Afval"
+    },
+    "waste_assen": {
+        "description": "Kaart met afvalbakken en recyclingfaciliteiten + een dataset voor Assen.",
+        "title": "Afval - Assen"
+    },
     "waste_basket": {
         "description": "Op deze kaart vind je vuilnisbakken waar je afval in kan smijten. Ontbreekt er een vuilnisbak? Dan kan je die zelf toevoegen",
         "shortDescription": "Een kaart met vuilnisbakken",