From e44133645a681c2835c19ce080d3c3b42d81c7c9 Mon Sep 17 00:00:00 2001
From: pietervdvn <pietervdvn@posteo.net>
Date: Thu, 9 Jun 2022 12:24:54 +0200
Subject: [PATCH] Add universities and colleges, reorganize

---
 .../kindergarten_childcare/license_info.json  |  10 ---
 assets/layers/school/school.json              |   2 +-
 .../tertiary_education.json                   |  82 ++++++++++++++++++
 ...assification of Education (ISCED) 2011.pdf | Bin
 assets/themes/{schools => education}/diary.md |   0
 .../schools.json => education/education.json} |   5 +-
 .../mapcomplete-changes.json                  |   8 +-
 7 files changed, 90 insertions(+), 17 deletions(-)
 create mode 100644 assets/layers/tertiary_education/tertiary_education.json
 rename assets/themes/{schools => education}/International Standard Classification of Education (ISCED) 2011.pdf (100%)
 rename assets/themes/{schools => education}/diary.md (100%)
 rename assets/themes/{schools/schools.json => education/education.json} (87%)

diff --git a/assets/layers/kindergarten_childcare/license_info.json b/assets/layers/kindergarten_childcare/license_info.json
index 344cc7f85..81dbf76b5 100644
--- a/assets/layers/kindergarten_childcare/license_info.json
+++ b/assets/layers/kindergarten_childcare/license_info.json
@@ -1,14 +1,4 @@
 [
-  {
-    "path": "blackboard.svg",
-    "license": "CC-BY-SA 4.0",
-    "authors": [
-      "VideoPlasty"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Blackboard_Flat_Icon_Vector.svg"
-    ]
-  },
   {
     "path": "childcare.svg",
     "license": "CC-BY",
diff --git a/assets/layers/school/school.json b/assets/layers/school/school.json
index de689d917..918a9dbf0 100644
--- a/assets/layers/school/school.json
+++ b/assets/layers/school/school.json
@@ -135,7 +135,7 @@
       },
       "multiAnswer": true,
       "render": {
-        "en":"This is a school for"
+        "en":"This is a school for {school:for}"
       },
       "freeform": {
         "key": "school:for",
diff --git a/assets/layers/tertiary_education/tertiary_education.json b/assets/layers/tertiary_education/tertiary_education.json
new file mode 100644
index 000000000..0ed43b6b2
--- /dev/null
+++ b/assets/layers/tertiary_education/tertiary_education.json
@@ -0,0 +1,82 @@
+{
+  "id": "tertiary_education",
+  "name": {
+    "en": "Colleges and universities"
+  },
+  "description": "Layer with all tertiary education institutes (ISCED:2011 levels 6,7 and 8)",
+  "source": {
+    "osmTags": {
+      "or": [
+        "amenity=college",
+        "amenity=university",
+        {
+          "and": [
+            "amenity=school",
+            {
+              "or": [
+                "isced:2011:level~.*bachelor.*",
+                "isced:2011:level~.*master.*"
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  },
+  "title": {
+    "mappings": [
+      {
+        "if": "name~*",
+        "then": {
+          "*":"{name}"
+        }
+      },
+      {
+        "if": "amenity=college",
+        "then": {
+          "en": "College",
+          "nl": "Hogeschool"
+        }
+      },{
+        "if": "amenity=university",
+        "then": {
+          "en": "University"
+        }
+      },
+      {
+        "if": "amenity=school",
+        "then": {
+          "en": "School providing tertiary education"
+        }
+      }
+    ]
+  },
+  "tagRenderings": [
+    "school.capacity",
+    "school.gender",
+    "school.target-audience",
+    "website",
+    "email",
+    "phone"
+  ],
+  "mapRendering": [{
+    "location": ["point","centroid"],
+    "iconSize": {
+      "render": "40,40,center"
+    },
+    "label": {
+      "mappings": [
+        {
+          "if": "name~*",
+          "then": "<div class='bg-white rounded-lg p-1'>{name}</div>"
+        }
+      ]
+    },
+    "icon": "circle:white;./assets/layers/school/college.svg"
+  },
+    {
+      "color": "#22f1f4",
+      "width": 1
+    }
+  ]
+}
\ No newline at end of file
diff --git a/assets/themes/schools/International Standard Classification of Education (ISCED) 2011.pdf b/assets/themes/education/International Standard Classification of Education (ISCED) 2011.pdf
similarity index 100%
rename from assets/themes/schools/International Standard Classification of Education (ISCED) 2011.pdf
rename to assets/themes/education/International Standard Classification of Education (ISCED) 2011.pdf
diff --git a/assets/themes/schools/diary.md b/assets/themes/education/diary.md
similarity index 100%
rename from assets/themes/schools/diary.md
rename to assets/themes/education/diary.md
diff --git a/assets/themes/schools/schools.json b/assets/themes/education/education.json
similarity index 87%
rename from assets/themes/schools/schools.json
rename to assets/themes/education/education.json
index d0765bcff..1874a2c32 100644
--- a/assets/themes/schools/schools.json
+++ b/assets/themes/education/education.json
@@ -1,5 +1,5 @@
 {
-  "id": "schools",
+  "id": "education",
   "description": {
     "en": "On this map, you'll find information about all types of schools and eduction and can easily add more information"
   },
@@ -15,6 +15,7 @@
   "icon": "./assets/layers/school/college.svg",
   "layers": [
     "kindergarten_childcare",
-    "school"
+    "school",
+    "tertiary_education"
   ]
 }
\ 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 b6c64173a..6f640b1f7 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -155,6 +155,10 @@
                 "if": "theme=drinking_water",
                 "then": "./assets/themes/drinking_water/logo.svg"
               },
+              {
+                "if": "theme=education",
+                "then": "./assets/layers/school/college.svg"
+              },
               {
                 "if": "theme=entrances",
                 "then": "./assets/layers/entrance/door.svg"
@@ -259,10 +263,6 @@
                 "if": "theme=postboxes",
                 "then": "./assets/themes/postboxes/postbox.svg"
               },
-              {
-                "if": "theme=schools",
-                "then": "./assets/layers/school/college.svg"
-              },
               {
                 "if": "theme=shops",
                 "then": "./assets/themes/shops/shop.svg"