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

Add places of worship #910

Merged
merged 7 commits into from
Sep 22, 2023
Merged

Add places of worship #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f19784c
worship icons, POI, and taginfo
wmisener Aug 2, 2023
ce3c4d8
Merge branch 'main' into wmisener/pow
wmisener Aug 2, 2023
0fe7ae8
Merge branch 'main' into wmisener/pow
ZeLonewolf Aug 12, 2023
30dfff4
New Judaism symbol and switched to blue
wmisener Aug 15, 2023
84c0eaf
Merge branch 'wmisener/pow' of https://github.com/wmisener/openstreet…
wmisener Aug 15, 2023
3dc8c94
Merge branch 'main' into wmisener/pow
wmisener Aug 15, 2023
a01fd30
Merge branch 'main' into wmisener/pow
ZeLonewolf Sep 19, 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_pow_buddhist.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.
5 changes: 5 additions & 0 deletions icons/poi_pow_christian.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.
5 changes: 5 additions & 0 deletions icons/poi_pow_generic.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.
3 changes: 3 additions & 0 deletions icons/poi_pow_hindu.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.
3 changes: 3 additions & 0 deletions icons/poi_pow_jewish.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.
3 changes: 3 additions & 0 deletions icons/poi_pow_muslim.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.
3 changes: 3 additions & 0 deletions icons/poi_pow_shinto.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.
3 changes: 3 additions & 0 deletions icons/poi_pow_sikh.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.
4 changes: 4 additions & 0 deletions icons/poi_pow_taoist.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.
73 changes: 73 additions & 0 deletions scripts/taginfo_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,14 @@
"doc_url": "https://openmaptiles.org/schema/#poi",
"icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_p.svg"
},
{
"key": "amenity",
"value": "place_of_worship",
"object_types": ["node", "area"],
"description": "Places of worship are marked by a square representing a building, topped with a finial representing the religion for common religions.",
"doc_url": "https://openmaptiles.org/schema/#poi",
"icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_generic.svg"
},
{
"key": "amenity",
"value": "bus_station",
Expand Down Expand Up @@ -552,6 +560,71 @@
"doc_url": "https://openmaptiles.org/schema/#poi",
"icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_rail.svg"
},
{
"key": "religion",
"value": "buddhist",
"object_types": ["node", "area"],
"description": "Buddhist places of worship are marked by an icon representing a building topped by a dharmachakra.",
"doc_url": "https://openmaptiles.org/schema/#poi",
"icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_buddhist.svg"
},
{
"key": "religion",
"value": "christian",
"object_types": ["node", "area"],
"description": "Christian places of worship are marked by an icon representing a building topped by a cross.",
"doc_url": "https://openmaptiles.org/schema/#poi",
"icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_christian.svg"
},
{
"key": "religion",
"value": "hindu",
"object_types": ["node", "area"],
"description": "Hindu places of worship are marked by an icon representing a building topped by an om symbol.",
"doc_url": "https://openmaptiles.org/schema/#poi",
"icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_hindu.svg"
},
{
"key": "religion",
"value": "jewish",
"object_types": ["node", "area"],
"description": "Jewish places of worship are marked by an icon representing a building topped by a star of David.",
"doc_url": "https://openmaptiles.org/schema/#poi",
"icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_jewish.svg"
},
{
"key": "religion",
"value": "muslim",
"object_types": ["node", "area"],
"description": "Muslim places of worship are marked by an icon representing a building topped by a star and crescent.",
"doc_url": "https://openmaptiles.org/schema/#poi",
"icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_muslim.svg"
},
{
"key": "religion",
"value": "sikh",
"object_types": ["node", "area"],
"description": "Sikh places of worship are marked by an icon representing a building topped by a khanda.",
"doc_url": "https://openmaptiles.org/schema/#poi",
"icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_sikh.svg"
},
{
"key": "religion",
"value": "shinto",
"object_types": ["node", "area"],
"description": "Shinto places of worship are marked by an icon representing a building topped by a torii.",
"doc_url": "https://openmaptiles.org/schema/#poi",
"icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_shinto.svg"
},
{
"key": "religion",
"value": "taoist",
"object_types": ["node", "area"],
"description": "Taoist places of worship are marked by an icon representing a building topped by a yin-yang symbol.",
"doc_url": "https://openmaptiles.org/schema/#poi",
"icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_pow_taoist.svg"
},

