-
Notifications
You must be signed in to change notification settings - Fork 821
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.
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
Render religious landuse and place of worship lighter #3493
Conversation
update with changes from master in past month
Follows pattern of amenity=bank
Followed pattern of amenity=bank
Added internet_cafe to amenitypoints and project.mss, and added icon to symbol/amenity
Internet cafe icon changed
…p-carto Updating my fork with the recent changes in the original master
Merging new changes from gravitystorm/openstreetmap-carto.
merge upstream changes into fork
merge upstream changes into branch
Did you try lighter alternatives? I guess that it could be still less dark. |
The commit list is very long, with unrelated items, for changing just two colour values? |
Yeah, I don’t know why it is showing all of the previous commits in my
fork, even though I just created this branch last week. Should I rebase the
branch on master or will that cause more problems? Or squash the commits?
…On Sat, Nov 3, 2018 at 6:26 AM polarbearing ***@***.***> wrote:
The commit list is very long, with unrelated items, for changing just two
colour values?
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#3493 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AoxshH-9ju8DxAYZ2fK0uy0AcbMGhzwkks5urLhvgaJpZM4YL2db>
.
|
Maybe you made the branch from some other branch, not from the current master? Squashing works, so this is not a big problem. |
Could you post how does it look like with this new shade? One simple "after" image would do. |
BTW: |
Good idea, I’ll try adding name labels.
(Foursquare, officially “The International Church of the Foursquare Gospel,
is a evangelical/protestant Christian denomination from the
Pentecostal/Charismatic tradition, founded by Amy Semple-McPherson in Los
Angeles in 1924; they “preach the foursquare Gospel.” Their logo has 4
symbols: a cross, crown, cup and dove. There is a big church in LA called
“Angeles Temple which used to be famous for extravagant Christmas pageants
and passion plays with live animals and flying “angels” thanks to
congregation members who worked in the Hollywood film business when Mrs.
Semple-McPherson was the preacher.
Probably they should have defended that trademark better...)
…On Wed, Nov 7, 2018 at 1:20 AM kocio-pl ***@***.***> wrote:
BTW: denomination=foursquare? 😄
https://www.openstreetmap.org/way/607212018
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#3493 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AoxshJ5X2rloGY3FuvLcmiTrpXHxp7DNks5usba3gaJpZM4YL2db>
.
|
Here are two options. 1) Add landuse_religious to the current rendering for amenity_place_of_worship, 2) Change rendering to match that of other landuses and societal amenities Code 1):
Code 2):
|
It would be interesting to see how it works with churches and other temples visible currently. |
Kona campus should be tagged as |
I meant checking the situation when both temple and landuse have their respective names. Won't the name of the landuse eclipse name+icon of a temple? |
So I need to find a named landuse=religious polygon with multiple smaller
place_of_worship areas or nodes inside with different names.
How can I search for that?
Or I could invent one on JOSM
…On Thu, Nov 8, 2018 at 1:21 AM kocio-pl ***@***.***> wrote:
I meant checking the situation when both temple and landuse have their
respective names. Won't the name of the landuse eclipse name+icon of a
temple?
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#3493 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AoxshO5nCWGZ25XBQtHeNm-vKER7a2oaks5uswiHgaJpZM4YL2db>
.
|
Adding the label is open in #3322 so it is a good idea to fix that en passant. The grey in the recent examples is very close to residential. It might be distinguishable in contrastive situations, but might be mis-recognised if standing alone. |
@polarbearing, do you prefer the slightly darker neutral gray #d0d0d0, or
one of the options with yellow/orange/brown?
…On Thu, Nov 8, 2018 at 9:22 AM polarbearing ***@***.***> wrote:
Adding the label is open in #3322
<#3322> so it
is a good idea to fix that en passant.
The grey in the recent examples is very close to residential. It might be
distinguishable in contrastive situations, but might be mis-recognised if
standing alone.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#3493 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AoxshEUHb9w4SwaKuW--hQdGO6yyiO8Zks5us3ldgaJpZM4YL2db>
.
|
Render landuse_religious in same text color as place_of_worship but in style of other landuses. Also render place_of_worship from z16 when waypixels greater than 3000
Fixes #3322 Amenity=place_of_worship labels will continue to be rendered the same as currently. Landuse=religious name label will be rendered the same as other landuse labels. I've done the renderings with #d0d0d0 as the color for the area, and darkened it 50% for the religious landuse label. I added the names to some areas in my town on JOSM for testing z17 Landuse=religious with 2 place_of_worship buildings and a node, in town. Church in the country (it's a round building) Test with large religious area with place_of_worship building almost at the center, made to see how the conflicting labels would resolve. It behaves as expected. |
amenity-points.mss
Outdated
[feature = 'amenity_place_of_worship'][zoom >= 17] { | ||
text-name: "[name]"; | ||
text-size: @standard-font-size; | ||
text-wrap-width: @standard-wrap-width; | ||
text-line-spacing: @standard-line-spacing-size; | ||
text-fill: #000033; | ||
text-fill: #000033; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a space to remove at the end.
Render landuse_religious in same text color as place_of_worship but in style of other landuses. Also render place_of_worship from z16 when waypixels greater than 3000. Changed fill color to #d0d0d0 as in test renderings. Amended commit to fix whitespace errors and duplicate code error.
It should be fixed now
…On Thu, Nov 8, 2018 at 11:12 PM kocio-pl ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In amenity-points.mss
<#3493 (comment)>
:
> [feature = 'amenity_place_of_worship'][zoom >= 17] {
text-name: "[name]";
text-size: @standard-font-size;
text-wrap-width: @standard-wrap-width;
text-line-spacing: @standard-line-spacing-size;
- text-fill: #33;
+ text-fill: #33;
Just a space to remove at the end.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#3493 (review)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AoxshBBRf79PgvAkJneGYmbUISEIO1cgks5utDu8gaJpZM4YL2db>
.
|
I'm happy with the results. Please just remove the extra space you have introduced by accident and this will be ready to merge - see #3493 (comment). |
yes d0d0d0 is fine for me |
Should be fixed now.
It’s strange; I fixed it locally on my system and used $ git push, and it
says all the changes are pushed, but github didn’t show the file change.
So I fixed it on GitHub.
Please comment on the new github workflow issue if you have time.
…On Sat, Nov 10, 2018 at 8:05 AM polarbearing ***@***.***> wrote:
yes d0d0d0 is fine for me
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#3493 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AoxshHfvFhKl2mXrNe7hovvF-hYmYEn7ks5utgpUgaJpZM4YL2db>
.
|
Thanks for the change and adding the label (thanks, @polarbearing!). I'm not able to give more attention to the OSM Carto than I already do, sorry about that. I'm not sure what was the reason and it takes some time to investigate, but in the end the most important thing is that I can squash and merge your code properly. |
Fixes #3457
Fixes #3322
Changes proposed in this pull request:
Change the fill color for religious landuse and places of worship to a lighter shade of gray
Change the outline to 30% darker than the new shade; significantly lighter than the previous outline
Test rendering with links to the example places:
Wamena, Indonesia
http://openstreetmap.org/#map=17/-4.09339/138.94656
z15 Before:
After:
z16 Before
After:
z17 Before
After:
YWAM campus in Kona, Hawaii
(This is a large religious campus)
http://openstreetmap.org/#map=16/19.6287/-155.9750
z15 Before:
After:
z16 Before:
After: