Skip to content

Commit

Permalink
Add icon for leisure=bird_hide closes gravitystorm#3175 (gravitystorm…
Browse files Browse the repository at this point in the history
  • Loading branch information
Adamant36 authored and kocio-pl committed Aug 14, 2018
1 parent 3ab99d4 commit e9db8bc
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 6 deletions.
9 changes: 9 additions & 0 deletions amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -1268,6 +1268,13 @@
marker-clip: false;
}

[feature = 'leisure_bird_hide'][zoom >= 17] {
marker-file: url('symbols/bird_hide.svg');
marker-fill: @leisure-green;
marker-placement: interior;
marker-clip: false;
}

// Slipway tagging on points - slipway on lines is defined later
[feature = 'leisure_slipway'][zoom >= 17] {
marker-file: url('symbols/transport_slipway.p.20.svg');
Expand Down Expand Up @@ -1673,6 +1680,7 @@
[feature = 'tourism_picnic_site'][zoom >= 17],
[feature = 'leisure_bowling_alley'][zoom >= 17],
[feature = 'leisure_beach_resort'][zoom >= 17],
[feature = 'leisure_bird_hide'][zoom >= 17],
[feature = 'leisure_outdoor_seating'][zoom >= 19],
[feature = 'leisure_picnic_table'][zoom >= 17] {
text-name: "[name]";
Expand All @@ -1683,6 +1691,7 @@
[feature = 'tourism_picnic_site'],
[feature = 'leisure_outdoor_seating'],
[feature = 'leisure_bowling_alley'],
[feature = 'leisure_bird_hide'],
[feature = 'leisure_beach_resort'] {
text-fill: @leisure-green;
}
Expand Down
13 changes: 7 additions & 6 deletions project.mml
Original file line number Diff line number Diff line change
Expand Up @@ -1487,7 +1487,7 @@ Layer:
'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END,
'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table',
'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort',
'bowling_alley', 'outdoor_seating') THEN leisure ELSE NULL END,
'bowling_alley', 'outdoor_seating', 'bird_hide') THEN leisure ELSE NULL END,
'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'chimney')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('spring') THEN "natural" ELSE NULL END,
Expand Down Expand Up @@ -1542,7 +1542,7 @@ Layer:
OR shop IS NOT NULL
OR (tags->'office') IS NOT NULL
OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'fitness_centre',
'fitness_station', 'firepit', 'sauna', 'beach_resort', 'bowling_alley', 'outdoor_seating')
'fitness_station', 'firepit', 'sauna', 'beach_resort', 'bowling_alley', 'outdoor_seating', 'bird_hide')
OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'chimney')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL))
OR "natural" IN ('spring')
Expand Down Expand Up @@ -1603,7 +1603,7 @@ Layer:
'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END,
'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'slipway',
'dog_park', 'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort',
'bowling_alley', 'outdoor_seating') THEN leisure ELSE NULL END,
'bowling_alley', 'outdoor_seating', 'bird_hide') THEN leisure ELSE NULL END,
'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'chimney')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('peak', 'volcano', 'saddle', 'spring', 'cave_entrance') THEN "natural" ELSE NULL END,
Expand Down Expand Up @@ -1677,7 +1677,8 @@ Layer:
OR tags->'advertising' IN ('column')
OR (tags->'office') IS NOT NULL
OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'slipway',
'dog_park', 'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort', 'bowling_alley', 'outdoor_seating')
'dog_park', 'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort',
'bowling_alley', 'outdoor_seating', 'bird_hide')
OR barrier IN ('toll_booth')
OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'cross', 'obelisk', 'communications_tower', 'chimney')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL))
Expand Down Expand Up @@ -2074,7 +2075,7 @@ Layer:
'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'fitness_centre', 'sports_centre', 'stadium', 'track',
'pitch', 'playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina',
'picnic_table', 'dog_park', 'fitness_station', 'firepit', 'sauna', 'beach_resort',
'bowling_alley', 'outdoor_seating') THEN leisure ELSE NULL END,
'bowling_alley', 'outdoor_seating', 'bird_hide') THEN leisure ELSE NULL END,
'power_' || CASE WHEN power IN ('plant', 'station', 'generator', 'sub_station', 'substation') THEN power ELSE NULL END,
'landuse_' || CASE WHEN landuse IN ('reservoir', 'basin', 'recreation_ground', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery',
'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farmland',
Expand Down Expand Up @@ -2243,7 +2244,7 @@ Layer:
'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'fitness_centre', 'sports_centre', 'stadium', 'track',
'pitch','playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina',
'slipway', 'picnic_table', 'dog_park', 'fitness_station', 'firepit', 'sauna', 'beach_resort',
'bowling_alley', 'outdoor_seating') THEN leisure ELSE NULL END,
'bowling_alley', 'outdoor_seating', 'bird_hide') THEN leisure ELSE NULL END,
'power_' || CASE WHEN power IN ('plant', 'station', 'generator', 'sub_station', 'substation') THEN power ELSE NULL END,
'landuse_' || CASE WHEN landuse IN ('reservoir', 'basin', 'recreation_ground', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery',
'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farmland',
Expand Down
31 changes: 31 additions & 0 deletions symbols/bird_hide.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e9db8bc

Please sign in to comment.