Merge branch 'develop'

assets/themes/disaster_response/disaster_response.json

@@ -17,9 +17,38 @@
   "icon": "./assets/themes/disaster_response/CivilDefence.svg",
   "socialImage": "./assets/themes/disaster_response/social.svg",
   "layers": [
-    "hospital",
-    "assembly_point",
-    "disaster_response"
+    {
+      "builtin": [
+        "hospital",
+        "fire_station",
+        "disaster_response",
+        "police"
+      ],
+      "override": {
+        "minzoom": 6
+      }
+    },
+    {
+      "builtin": [
+        "extinguisher",
+        "assembly_point",
+        "defibrillator",
+        "hydrant"
+      ],
+      "override": {
+        "minzoom": 15
+      }
+    },
+    {
+      "builtin": [
+        "doctors",
+        "ambulancestation",
+        "pharmacy"
+      ],
+      "override": {
+        "minzoom": 14
+      }
+    }
   ],
   "docs": "https://wiki.openstreetmap.org/wiki/Emergency_facilities_and_amenities"
-}
+}

assets/themes/surveillance/surveillance.json

@@ -59,7 +59,8 @@
       "override": {
         "minzoom": 12
       }
-    }
+    },
+    "police"
   ],
   "enableMorePrivacy": true
 }

assets/themes/uk_addresses/uk_addresses.json

@@ -683,8 +683,8 @@
         }
       ],
       "allowMove": {
-        "enableImproveAccuraccy": true,
-        "enableRelocation": false
+        "enableRelocation": false,
+        "enableImproveAccuracy": true
       }
     },
     "named_streets"