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

Remove rendering of residential, unclassified, cycleway, path, track highway areas #4096

Merged
merged 5 commits into from
Apr 15, 2020
Merged
Show file tree
Hide file tree
Changes from 3 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
12 changes: 6 additions & 6 deletions project.mml
Original file line number Diff line number Diff line change
Expand Up @@ -642,15 +642,15 @@ Layer:
(SELECT
way,
COALESCE((
'highway_' || (CASE WHEN highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'cycleway', 'track', 'path', 'platform') THEN highway END)),
'highway_' || (CASE WHEN highway IN ('pedestrian', 'service', 'platform') THEN highway END)),
('railway_' || (CASE WHEN (railway IN ('platform')
AND (tags->'location' NOT IN ('underground') OR (tags->'location') IS NULL)
AND (tunnel NOT IN ('yes', 'building_passage') OR tunnel IS NULL)
AND (covered NOT IN ('yes') OR covered IS NULL))
THEN railway END))
) AS feature
FROM planet_osm_polygon
WHERE highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'track', 'path', 'platform')
WHERE highway IN ('pedestrian', 'service', 'platform')
OR (railway IN ('platform')
AND (tags->'location' NOT IN ('underground') OR (tags->'location') IS NULL)
AND (tunnel NOT IN ('yes', 'building_passage') OR tunnel IS NULL)
Expand Down Expand Up @@ -764,8 +764,8 @@ Layer:
(SELECT
way,
COALESCE(
('highway_' || (CASE WHEN highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'cycleway', 'living_street',
'track', 'path', 'platform', 'services') THEN highway END)),
('highway_' || (CASE WHEN highway IN ('pedestrian', 'service', 'living_street',
'platform', 'services') THEN highway END)),
('railway_' || (CASE WHEN (railway IN ('platform')
AND (tags->'location' NOT IN ('underground') OR (tags->'location') IS NULL)
AND (tunnel NOT IN ('yes', 'building_passage') OR tunnel IS NULL)
Expand All @@ -774,7 +774,7 @@ Layer:
(('aeroway_' || CASE WHEN aeroway IN ('runway', 'taxiway', 'helipad') THEN aeroway END))
) AS feature
FROM planet_osm_polygon
WHERE highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'living_street', 'track', 'path', 'platform', 'services')
WHERE highway IN ('pedestrian', 'service', 'living_street', 'platform', 'services')
OR (railway IN ('platform')
AND (tags->'location' NOT IN ('underground') OR (tags->'location') IS NULL)
AND (tunnel NOT IN ('yes', 'building_passage') OR tunnel IS NULL)
Expand Down Expand Up @@ -1758,7 +1758,7 @@ Layer:
name
FROM planet_osm_polygon
WHERE way && !bbox!
AND (highway IN ('residential', 'unclassified', 'pedestrian', 'service', 'footway', 'cycleway', 'living_street', 'track', 'path', 'platform')
Copy link
Collaborator

Choose a reason for hiding this comment

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

'footway' is missing here

AND (highway IN ('pedestrian', 'service', 'living_street', 'platform')
OR (railway IN ('platform')
AND (tags->'location' NOT IN ('underground') OR (tags->'location') IS NULL)
AND (tunnel NOT IN ('yes', 'building_passage') OR tunnel IS NULL)
Expand Down
26 changes: 2 additions & 24 deletions style/roads.mss
Original file line number Diff line number Diff line change
Expand Up @@ -2570,33 +2570,20 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
}

#highway-area-casing {
[feature = 'highway_residential'],
[feature = 'highway_unclassified'],
[feature = 'highway_service'] {
[zoom >= 14] {
line-color: #999;
line-width: 1;
}
}

[feature = 'highway_pedestrian'],
[feature = 'highway_footway'],
[feature = 'highway_cycleway'],
[feature = 'highway_path'] {
[feature = 'highway_pedestrian'] {
[zoom >= 15] {
line-color: grey;
line-width: 1;
}
}

[feature = 'highway_track'][zoom >= 15] {
line-color: @track-fill;
line-width: 1;
line-dasharray: 5,4,2,4;
line-cap: round;
line-join: round;
}

[feature = 'highway_platform'],
[feature = 'railway_platform'] {
[zoom >= 16] {
Expand All @@ -2613,27 +2600,18 @@ tertiary is rendered from z10 and is not included in osm_planet_roads. */
polygon-fill: @living-street-fill;
}

[feature = 'highway_residential'],
[feature = 'highway_unclassified'],
[feature = 'highway_service'] {
[zoom >= 14] {
polygon-fill: #fff;
}
}

[feature = 'highway_pedestrian'],
[feature = 'highway_footway'],
[feature = 'highway_cycleway'],
[feature = 'highway_path'] {
[feature = 'highway_pedestrian'] {
[zoom >= 15] {
polygon-fill: @pedestrian-fill;
}
}

[feature = 'highway_track'][zoom >= 15] {
polygon-fill: #cdbea0;
}

[feature = 'highway_platform'],
[feature = 'railway_platform'] {
[zoom >= 16] {
Expand Down