Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Distinct college/university icon #870

Merged
merged 14 commits into from
Jul 9, 2023
Merged

Distinct college/university icon #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e94d24a
College mortarboard POI
wmisener Jun 10, 2023
f53ff0a
Add halo
wmisener Jun 10, 2023
833ed47
Update scripts/taginfo_template.json
wmisener Jun 12, 2023
f9e23ab
Update scripts/taginfo_template.json
wmisener Jun 12, 2023
8365fe2
Change name back to poi_mortarboard
wmisener Jun 16, 2023
3d3d354
Merge branch 'main' into wmisener/university
ZeLonewolf Jun 18, 2023
e729a1c
Merge branch 'main' into wmisener/university
ZeLonewolf Jun 21, 2023
5a52285
Merge branch 'main' into wmisener/university
ZeLonewolf Jun 21, 2023
b7c487c
Merge branch 'main' into wmisener/university
ZeLonewolf Jun 21, 2023
7347369
Merge branch 'main' into wmisener/university
ZeLonewolf Jun 21, 2023
a22fa28
Merge branch 'main' into wmisener/university
ZeLonewolf Jun 21, 2023
069285d
Merge branch 'main' into wmisener/university
ZeLonewolf Jun 27, 2023
78e9947
Merge branch 'main' into wmisener/university
ZeLonewolf Jul 4, 2023
58ac8de
Merge branch 'main' into wmisener/university
ZeLonewolf Jul 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions icons/poi_mortarboard.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions scripts/taginfo_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
wmisener marked this conversation as resolved.
Show resolved Hide resolved
},
{
"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"
wmisener marked this conversation as resolved.
Show resolved Hide resolved
},
{
"key": "amenity",
Expand Down
13 changes: 10 additions & 3 deletions src/layer/poi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_mortarboard",
color: Color.poi.infrastructure,
description: "College or university",
},
townhall: {
classes: {
town_hall: ["townhall"],
Expand Down Expand Up @@ -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,
],
Expand All @@ -191,7 +198,7 @@ export const poi = {
["get", "subclass"],
["station", "halt"],
12,
["bus_station", "subway"],
["bus_station", "subway", ...getSubclasses(iconDefs.college)],
14,
[
"bus_stop",
Expand Down