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

New road style - rework road colours, road widths and display of railway=rail #1736

Merged
merged 38 commits into from
Sep 17, 2015
Merged

New road style - rework road colours, road widths and display of railway=rail #1736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
5c8413c
make railway=rail and roads more distinguishable. increase rail visib…
matkoniecz Jul 20, 2015
1eb87db
New road style - rework road colours, road widths and display of rail…
matkoniecz Jul 29, 2015
55c4b27
rework width for service roads
matkoniecz Aug 11, 2015
3887b27
refactor setting casings
matkoniecz Aug 12, 2015
67251c8
reduce casing for secondaries at z14 and z13
matkoniecz Aug 12, 2015
09debc1
fix bug in script producing a wrong comment
matkoniecz Aug 12, 2015
2d52532
fix tertiary construction
matkoniecz Aug 12, 2015
bcd2543
allow setting motorway, trunk width on z8
matkoniecz Aug 12, 2015
9252648
motorway, trunk, primary - width 1.0 on z8
matkoniecz Aug 12, 2015
2db464a
Merge branch 'master' into trunk
matkoniecz Aug 14, 2015
2c53c69
glow for secondary on z9 and z10 and for tertiary on z11
matkoniecz Aug 13, 2015
e60e2f3
z11 is now again without casings and using low zoom style
matkoniecz Aug 14, 2015
3456586
narrower trunk on z7
matkoniecz Aug 24, 2015
9896b5f
less wide railway on z7
matkoniecz Aug 24, 2015
5ed16df
fix inconsistent widths on z10 and z11
matkoniecz Aug 27, 2015
112641e
add missing glow for decondaries at z11
matkoniecz Aug 27, 2015
3a07f1f
handle cases like min_h = 280; max_h = 460
matkoniecz Aug 27, 2015
31485b5
tweak and extend halos to z10 tertiary and z12 unclassified
matkoniecz Aug 27, 2015
969e04d
show red dashes for steps
matkoniecz Aug 25, 2015
0303956
rework private access width
matkoniecz Aug 25, 2015
2347f82
make access=private/no visible on red roads
matkoniecz Aug 25, 2015
93d2e80
rework also destination marks
matkoniecz Aug 25, 2015
7a4580f
remove duplicated and dead code
matkoniecz Aug 27, 2015
32f701a
stronger casing for minor roads at z14
matkoniecz Aug 27, 2015
3ca84ce
Merge branch 'master' into gsoc
matkoniecz Aug 28, 2015
c9af9f7
Merge branch 'master' into gsoc
matkoniecz Aug 28, 2015
084732f
refactoring of minor details
matkoniecz Aug 30, 2015
66929b6
proper definition of highway=road
matkoniecz Aug 30, 2015
b650836
drop unneded duplicates of z limits
matkoniecz Aug 30, 2015
48d31e7
fix name collision
matkoniecz Aug 30, 2015
39491d4
unify code style
matkoniecz Aug 30, 2015
c7d750e
introduce new variable for unimportant roads
matkoniecz Aug 30, 2015
46b169d
stop importing unused modules in the helper script
matkoniecz Sep 6, 2015
535e2c4
better documentation of development dependencies
matkoniecz Sep 6, 2015
4943686
stop using numpy in the helper script
matkoniecz Sep 6, 2015
c6269ed
Restore numpy in the helper script
matkoniecz Sep 6, 2015
57f5037
Refact road colour generation script
pnorman Sep 11, 2015
9c22482
Merge pull request #2 from pnorman/gsoc_road_colours
matkoniecz Sep 11, 2015
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
4 changes: 4 additions & 0 deletions INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,8 @@ If you aren't using TileMill, you can compile the CartoCSS stylesheets into Mapn
* curl, unzip for downloading and decompressing files
* shapeindex (a companion utility to Mapnik found in the mapnik-utils package) for indexing downloaded shapefiles

### Development dependencies

* Python and Ruby to run helper scripts
* [PyYAML](http://pyyaml.org/wiki/PyYAML) if editing the MML (layer definition) file (packaged as `python-yaml` on Ubuntu, or installed with `pip install pyyaml`)
* [Color Math](https://github.com/gtaylor/python-colormath) and [numpy](http://www.numpy.org/) if running generate_road_colors.py helper script (may be obtained with `pip install colormath numpy`)
Binary file modified preview.png
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.
6 changes: 3 additions & 3 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@
],
"properties": {
"group-by": "layernotnull",
"minzoom": 10
"minzoom": 9
},
"advanced": {}
},
Expand Down Expand Up @@ -835,7 +835,7 @@
],
"id": "roads-casing",
"properties": {
"minzoom": 10
"minzoom": 9
},
"advanced": {}
},
Expand Down Expand Up @@ -1018,7 +1018,7 @@
],
"properties": {
"group-by": "layernotnull",
"minzoom": 10
"minzoom": 9
},
"advanced": {}
},
Expand Down
6 changes: 3 additions & 3 deletions project.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ Layer:
) AS tunnels
properties:
group-by: "layernotnull"
minzoom: 10
minzoom: 9
advanced: {}
- id: "citywalls"
name: "citywalls"
Expand Down Expand Up @@ -890,7 +890,7 @@ Layer:
CASE WHEN int_surface IN ('unpaved') THEN 0 ELSE 2 END
) AS roads_casing
properties:
minzoom: 10
minzoom: 9
Copy link
Collaborator

Choose a reason for hiding this comment

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

if this is adjusted does roads-low-zoom need adjustment?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It still used at z9 instead of *-fill layers.

Given that these layers are used anyway on z9 (solely to display highway=secondary halo) I am not sure what would result in the better performance.

Copy link
Collaborator

Choose a reason for hiding this comment

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

We should avoid having both high zoom and low zoom layers active at the same zoom level.

This may mean rendering from the high zoom layer in the same style as the low zoom layer.

advanced: {}
- id: "highway-area-fill"
name: "highway-area-fill"
Expand Down Expand Up @@ -1275,7 +1275,7 @@ Layer:
) AS bridges
properties:
group-by: "layernotnull"
minzoom: 10
minzoom: 9
advanced: {}
- id: "guideways"
name: "guideways"
Expand Down
Loading