Merge all healtcare layers into a map theme

assets/themes/healthcare/healthcare.json

@@ -1,10 +1,10 @@
 {
-    "id": "doctors",
+    "id": "healthcare",
     "title": {
-        "en": "Doctors"
+        "en": "Healthcare"
     },
     "description": {
-        "en": "On this map, publicly accessible doctors offices are shown and can be easily added"
+        "en": "On this map, various healthcare related items are shown"
     },
     "maintainer": "MapComplete",
     "icon": "./assets/layers/doctors/doctors.svg",
@@ -15,6 +15,8 @@
     "startZoom": 16,
     "widenFactor": 2,
     "layers": [
-        "doctors"
+        "doctors",
+        "hospital",
+        "pharmacy"
     ]
 }

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

@@ -151,10 +151,6 @@
                 "if": "theme=cyclofix",
                 "then": "./assets/themes/cyclofix/logo.svg"
               },
-              {
-                "if": "theme=doctors",
-                "then": "./assets/layers/doctors/doctors.svg"
-              },
               {
                 "if": "theme=drinking_water",
                 "then": "./assets/themes/drinking_water/logo.svg"
@@ -211,6 +207,10 @@
                 "if": "theme=hailhydrant",
                 "then": "./assets/themes/hailhydrant/logo.svg"
               },
+              {
+                "if": "theme=healthcare",
+                "then": "./assets/layers/doctors/doctors.svg"
+              },
               {
                 "if": "theme=kerbs_and_crossings",
                 "then": "./assets/layers/kerbs/KerbIcon.svg"
@@ -259,10 +259,6 @@
                 "if": "theme=pets",
                 "then": "./assets/layers/dogpark/dog-park.svg"
               },
-              {
-                "if": "theme=pharmacies",
-                "then": "./assets/layers/pharmacy/pharmacy.svg"
-              },
               {
                 "if": "theme=play_forests",
                 "then": "./assets/layers/play_forest/icon.svg"

assets/themes/pharmacies/pharmacies.json

@@ -1,20 +0,0 @@
-{
-  "id": "pharmacies",
-  "title": {
-    "en": "pharmacies"
-  },
-  "description": {
-    "en": "On this map, pharmacies are shown and can be easily added"
-  },
-  "maintainer": "MapComplete",
-  "icon": "./assets/layers/pharmacy/pharmacy.svg",
-  "version": "0",
-  "startLat": 50.8465573,
-  "defaultBackgroundId": "CartoDB.Voyager",
-  "startLon": 4.351697,
-  "startZoom": 16,
-  "widenFactor": 2,
-  "layers": [
-    "pharmacy"
-  ]
-}

assets/themes/shops/shops.json

@@ -42,6 +42,7 @@
   "startZoom": 1,
   "widenFactor": 3,
   "layers": [
-    "shops"
+    "shops",
+    "pharmacy"
   ]
 }