{
"key": "highway",
"value": "motorway",
Expand Down
89 changes: 88 additions & 1 deletion src/layer/poi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,70 @@ var iconDefs = {
color: Color.poi.infrastructure,
description: "Police station",
},
pow_buddhist: {
classes: {
place_of_worship: ["buddhist"],
},
sprite: "poi_pow_buddhist",
color: Color.poi.infrastructure,
description: "Buddhist place of worship",
},
pow_christian: {
classes: {
place_of_worship: ["christian"],
},
sprite: "poi_pow_christian",
color: Color.poi.infrastructure,
description: "Christian place of worship",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

id-tagging-schema calls this tagging combination simply “Christian church”, and there are other religion-specific descriptions for other religion values.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm open to this, and considered it for the initial PR, though I worried it gets into complicated terminology issues quickly. For instance, not all amenity=place_of_worship + religion=christian are churches (like LDS Temples or even holy wells), some sects of Judaism call their houses of worship 'temples' or 'shuls' instead of synagogues, what iD labels as "Sikh temples" are actually called gurdwaras, etc. But maybe these are small potatoes compared to the improvement in how understandable the legend would be.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That’s true, your point probably matters more in the context of a public-facing map like Americana than something internal to OSM like iD. The diplomatic “place of worship” terminology isn’t inaccurate, just wordy, but we have enough room for it.

},
pow_hindu: {
classes: {
place_of_worship: ["hindu"],
},
sprite: "poi_pow_hindu",
color: Color.poi.infrastructure,
description: "Hindu place of worship",
},
pow_jewish: {
classes: {
place_of_worship: ["jewish"],
},
sprite: "poi_pow_jewish",
color: Color.poi.infrastructure,
description: "Jewish place of worship",
},
pow_muslim: {
classes: {
place_of_worship: ["muslim"],
},
sprite: "poi_pow_muslim",
color: Color.poi.infrastructure,
description: "Muslim place of worship",
},
pow_sikh: {
classes: {
place_of_worship: ["sikh"],
},
sprite: "poi_pow_sikh",
color: Color.poi.infrastructure,
description: "Sikh place of worship",
},
pow_shinto: {
classes: {
place_of_worship: ["shinto"],
},
sprite: "poi_pow_shinto",
color: Color.poi.infrastructure,
description: "Shinto place of worship",
},
pow_taoist: {
classes: {
place_of_worship: ["taoist"],
},
sprite: "poi_pow_taoist",
color: Color.poi.infrastructure,
description: "Taoist place of worship",
},
railway_station: {
classes: {
railway: ["station", "halt", "subway"],
Expand Down Expand Up @@ -185,7 +249,22 @@ export const poi = {
Color.poi.transport,
["museum"],
Color.poi.attraction,
["hospital", "parking", "police", "school", "college", "townhall"],
[
"hospital",
"parking",
"police",
"school",
"college",
"townhall",
...getSubclasses(iconDefs.pow_christian),
...getSubclasses(iconDefs.pow_buddhist),
...getSubclasses(iconDefs.pow_hindu),
...getSubclasses(iconDefs.pow_jewish),
...getSubclasses(iconDefs.pow_muslim),
...getSubclasses(iconDefs.pow_sikh),
...getSubclasses(iconDefs.pow_shinto),
...getSubclasses(iconDefs.pow_taoist),
],
Color.poi.infrastructure,
Color.poi.infrastructure,
],
Expand All @@ -205,6 +284,14 @@ export const poi = {
"hospital",
"museum",
"police",
...getSubclasses(iconDefs.pow_buddhist),
...getSubclasses(iconDefs.pow_christian),
...getSubclasses(iconDefs.pow_hindu),
...getSubclasses(iconDefs.pow_jewish),
...getSubclasses(iconDefs.pow_muslim),
...getSubclasses(iconDefs.pow_sikh),
...getSubclasses(iconDefs.pow_shinto),
...getSubclasses(iconDefs.pow_taoist),
...getSubclasses(iconDefs.school),
"townhall",
"tram_stop",
Expand Down