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

add rendering of abandoned:name instead of name=* on railway=abandoned #154

Merged
merged 1 commit into from May 26, 2015

Conversation

Nakaner
Copy link
Contributor

@Nakaner Nakaner commented Feb 22, 2015

This fixes #114

@DerDakon
Copy link
Contributor

  • in case abandoned:ref is preset this should be preferred over ref, too
  • this probably should also be applied to razed tracks?
  • the third hunk only adds whitespace noise

@Nakaner
Copy link
Contributor Author

Nakaner commented Mar 21, 2015

@DerDakon I added support for abandoned:ref=*, razed:name=* and razed:ref=*.

@DerDakon
Copy link
Contributor

There is a trailing whitespace in the first hunk.

Remove, then git commit --amend styles/standard.mapcss && git push --force

@DerDakon
Copy link
Contributor

DerDakon commented May 4, 2015

To fix the whitespace issue in the first commit:

git checkout issue-114-abandoned-name
git rebase -i HEAD~2 ## change the "pick" in the first line to "edit", then save
echo -e 'n\nn\ny' | git checkout --patch issue-114-abandoned-name styles/standard.mapcss
git rebase --continue
git push --force

I wonder if it isn't much easier to drop everything but the "text" line from all but the first statements: it's only the text line that is changed, and repeating everything else makes this harder to find out.

@Nakaner
Copy link
Contributor Author

Nakaner commented May 13, 2015

I fixed all the issues @DerDakon mentioned. This PR can be merged now.

@DerDakon
Copy link
Contributor

  • you have several instances of eval(tag("x")), which can be changed to a simple "x"
  • I would keep the default text when defining the rail rendering, and just overwrite it later, this saves one markup block

And I would suggest squashing everything together, as you have many changes that live only for one commit and are then overwritten.

abandoned:name and abandoned:ref, razed:name and razed:ref are no preferred on
abandoned/razed railway. It the are not tagged name=* and ref=* is still used.
rurseekatze added a commit that referenced this pull request May 26, 2015
Add rendering of abandoned:name instead of name=* on railway=abandoned (same for razed)
@rurseekatze rurseekatze merged commit 36edfe5 into OpenRailwayMap:master May 26, 2015
@Nakaner Nakaner deleted the issue-114-abandoned-name branch June 22, 2015 21:34
rurseekatze added a commit that referenced this pull request Dec 4, 2015
Add rendering of abandoned:name instead of name=* on railway=abandoned (same for razed)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use abandoned:name to render the name of razed tracks.
3 participants