From e94d24ad276d933474748f90fde5eeb767b3d69b Mon Sep 17 00:00:00 2001 From: wmisener <58491489+wmisener@users.noreply.github.com> Date: Sat, 10 Jun 2023 08:58:19 -0700 Subject: [PATCH 1/5] College mortarboard POI Adds mortarboard icon, POI.js entries, and taginfo update --- icons/poi_college.svg | 3 +++ scripts/taginfo_template.json | 8 ++++---- src/layer/poi.js | 13 ++++++++++--- 3 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 icons/poi_college.svg diff --git a/icons/poi_college.svg b/icons/poi_college.svg new file mode 100644 index 000000000..f4aafa8ee --- /dev/null +++ b/icons/poi_college.svg @@ -0,0 +1,3 @@ + + + diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json index 088e144a0..b88dfe3b0 100644 --- a/scripts/taginfo_template.json +++ b/scripts/taginfo_template.json @@ -403,17 +403,17 @@ "key": "amenity", "value": "college", "object_types": ["node", "area"], - "description": "Schools are marked by an icon representing a schoolhouse with a triangular flag raised above it.", + "description": "Colleges are marked by an icon representing a mortarboard cap.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_school.svg" + "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_mortarboard.svg" }, { "key": "amenity", "value": "university", "object_types": ["node", "area"], - "description": "Schools are marked by an icon representing a schoolhouse with a triangular flag raised above it.", + "description": "Colleges are marked by an icon representing a mortarboard cap.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_school.svg" + "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_mortarboard.svg" }, { "key": "amenity", diff --git a/src/layer/poi.js b/src/layer/poi.js index 9ccda2658..4d0a7b8c0 100644 --- a/src/layer/poi.js +++ b/src/layer/poi.js @@ -103,12 +103,19 @@ var iconDefs = { school: { classes: { school: ["kindergarten", "school"], - college: ["college", "university"], }, sprite: "poi_school", color: Color.poi.infrastructure, description: "School", }, + college: { + classes: { + college: ["college", "university"], + }, + sprite: "poi_college", + color: Color.poi.infrastructure, + description: "College or university", + }, townhall: { classes: { town_hall: ["townhall"], @@ -178,7 +185,7 @@ export const poi = { Color.poi.transport, ["museum"], Color.poi.attraction, - ["hospital", "parking", "police", "school", "townhall"], + ["hospital", "parking", "police", "school", "college", "townhall"], Color.poi.infrastructure, Color.poi.infrastructure, ], @@ -191,7 +198,7 @@ export const poi = { ["get", "subclass"], ["station", "halt"], 12, - ["bus_station", "subway"], + ["bus_station", "subway", ...getSubclasses(iconDefs.college)], 14, [ "bus_stop", From f53ff0a8b80e1628115386776952e1328d7b38aa Mon Sep 17 00:00:00 2001 From: wmisener <58491489+wmisener@users.noreply.github.com> Date: Sat, 10 Jun 2023 09:15:37 -0700 Subject: [PATCH 2/5] Add halo --- icons/poi_college.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icons/poi_college.svg b/icons/poi_college.svg index f4aafa8ee..3ff591076 100644 --- a/icons/poi_college.svg +++ b/icons/poi_college.svg @@ -1,3 +1,3 @@ - + From 833ed4791dd5e5e0334ccde592966a914b8a9e29 Mon Sep 17 00:00:00 2001 From: wmisener <58491489+wmisener@users.noreply.github.com> Date: Mon, 12 Jun 2023 15:04:10 -0700 Subject: [PATCH 3/5] Update scripts/taginfo_template.json Typo in taginfo path Co-authored-by: Drew M Johnson --- scripts/taginfo_template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json index b88dfe3b0..331ba342a 100644 --- a/scripts/taginfo_template.json +++ b/scripts/taginfo_template.json @@ -405,7 +405,7 @@ "object_types": ["node", "area"], "description": "Colleges are marked by an icon representing a mortarboard cap.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_mortarboard.svg" + "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_college.svg" }, { "key": "amenity", From f9e23abfae108f832e38296e4b2fd51a912bec59 Mon Sep 17 00:00:00 2001 From: wmisener <58491489+wmisener@users.noreply.github.com> Date: Mon, 12 Jun 2023 15:04:58 -0700 Subject: [PATCH 4/5] Update scripts/taginfo_template.json Co-authored-by: Drew M Johnson --- scripts/taginfo_template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json index 331ba342a..1165744b1 100644 --- a/scripts/taginfo_template.json +++ b/scripts/taginfo_template.json @@ -413,7 +413,7 @@ "object_types": ["node", "area"], "description": "Colleges are marked by an icon representing a mortarboard cap.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_mortarboard.svg" + "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_college.svg" }, { "key": "amenity", From 8365fe2f5975ec0958243eae77e9a9d4e9e058f5 Mon Sep 17 00:00:00 2001 From: wmisener <58491489+wmisener@users.noreply.github.com> Date: Thu, 15 Jun 2023 22:52:06 -0700 Subject: [PATCH 5/5] Change name back to poi_mortarboard --- icons/{poi_college.svg => poi_mortarboard.svg} | 0 scripts/taginfo_template.json | 4 ++-- src/layer/poi.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename icons/{poi_college.svg => poi_mortarboard.svg} (100%) diff --git a/icons/poi_college.svg b/icons/poi_mortarboard.svg similarity index 100% rename from icons/poi_college.svg rename to icons/poi_mortarboard.svg diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json index 1165744b1..b88dfe3b0 100644 --- a/scripts/taginfo_template.json +++ b/scripts/taginfo_template.json @@ -405,7 +405,7 @@ "object_types": ["node", "area"], "description": "Colleges are marked by an icon representing a mortarboard cap.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_college.svg" + "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_mortarboard.svg" }, { "key": "amenity", @@ -413,7 +413,7 @@ "object_types": ["node", "area"], "description": "Colleges are marked by an icon representing a mortarboard cap.", "doc_url": "https://openmaptiles.org/schema/#poi", - "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_college.svg" + "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_mortarboard.svg" }, { "key": "amenity", diff --git a/src/layer/poi.js b/src/layer/poi.js index 4d0a7b8c0..178687bda 100644 --- a/src/layer/poi.js +++ b/src/layer/poi.js @@ -112,7 +112,7 @@ var iconDefs = { classes: { college: ["college", "university"], }, - sprite: "poi_college", + sprite: "poi_mortarboard", color: Color.poi.infrastructure, description: "College or university", },