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

Fix for issue #6 #8

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 26 additions & 26 deletions map.mss
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ Map {
line-color: @color_administrative_lowzoom;
}

.country-boundary[scalerank<6] {
.country-boundary[SCALERANK<6] {
line-color: @color_administrative_dark;
line-width: 0.5;
}

.country-boundary-10m[scalerank<6] {
.country-boundary-10m[SCALERANK<6] {
::whiteout {
[zoom>=7] {
line-color: @color_administrative_bright;
Expand Down Expand Up @@ -80,51 +80,51 @@ Map {

#admin1-lines-10m,
#admin0-map-units-10m {
[zoom>=4][adm0_a3='CAN'],
[zoom>=4][adm0_a3='USA'],
[zoom>=4][adm0_a3='AUS'] {
[zoom>=4][ADM0_A3='CAN'],
[zoom>=4][ADM0_A3='USA'],
[zoom>=4][ADM0_A3='AUS'] {
line-width: 0.6;
line-color: @color_administrative_dark;
}

[zoom>=5][scalerank<=2],
[zoom>=5][featurecla='Map unit boundary'][adm0_a3='GBR'] {
[zoom>=5][SCALERANK<=2],
[zoom>=5][FEATURECLA='Map unit boundary'][ADM0_A3='GBR'] {
line-width: 0.6;
line-color: @color_administrative_dark;
}

[zoom>=6][scalerank<=4],
[zoom>=6][featurecla='Map unit boundary'][adm0_a3='GBR'] {
[zoom>=6][SCALERANK<=4],
[zoom>=6][FEATURECLA='Map unit boundary'][ADM0_A3='GBR'] {
line-width: 0.8;
line-color: @color_administrative_dark;
}

[zoom>=7][scalerank<=5] {
[zoom>=7][SCALERANK<=5] {
line-width: 1;
line-color: @color_administrative_medium_low;
line-dasharray: 1,5;
line-cap: round;
}

[zoom>=8][scalerank<=6] {
[zoom>=8][SCALERANK<=6] {
line-width: 1.2;
line-color: @color_administrative_medium_high;
line-dasharray: 1,5;
line-cap: round;
}

[zoom>=9][scalerank<=8] {
[zoom>=9][SCALERANK<=8] {
line-width: 1.2;
line-color: @color_administrative_medium_high2;
line-dasharray: 1,5;
line-cap: round;
}
}

#lakes-50m[zoom<3][scalerank<1],
#lakes-50m[zoom=3][scalerank<2],
#lakes-50m[zoom=4][scalerank<3],
#lakes-50m[zoom=5][scalerank<5],
#lakes-50m[zoom<3][SCALERANK<1],
#lakes-50m[zoom=3][SCALERANK<2],
#lakes-50m[zoom=4][SCALERANK<3],
#lakes-50m[zoom=5][SCALERANK<5],
#lakes-50m[zoom=6],
#lakes-10m,
{
Expand All @@ -138,43 +138,43 @@ Map {
line-opacity: 0.5;
line-width: 0;

[zoom=7][scalerank<=7] {
[zoom=7][SCALERANK<=7] {
line-width: 2.25;
}

[zoom=8][scalerank<=8] {
[zoom=8][SCALERANK<=8] {
line-width: 3.25;
}
}

line-color: @color_transport;
line-width: 0;

[zoom=6][scalerank>=3][scalerank<=6] {
[zoom=6][SCALERANK>=3][SCALERANK<=6] {
line-width: 0.1;
}

[zoom=7] {
[scalerank<=6],
[scalerank<=7][expressway=1],
[scalerank<=7][type='Major Highway'],
[scalerank<=7][type='Secondary Highway'],
[SCALERANK<=6],
[SCALERANK<=7][expressway=1],
[SCALERANK<=7][type='Major Highway'],
[SCALERANK<=7][type='Secondary Highway'],
{
line-width: 0.1;
}

[scalerank>=3][scalerank<=5] {
[SCALERANK>=3][SCALERANK<=5] {
line-width: 1.5;
}
}

[zoom=8] {
[scalerank<=8] {
[SCALERANK<=8] {
line-width: 0.1;
}

[type='Beltway'],
[scalerank<=8][expressway=1],
[SCALERANK<=8][expressway=1],
{
line-width: 1.5;
}
Expand Down
4 changes: 2 additions & 2 deletions sql/functions/highroad.sql
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ CREATE VIEW highroad_z15plus AS
railway,
(CASE WHEN highway IN ('motorway', 'motorway_link') THEN 'highway'
WHEN highway IN ('trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link') THEN 'major_road'
WHEN highway IN ('footpath', 'track', 'footway', 'steps', 'pedestrian', 'path', 'cycleway') THEN 'path'
WHEN highway IN ('footpath', 'track', 'footway', 'steps', 'pedestrian', 'living_street', 'path', 'cycleway') THEN 'path'
WHEN railway IN ('rail', 'tram', 'light_rail', 'narrow_gauge', 'monorail') THEN 'rail'
ELSE 'minor_road' END) AS kind,
(CASE WHEN highway IN ('motorway_link','trunk_link','primary_link','secondary_link','tertiary_link') THEN 'yes'
Expand Down Expand Up @@ -164,7 +164,7 @@ CREATE VIEW highroad_z15plus AS
WHERE highway IN ('motorway', 'motorway_link')
OR highway IN ('trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link')
OR highway IN ('residential', 'unclassified', 'road', 'unclassified', 'service', 'minor')
OR highway IN ('footpath', 'track', 'footway', 'steps', 'pedestrian', 'path', 'cycleway')
OR highway IN ('footpath', 'track', 'footway', 'steps', 'pedestrian', 'living_street', 'path', 'cycleway')
OR railway IN ('rail', 'tram', 'light_rail', 'narrow_gauge', 'monorail')
ORDER BY explicit_layer ASC, implied_layer ASC, priority DESC);

Expand Down