Merge branch 'develop' into RobinLinde-patch-1

assets/themes/disaster_response/CivilDefence.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="700" height="700" viewBox="-350 -350 700 700">
+<circle fill="#FFAA00" r="350"/>
+<path fill="#003680" d="M249.41531629,144H-249.41531629L0-288z"/>
+</svg>

assets/themes/disaster_response/CivilDefence.svg.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: https://commons.wikimedia.org/wiki/User:MStankie
+SPDX-License-Identifier: LicenseRef-TRIVIAL

assets/themes/disaster_response/disaster_response.json

@@ -0,0 +1,19 @@
+{
+  "description": {
+    "en": "This map contains elements meant for disaster preparedness and response.",
+    "it": "Questa mappa contiene elementi pensati per la preparazione e risposta ai disastri."
+  },
+  "docs": "https://wiki.openstreetmap.org/wiki/Emergency_facilities_and_amenities",
+  "icon": "./assets/themes/disaster_response/CivilDefence.svg",
+  "id": "disaster_response",
+  "socialImage": "./assets/themes/disaster_response/social.svg",
+  "title": {
+    "en": "Disaster response",
+    "it": "Risposta ai disastri"
+  },
+  "layers": [
+    "hospital",
+    "assembly_point",
+    "disaster_response"
+  ]
+}

assets/themes/disaster_response/license_info.json

@@ -0,0 +1,24 @@
+[
+  {
+    "path": "CivilDefence.svg",
+    "license": "TRIVIAL",
+    "authors": [
+      "https://commons.wikimedia.org/wiki/User:MStankie"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:CivilDefence.svg"
+    ]
+  },
+  {
+    "path": "social.svg",
+    "license": "TRIVIAL",
+    "authors": [
+      "Geneva Convention",
+      "https://commons.wikimedia.org/wiki/User:MStankie",
+      "https://commons.wikimedia.org/wiki/User:The_Navigators"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Geneva_Convention_Civil_Defence_Symbol_-_Flag.svg"
+    ]
+  }
+]

assets/themes/disaster_response/social.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="974.348px" height="649.889px" viewBox="-136 50.534 974.348 649.889" enable-background="new -136 50.534 974.348 649.889" xml:space="preserve">
+<rect x="-136" y="50.534" fill="#FFAA00" width="974.348" height="649.889"/>
+<path fill="#003680" d="M599.416,591.479H100.584l249.416-432L599.416,591.479z"/>
+</svg>

assets/themes/disaster_response/social.svg.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Geneva Convention; https://commons.wikimedia.org/wiki/User:MStankie; https://commons.wikimedia.org/wiki/User:The_Navigators
+SPDX-License-Identifier: LicenseRef-TRIVIAL

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

@@ -216,6 +216,10 @@
                     "if": "theme=cyclofix",
                     "then": "./assets/themes/cyclofix/logo.svg"
                   },
+                  {
+                    "if": "theme=disaster_response",
+                    "then": "./assets/themes/disaster_response/CivilDefence.svg"
+                  },
                   {
                     "if": "theme=drinking_water",
                     "then": "./assets/themes/drinking_water/logo.svg"

assets/themes/ski/ski.json

@@ -11,17 +11,32 @@
   "layers": [
     "ski_piste",
     "aerialway",
+    {
+      "builtin": [
+        "guidepost",
+        "map",
+        "information_board"
+      ],
+      "override": {
+        "minzoom": 13
+      },
+      "pointRendering": [
+        {
+          "=iconSize": "25,25",
+          "=label": null
+        }
+      ]
+    },
     {
       "builtin": [
         "toilet",
         "drinking_water",
         "food",
-        "map",
-        "information_board",
         "viewpoint",
         "binocular"
       ],
       "override": {
+        "minzoom": 16,
         "pointRendering": [
           {
             "=iconSize": "25,25",