From 917aa771b37a87289f9da543137fd4de8548bae3 Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Sat, 30 Jul 2022 14:41:02 +0200
Subject: [PATCH] Theme cleanup: fused entrances with indoors

---
 assets/layers/entrance/entrance.json          |  2 +-
 assets/layers/entrance/license_info.json      | 20 +++++++++----------
 assets/themes/indoors/indoors.json            |  8 +++++---
 .../mapcomplete-changes.json                  | 10 +---------
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/assets/layers/entrance/entrance.json b/assets/layers/entrance/entrance.json
index a1be024d3..428d461d0 100644
--- a/assets/layers/entrance/entrance.json
+++ b/assets/layers/entrance/entrance.json
@@ -419,7 +419,7 @@
         "centroid"
       ],
       "icon": {
-        "render": "circle:white;./assets/layers/entrance/door.svg",
+        "render": "circle:white;./assets/layers/entrance/entrance.svg",
         "mappings": [
           {
             "if": "entrance=emergency",
diff --git a/assets/layers/entrance/license_info.json b/assets/layers/entrance/license_info.json
index c5919b9c8..2beea1223 100644
--- a/assets/layers/entrance/license_info.json
+++ b/assets/layers/entrance/license_info.json
@@ -1,14 +1,4 @@
 [
-  {
-    "path": "door.svg",
-    "license": "CC-BY 3.0 Unported",
-    "authors": [
-      "Icons Bazaar"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Noun_Project_Door_icon_1512154.svg"
-    ]
-  },
   {
     "path": "emergency_door.svg",
     "license": "CC-BY-SA 4.0 international",
@@ -18,5 +8,15 @@
     "sources": [
       "https://commons.wikimedia.org/wiki/File:Emergency_door_icon.svg"
     ]
+  },
+  {
+    "path": "entrance.svg",
+    "license": "CC-BY-SA",
+    "authors": [
+      "CT Steward"
+    ],
+    "sources": [
+      "https://www.ctsteward.com/"
+    ]
   }
 ]
\ No newline at end of file
diff --git a/assets/themes/indoors/indoors.json b/assets/themes/indoors/indoors.json
index 7c3e5fa78..fef46166d 100644
--- a/assets/themes/indoors/indoors.json
+++ b/assets/themes/indoors/indoors.json
@@ -5,11 +5,11 @@
     "de": "Innenräume"
   },
   "description": {
-    "en": "On this map, publicly accessible indoor places are shown",
+    "en": "On this map, indoor places are shown together with pedestrian paths and entrances",
     "de": "Diese Karte zeigt öffentlich zugängliche Innenräume"
   },
   "maintainer": "MapComplete",
-  "icon": "./assets/themes/onwheels/crest.svg",
+  "icon": "./assets/layers/entrance/entrance.svg",
   "version": "0",
   "startLat": 51.17181,
   "defaultBackgroundId": "CartoDB.Voyager",
@@ -23,6 +23,8 @@
       "override": {
         "shownByDefault": true
       }
-    }
+    },
+    "pedestrian_path",
+    "entrance"
   ]
 }
\ No newline at end of file
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index d21921d33..102c5b3e2 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -159,10 +159,6 @@
                 "if": "theme=education",
                 "then": "./assets/layers/school/college.svg"
               },
-              {
-                "if": "theme=entrances",
-                "then": "./assets/layers/entrance/door.svg"
-              },
               {
                 "if": "theme=etymology",
                 "then": "./assets/layers/etymology/logo.svg"
@@ -187,10 +183,6 @@
                 "if": "theme=ghostbikes",
                 "then": "./assets/themes/ghostbikes/logo.svg"
               },
-              {
-                "if": "theme=governments",
-                "then": "./assets/themes/onwheels/crest.svg"
-              },
               {
                 "if": "theme=grb",
                 "then": "./assets/themes/grb_import/logo.svg"
@@ -217,7 +209,7 @@
               },
               {
                 "if": "theme=indoors",
-                "then": "./assets/themes/onwheels/crest.svg"
+                "then": "./assets/layers/entrance/entrance.svg"
               },
               {
                 "if": "theme=kerbs_and_crossings",