Skip to content

Collapse definitions for normal roads, tunnels and bridges #382

Merged
merged 4 commits into from Mar 11, 2014

2 participants

@math1985
Collaborator
math1985 commented Mar 6, 2014

This collapses, per road type, definitions that are the same for normal
roads, tunnels and/or bridges.
In addition, it gives some instances clearer names.
This makes it more easy to maintain the code, and to detect inconsistent
definitions.

Changes in rendering:

  • Render minor service roads on bridges and tunnes smaller and on higher zoomlevels only, just like minor service roads that are not on a bridge or tunnel. This solves #269 on Github and 3883 on trac.
  • Restore bridges of bridleway, footway, cycleway, path, lightrail on z13.

This PR depends on #376, #377 and #381.

math1985 added some commits Mar 3, 2014
@math1985 math1985 Restore rendering of service roads and living_streets in tunnels and …
…on bridges
3c74350
@math1985 math1985 Resolve bug that causes spur, siding and yard not to render properly 541aa94
@math1985 math1985 Do not hide some bridges in z12/z13
- Do not hide secondary road bridges on z12
- Do not hide tertiary, residential, unclassified, and road bridges on z13

Conflicts:

	roads.mss
c60c077
@math1985 math1985 Collapse definitions for normal roads, tunnels and bridges
This collapses, per road type, definitions that are the same for normal
roads, tunnels and/or bridges.
In addition, it gives some instances clearer names.
This makes it more easy to maintain the code, and to detect inconsistent
definitions.

Changes in rendering:
* Render minor service roads on bridges and tunnels smaller and on higher
  zoomlevels only, just like minor service roads that are not on a
  bridge or tunnel. This solves #269 on Github and 3883 on trac.
* Restore bridges of bridleway, footway, cycleway, path, lightrail on
  z13.
0619b0b
@gravitystorm
Owner

This actually conflicts with the three previous pull requests that have been merged.

I'm not sure what's the best way forward - either reverting the previous pull requests and merging this on top of a clean v2.10.1, or rewriting this PR to work based on the current master branch. Thoughts?

@gravitystorm
Owner

I'm starting to figure out what's going on here - the commits you put into the previous pull requests are not the same commits as the ones you've included here, e.g.

math1985@cae1712 <- I merged this one

math1985@541aa94 <- one of the commits in this PR

This is throwing off all the merging. I think I'll revert the previous merges, and start again from this PR since (as far as I can tell) all the code changes are included here, simply with the commits in a different order and also with different commit ids.

@gravitystorm gravitystorm merged commit 0619b0b into gravitystorm:master Mar 11, 2014
@math1985
Collaborator

Sorry, I did not realize that cherry-pick does not preserve commit ids.

What you have done is equivalent to what I intended.

@math1985 math1985 deleted the math1985:collapse-roads branch Apr 10, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.