Merge branch 'develop' into feature/maproulette

assets/layers/bicycle_library/bicycle_library.json

@@ -323,5 +323,6 @@
         "render": "1"
       }
     }
-  ]
+  ],
+  "deletion": true
 }

assets/layers/indoors/indoors.json

@@ -0,0 +1,81 @@
+{
+  "id": "indoors",
+  "name": {
+    "en": "indoors"
+  },
+  "source": {
+    "osmTags": {
+      "or": [
+        "indoor=room",
+        "indoor=area",
+        "indoor=wall",
+        "indoor=door",
+        "indoor=level"
+      ]
+    }
+  },
+  "title": {
+    "render": {
+      "en": "Indoor area {name}"
+    },
+    "mappings": [
+      {
+        "if": "indoor=room",
+        "then": "Indoor Room {name}"
+      },
+      {
+        "if": "indoor=area",
+        "then": "Indoor Area {name}"
+      },
+      {
+        "if": "indoor=wall",
+        "then": "Indoor Wall {name}"
+      },
+      {
+        "if": "indoor=corridor",
+        "then": "Indoor Corridor {name}"
+      },
+      {
+        "if": "indoor=door",
+        "then": "Indoor Door {name}"
+      },
+      {
+        "if": "indoor=level",
+        "then": "Indoor Level {name}"
+      }
+    ]
+  },
+  "minzoom": 13,
+  "tagRenderings": [
+    "images"
+  ],
+  "mapRendering": [
+    {
+      "color": {
+        "render": "#bb004488"
+      },
+      "width": {
+        "render": "8"
+      },
+      "offset": {
+        "render": "-4"
+      },
+      "fill": "no"
+    },
+    {
+      "color": "red",
+      "fill": "no",
+      "width": "2"
+    },
+    {
+      "label": {
+        "render": "<div style='margin-top: -20px; color:#013220; background:white' class='rounded-full p-1 font-bold'>{name}</div>",
+        "condition": "name~*"
+      },
+      "location": [
+        "point",
+        "centroid"
+      ]
+    }
+  ]
+}

assets/layers/pharmacy/pharmacy.json

@@ -6,7 +6,15 @@
   "title": {
     "render": {
       "en": "{name}"
-    }
+    },
+    "mappings": [
+      {
+        "if": "name=",
+        "then": {
+          "en": "Pharmacy"
+        }
+      }
+    ]
   },
   "source": {
     "osmTags": {
@@ -60,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/layers/walls_and_buildings/license_info.json

@@ -0,0 +1,12 @@
+[
+  {
+    "path": "walls_and_buildings.png",
+    "license": "CC0",
+    "authors": [
+      "OSM"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Barrier_fence_mapnik.png#file"
+    ]
+  }
+]

assets/layers/walls_and_buildings/walls_and_buildings.json

@@ -43,5 +43,32 @@
         "render": "2"
       }
     }
+  ],
+  "calculatedTags": [
+    "_entrance_properties=feat.overlapWith('entrance')?.map(e => e.feat.properties).filter(p => p !== undefined).filter(p => p.width !== undefined)",
+    "_entrance:id=feat.get('_entrance_properties')?.map(e => e.id)?.at(0)",
+    "_entrance:width=feat.get('_entrance_properties')?.map(e => e.width)"
+  ],
+  "tagRenderings": [
+    {
+      "id": "_entrance:width",
+      "render": {
+        "en": "<a href ='#{_entrance:id} '>This door has a width of {canonical(_entrance:width)} meters </a>",
+        "nl": "<a href ='#{_entrance:id} '>Deze deur heeft een breedte van {canonical(_entrance:width)} meter </a>",
+        "de": "<a href ='#{_entrance:id} '>Diese Tür hat eine Durchgangsbreite von {canonical(_entrance:width)} Meter </a>",
+        "es": "<a href ='#{_entrance:id} '>Esta puerta tiene una ancho de {canonical(_entrance:width)} metros </a>"
+      },
+      "freeform": {
+        "key": "_entrance:width"
+      },
+      "mappings": [
+        {
+          "if": "_entrance:width=",
+          "then": {
+            "en": "This entrance has no width information"
+          }
+        }
+      ]
+    }
   ]
 }