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.

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

Adding rendering for historic=city_gate #3235

Merged
merged 1 commit into from
May 17, 2018
Merged

Adding rendering for historic=city_gate #3235

merged 1 commit into from
May 17, 2018

Conversation

jragusa
Copy link
Contributor

@jragusa jragusa commented May 14, 2018

Fixes #152

Changes proposed in this pull request:
Show an icon and label for historic=city_gate in man_made colour

Test rendering with links to the example places:
https://www.openstreetmap.org/way/317181351
Before
city_gate_before

After
city_gate_yvoire_manmade

@kocio-pl
Copy link
Collaborator

Thanks, good to see this code!

I just think it makes more sense to move it to z17+, because it can be a part of something bigger and should not appear too early - that's why I pushed defensive towers there to not compete with castle for example, see this location:

z15
kxnkzv2x

z16
48zvso3r

z17
t3mky52h

@jragusa
Copy link
Contributor Author

jragusa commented May 14, 2018

Fixed

That should be correct now.

Oups: it's "shift" in the commit...

@kocio-pl
Copy link
Collaborator

You can try squashing commits into one by the way. There are multiple guides for this, like:

https://gist.github.com/patik/b8a9dc5cd356f9f6f980

but I do it with GUI called gitk under Linux. I make soft reset to the place right before my changes, so the commits are rolled back, while changed files are still there. Then I leave this app, make git add . and make new commit which holds all the changes. Then I push them with -f (force) option.

Quite easy and safe.

@jragusa
Copy link
Contributor Author

jragusa commented May 14, 2018

Done

I forgot that we can squash commits. Thanks to notice me @kocio-pl

@kocio-pl kocio-pl merged commit 0a041fa into gravitystorm:master May 17, 2018
@kocio-pl
Copy link
Collaborator

Thanks, it's good to see some of the oldest tickets going away...

@jragusa jragusa deleted the city_gate branch May 26, 2018 08:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants