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

toll booth symbol #3005

Merged
merged 1 commit into from
Feb 21, 2018
Merged
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
9 changes: 9 additions & 0 deletions amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,13 @@
marker-clip: false;
}

[feature = 'barrier_toll_booth'][zoom >= 16] {
marker-file: url('symbols/toll_booth.svg');
marker-fill: @transportation-icon;
marker-placement: interior;
marker-clip: false;
}

[feature = 'amenity_cafe'][zoom >= 17] {
marker-file: url('symbols/cafe.svg');
marker-fill: @gastronomy;
Expand Down Expand Up @@ -1209,6 +1216,7 @@

[feature = 'amenity_car_rental'][zoom >= 17],
[feature = 'amenity_bicycle_rental'][zoom >= 17],
[feature = 'barrier_toll_booth'][zoom >= 17],
[feature = 'leisure_slipway'][zoom >= 17] {
text-name: "[name]";
text-size: @standard-font-size;
Expand All @@ -1217,6 +1225,7 @@
text-fill: @transportation-text;
[feature = 'amenity_car_rental'] { text-dy: 10; }
[feature = 'amenity_bicycle_rental'] { text-dy: 10; }
[feature = 'barrier_toll_booth'] { text-dy: 13; }
[feature = 'leisure_slipway'] { text-dy: 13; }
text-face-name: @standard-font;
text-halo-radius: @standard-halo-radius;
Expand Down
4 changes: 4 additions & 0 deletions project.mml
Original file line number Diff line number Diff line change
Expand Up @@ -1542,6 +1542,7 @@ Layer:
WHEN tags @> 'ford=>yes' OR tags @> 'ford=>stepping_stones' THEN 'ford' ELSE NULL END,
'power_' || CASE WHEN power IN ('generator') THEN power ELSE NULL END,
'tourism_' || CASE WHEN tourism IN ('viewpoint') THEN tourism ELSE NULL END,
'barrier_' || CASE WHEN barrier IN ('toll_booth') THEN barrier ELSE NULL END,
'man_made_' || CASE WHEN man_made IN ('cross') THEN man_made ELSE NULL END,
'historic_' || CASE WHEN historic IN ('wayside_cross') THEN historic ELSE NULL END
) AS feature,
Expand Down Expand Up @@ -1580,6 +1581,7 @@ Layer:
OR shop IS NOT NULL
OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'slipway',
'dog_park', 'fitness_centre', 'fitness_station', 'firepit')
OR barrier IN ('toll_booth')
OR man_made IN ('mast', 'water_tower', 'lighthouse', 'windmill', 'cross', 'obelisk')
OR "natural" IN ('peak', 'volcano', 'saddle', 'spring', 'cave_entrance')
OR historic IN ('memorial', 'monument', 'archaeological_site', 'wayside_cross')
Expand Down Expand Up @@ -2113,6 +2115,7 @@ Layer:
'scree', 'shingle', 'bare_rock', 'sand', 'heath', 'grassland', 'scrub', 'beach', 'glacier', 'tree')
THEN "natural" ELSE NULL END,
'place_' || CASE WHEN place IN ('island', 'islet') THEN place ELSE NULL END,
'barrier_' || CASE WHEN barrier IN ('toll_booth') THEN barrier ELSE NULL END,
'military_' || CASE WHEN military IN ('danger_area', 'bunker') THEN military ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site')
THEN concat_ws('_', historic, CASE WHEN tags->'memorial' IN ('plaque') THEN tags->'memorial' ELSE NULL END)
Expand Down Expand Up @@ -2156,6 +2159,7 @@ Layer:
OR man_made IN ('lighthouse', 'windmill', 'mast', 'water_tower', 'cross', 'obelisk', 'works')
OR "natural" IS NOT NULL
OR place IN ('island', 'islet')
OR barrier IN ('toll_booth')
OR military IN ('danger_area', 'bunker')
OR historic IN ('memorial', 'monument', 'archaeological_site', 'wayside_cross')
OR tags->'memorial' IN ('plaque')
Expand Down
32 changes: 32 additions & 0 deletions symbols/toll_booth.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.