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

Move parking back to amenity-points layers, change way_pixels limit and fix initial zoom level #3923

Merged
merged 3 commits into from
Oct 25, 2019
Merged

Move parking back to amenity-points layers, change way_pixels limit and fix initial zoom level #3923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bf4a11
Move parking back to amenity-points layers
jeisenbe Oct 5, 2019
825950c
Change parking text intial zoom to z14
jeisenbe Oct 5, 2019
939df0a
Change way_pixels limit for parking icon and text
jeisenbe Oct 5, 2019
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
38 changes: 19 additions & 19 deletions amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,27 +1434,12 @@
marker-fill: @man-made-icon;
}
}
}

#amenity-low-priority {
[feature = 'man_made_cross'][zoom >= 16],
[feature = 'historic_wayside_cross'][zoom >= 16] {
marker-file: url('symbols/man_made/cross.svg');
marker-fill: @religious-icon;
marker-clip: false;
}

[feature = 'historic_wayside_shrine'][zoom >= 17] {
marker-file: url('symbols/historic/shrine.svg');
marker-fill: @man-made-icon;
marker-clip: false;
}

[feature = 'amenity_parking'],
[feature = 'amenity_bicycle_parking'],
[feature = 'amenity_motorcycle_parking'],
[feature = 'amenity_parking_entrance'] {
[zoom >= 14][way_pixels > 900],
[zoom >= 14][way_pixels > 750],
[zoom >= 17][feature = 'amenity_parking'],
[zoom >= 18] {
[feature = 'amenity_parking'] { marker-file: url('symbols/amenity/parking.svg'); }
Expand All @@ -1466,6 +1451,21 @@
[access != ''][access != 'permissive'][access != 'yes'] { marker-opacity: 0.33; }
}
}
}

#amenity-low-priority {
[feature = 'man_made_cross'][zoom >= 16],
[feature = 'historic_wayside_cross'][zoom >= 16] {
marker-file: url('symbols/man_made/cross.svg');
marker-fill: @religious-icon;
marker-clip: false;
}

[feature = 'historic_wayside_shrine'][zoom >= 17] {
marker-file: url('symbols/historic/shrine.svg');
marker-fill: @man-made-icon;
marker-clip: false;
}

[feature = 'railway_level_crossing'][zoom >= 14]::railway,
[feature = 'railway_crossing'][zoom >= 15]::railway{
Expand Down Expand Up @@ -2924,14 +2924,12 @@
text-halo-fill: @standard-halo-fill;
text-face-name: @standard-font;
}
}

#text-low-priority {
[feature = 'amenity_parking'],
[feature = 'amenity_bicycle_parking'],
[feature = 'amenity_motorcycle_parking'],
[feature = 'amenity_parking_entrance'] {
[zoom >= 10][way_pixels > 900],
[zoom >= 14][way_pixels > 3000],
[zoom >= 18] {
text-name: "[name]";
text-size: @standard-font-size;
Expand All @@ -2950,7 +2948,9 @@
[feature = 'amenity_motorcycle_parking'] { text-dy: 12; }
}
}
}

#text-low-priority {
[feature = 'man_made_cross'][zoom >= 17],
[feature = 'historic_wayside_cross'][zoom >= 17],
[feature = 'historic_wayside_shrine'][zoom >= 17] {
Expand Down
18 changes: 9 additions & 9 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1460,6 +1460,13 @@ Layer:
'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END,
'barrier_' || CASE WHEN barrier IN ('toll_booth') AND way_area IS NULL THEN barrier ELSE NULL END,
'waterway_' || CASE WHEN waterway IN ('dam', 'weir', 'dock') THEN waterway ELSE NULL END,
'amenity_' || CASE WHEN amenity IN ('bicycle_parking', 'motorcycle_parking') THEN amenity ELSE NULL END,
'amenity_' || CASE WHEN amenity IN ('parking') AND (tags->'parking' NOT IN ('underground') OR (tags->'parking') IS NULL) THEN amenity ELSE NULL END,
'amenity_' || CASE WHEN amenity IN ('parking_entrance')
AND tags->'parking' IN ('underground')
AND (access IS NULL OR access NOT IN ('private', 'no'))
AND way_area IS NULL
THEN amenity ELSE NULL END,
'tourism_' || CASE WHEN tourism IN ('viewpoint', 'attraction') THEN tourism ELSE NULL END,
'place_' || CASE WHEN place IN ('locality') AND way_area IS NULL THEN place ELSE NULL END
) AS feature,
Expand Down Expand Up @@ -2194,13 +2201,6 @@ Layer:
COALESCE(
'highway_' || CASE WHEN highway IN ('mini_roundabout') AND way_area IS NULL THEN highway ELSE NULL END,
'railway_' || CASE WHEN railway IN ('level_crossing', 'crossing') AND way_area IS NULL THEN railway ELSE NULL END,
'amenity_' || CASE WHEN amenity IN ('bicycle_parking', 'motorcycle_parking') THEN amenity ELSE NULL END,
'amenity_' || CASE WHEN amenity IN ('parking') AND (tags->'parking' NOT IN ('underground') OR (tags->'parking') IS NULL) THEN amenity ELSE NULL END,
'amenity_' || CASE WHEN amenity IN ('parking_entrance')
AND tags->'parking' IN ('underground')
AND (access IS NULL OR access NOT IN ('private', 'no'))
AND way_area IS NULL
THEN amenity ELSE NULL END,
'amenity_' || CASE WHEN amenity IN ('bench', 'waste_basket', 'waste_disposal') AND way_area IS NULL THEN amenity ELSE NULL END,
'historic_' || CASE WHEN historic IN ('wayside_cross', 'wayside_shrine') AND way_area IS NULL THEN historic ELSE NULL END,
'man_made_' || CASE WHEN man_made IN ('cross') AND way_area IS NULL THEN man_made ELSE NULL END,
Expand Down Expand Up @@ -2243,7 +2243,7 @@ Layer:
) _
WHERE highway IN ('mini_roundabout')
OR railway IN ('level_crossing', 'crossing')
OR amenity IN ('parking', 'parking_entrance', 'bicycle_parking', 'motorcycle_parking', 'bench', 'waste_basket', 'waste_disposal')
OR amenity IN ('bench', 'waste_basket', 'waste_disposal')
OR historic IN ('wayside_cross', 'wayside_shrine')
OR man_made IN ('cross')
OR barrier IN ('bollard', 'gate', 'lift_gate', 'swing_gate', 'block', 'log', 'cattle_grid', 'stile', 'motorcycle_barrier', 'cycle_barrier', 'full-height_turnstile', 'turnstile', 'kissing_gate')
Expand All @@ -2262,4 +2262,4 @@ Layer:
# see https://github.com/gravitystorm/openstreetmap-carto/pull/1349#issuecomment-77805678
table: *amenity_low_priority_sql
properties:
minzoom: 10
minzoom: 17