Merge branch 'develop' into feature/elevator

assets/contributors.json

@@ -1,11 +1,11 @@
 {
   "contributors": [
     {
-      "commits": 4067,
+      "commits": 4165,
       "contributor": "Pieter Vander Vennet"
     },
     {
-      "commits": 103,
+      "commits": 119,
       "contributor": "Robin van der Linde"
     },
     {
@@ -64,6 +64,10 @@
       "commits": 17,
       "contributor": "pgm-chardelv1"
     },
+    {
+      "commits": 15,
+      "contributor": "Andrews Leruth"
+    },
     {
       "commits": 15,
       "contributor": "ToastHawaii"
@@ -81,13 +85,17 @@
       "contributor": "Bavo Vanderghote"
     },
     {
-      "commits": 10,
+      "commits": 11,
       "contributor": "dependabot[bot]"
     },
     {
       "commits": 10,
       "contributor": "LiamSimons"
     },
+    {
+      "commits": 9,
+      "contributor": "AlexanderRebai"
+    },
     {
       "commits": 9,
       "contributor": "RobJN"
@@ -188,6 +196,10 @@
       "commits": 2,
       "contributor": "Stanislas Gueniffey"
     },
+    {
+      "commits": 1,
+      "contributor": "bxl-forever"
+    },
     {
       "commits": 1,
       "contributor": "loviuz"

assets/layers/pharmacy/pharmacy.json

@@ -7,12 +7,14 @@
     "render": {
       "en": "{name}"
     },
-    "mappings": [{
-      "if": "name=",
-      "then": {
-        "en": "Pharmacy"
+    "mappings": [
+      {
+        "if": "name=",
+        "then": {
+          "en": "Pharmacy"
+        }
       }
-    }]
+    ]
   },
   "source": {
     "osmTags": {
@@ -66,5 +68,29 @@
         "centroid"
       ]
     }
-  ]
+  ],
+      "filter": [
+        {
+            "id": "drive-through",
+            "options": [
+                {
+                    "question": {
+                        "en": "Has drive through"
+                    },
+                    "osmTags": "drive_through=yes"
+                }
+            ]
+        },
+        {
+            "id": "dispensing",
+            "options": [
+                {
+                    "question": {
+                        "en": "Pharmacy able to provide prescription drugs"
+                    },
+                    "osmTags": "dispensing=yes"
+                }
+            ]
+        }
+    ]
 }

assets/themes/buurtnatuur/buurtnatuur.json

@@ -1,4 +1,5 @@
 {
+  "#dont-translate": "*",
   "id": "buurtnatuur",
   "title": {
     "nl": "Breng jouw buurtnatuur in kaart"
@@ -35,7 +36,10 @@
           "or": [
             "leisure=nature_reserve",
             {
-              "and": ["boundary=protected_area","protect_class!=22"]
+              "and": [
+                "boundary=protected_area",
+                "protect_class!=22"
+              ]
             }
           ]
         }

assets/themes/grb_import/grb.json

@@ -630,7 +630,7 @@
           }
         }
       ],
-      "isShown":{
+      "isShown": {
         "or": [
           "_imported_osm_object_found!=true",
           "_imported_osm_still_fresh!=true"

assets/themes/onwheels/onwheels.json

@@ -4,7 +4,7 @@
     "en": "OnWheels"
   },
   "description": {
-    "en": "On this map, publicly wheelchair accessible places are shown and can be easily added"
+    "en": "On this map, publicly weelchair accessible places are shown and can be easily added"
   },
   "maintainer": "MapComplete",
   "icon": "./assets/themes/onwheels/crest.svg",
@@ -32,15 +32,9 @@
     "walls_and_buildings"
   ],
   "overrideAll": {
-<<<<<<< HEAD
-    "minZoom": "15",
-    "mapRendering": [
-      {
-=======
     "+calculatedTags": [
       "_poi_walls_and_buildings_entrance_properties=feat.closestn('walls_and_buildings', 1, undefined, 1000).map(w => ({id: w.feat.properties.id, width: w.feat.properties['_entrance:width']}))[0]",
       "_poi_entrance:width=JSON.parse(feat.properties._poi_walls_and_buildings_entrance_properties)?.width"
-
     ],
     "+tagRenderings": [
       {
@@ -69,7 +63,6 @@
     "minzoom": "15",
     "mapRendering": [
       {
->>>>>>> develop
         "label": null
       }
     ]

assets/themes/speelplekken/speelplekken.json

@@ -288,6 +288,6 @@
         "then": "./assets/themes/speelplekken/youtube.svg"
       }
     ],
-    "isShown":"_is_shadowed!=yes"
+    "isShown": "_is_shadowed!=yes"
   }
 }

assets/translators.json

@@ -1,7 +1,7 @@
 {
   "contributors": [
     {
-      "commits": 176,
+      "commits": 177,
       "contributor": "Pieter Vander Vennet"
     },
     {