Skip to content

Commit

Permalink
Merge pull request #2385 from kocio-pl/ferry_terminal
Browse files Browse the repository at this point in the history 
Adding rendering for amenity=ferry_terminal
  • Loading branch information
@kocio-pl
kocio-pl authored Aug 20, 2017
2 parents bbfa472 + a7718b7 commit 7fa948b
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 11 deletions.
12 changes: 10 additions & 2 deletions amenity-points.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@shop-text: #939;
@transportation-icon: #0092da;
@transportation-text: #0066ff;
@airtransport: #8461C4;
@airtransport: #8461C4; //also ferry_terminal
@health-color: #da0092;
@amenity-brown: #734a08;
@man-made-icon: #555;
Expand Down Expand Up @@ -921,6 +921,13 @@
marker-fill: @airtransport;
}

[feature = 'amenity_ferry_terminal'][zoom >= 15] {
marker-file: url('symbols/ferry.svg');
marker-placement: interior;
marker-clip: false;
marker-fill: @airtransport;
}

[feature = 'man_made_lighthouse'][zoom >= 15] {
marker-file: url('symbols/lighthouse.svg');
marker-placement: interior;
Expand Down Expand Up @@ -2137,7 +2144,8 @@
}

[feature = 'aeroway_aerodrome']['access' != 'private']['icao' != null]['iata' != null][zoom >= 10][zoom < 14],
[feature = 'aeroway_aerodrome'][zoom >= 11][zoom < 14] {
[feature = 'aeroway_aerodrome'][zoom >= 11][zoom < 14],
[feature = 'amenity_ferry_terminal'][zoom >= 15] {
text-name: "[name]";
text-size: @standard-font-size;
text-wrap-width: @standard-wrap-width;
Expand Down
3 changes: 2 additions & 1 deletion landcover.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,8 @@
[way_pixels >= 64] { polygon-gamma: 0.3; }
}

[feature = 'aeroway_aerodrome'][zoom >= 10] {
[feature = 'aeroway_aerodrome'][zoom >= 10],
[feature = 'amenity_ferry_terminal'][zoom >= 15] {
polygon-fill: @aerodrome;
line-width: 0.2;
line-color: saturate(darken(@aerodrome, 40%), 20%);
Expand Down
16 changes: 8 additions & 8 deletions project.mml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Layer:
way, COALESCE(name, '') AS name,
('aeroway_' || (CASE WHEN aeroway IN ('apron', 'aerodrome') THEN aeroway ELSE NULL END)) AS aeroway,
('amenity_' || (CASE WHEN amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'university', 'college', 'school',
'hospital', 'kindergarten', 'grave_yard', 'prison', 'place_of_worship', 'clinic')
'hospital', 'kindergarten', 'grave_yard', 'prison', 'place_of_worship', 'clinic', 'ferry_terminal')
THEN amenity ELSE NULL END)) AS amenity,
('landuse_' || (CASE WHEN landuse IN ('quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass',
'allotments', 'forest', 'farmyard', 'farmland', 'greenhouse_horticulture',
Expand All @@ -152,7 +152,7 @@ Layer:
OR leisure IS NOT NULL
OR aeroway IN ('apron', 'aerodrome')
OR amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'university', 'college', 'school', 'hospital', 'kindergarten',
'grave_yard', 'place_of_worship', 'prison', 'clinic')
'grave_yard', 'place_of_worship', 'prison', 'clinic', 'ferry_terminal')
OR military IN ('danger_area')
OR "natural" IN ('beach', 'shoal', 'heath', 'mud', 'marsh', 'wetland', 'grassland', 'wood', 'sand', 'scree', 'shingle', 'bare_rock', 'scrub')
OR power IN ('station', 'sub_station', 'substation', 'generator')
Expand Down Expand Up @@ -1567,7 +1567,7 @@ Layer:
'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 'restaurant', 'food_court',
'fast_food', 'telephone', 'emergency_phone', 'taxi', 'theatre', 'toilets', 'drinking_water',
'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility',
'charging_station', 'arts_centre') THEN amenity ELSE NULL END,
'charging_station', 'arts_centre', 'ferry_terminal') THEN amenity ELSE NULL END,
'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END,
'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table') THEN leisure ELSE NULL END,
'man_made_' || CASE WHEN man_made IN ('mast', 'water_tower', 'lighthouse', 'windmill', 'obelisk') THEN man_made ELSE NULL END,
Expand Down Expand Up @@ -1608,7 +1608,7 @@ Layer:
'dentist', 'place_of_worship', 'police', 'post_box', 'post_office', 'pub', 'biergarten',
'recycling', 'restaurant', 'food_court', 'fast_food', 'telephone', 'emergency_phone', 'taxi',
'theatre', 'toilets', 'drinking_water', 'prison', 'hunting_stand', 'nightclub', 'veterinary',
'social_facility', 'charging_station', 'arts_centre')
'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal')
OR shop IS NOT NULL -- skip checking a huge list and use a null check
OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table')
OR man_made IN ('mast', 'water_tower', 'lighthouse', 'windmill', 'obelisk')
Expand Down Expand Up @@ -1641,7 +1641,7 @@ Layer:
'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 'restaurant', 'food_court',
'fast_food', 'telephone', 'emergency_phone', 'taxi', 'theatre', 'toilets', 'drinking_water',
'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility',
'charging_station', 'arts_centre') THEN amenity ELSE NULL END,
'charging_station', 'arts_centre', 'ferry_terminal') THEN amenity ELSE NULL END,
'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END,
'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'slipway',
'dog_park') THEN leisure ELSE NULL END,
Expand Down Expand Up @@ -1693,7 +1693,7 @@ Layer:
'dentist', 'place_of_worship', 'police', 'post_box', 'post_office', 'pub', 'biergarten',
'recycling', 'restaurant', 'food_court', 'fast_food', 'telephone', 'emergency_phone',
'taxi', 'theatre', 'toilets', 'drinking_water', 'prison', 'hunting_stand', 'nightclub',
'veterinary', 'social_facility', 'charging_station', 'arts_centre')
'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal')
OR shop IS NOT NULL -- skip checking a huge list and use a null check
OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'slipway',
'dog_park')
Expand Down Expand Up @@ -2029,7 +2029,7 @@ Layer:
'school', 'college', 'kindergarten', 'hospital', 'ice_cream', 'pharmacy', 'doctors', 'dentist',
'atm', 'bicycle_rental', 'car_rental', 'car_wash', 'post_box', 'post_office',
'recycling', 'telephone', 'emergency_phone', 'toilets', 'taxi', 'drinking_water', 'hunting_stand',
'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre') THEN amenity ELSE NULL END,
'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal') THEN amenity ELSE NULL END,
'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'books', 'butcher', 'clothes', 'computer', 'confectionery',
'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre',
'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', 'photo', 'photo_studio',
Expand Down Expand Up @@ -2162,7 +2162,7 @@ Layer:
'ice_cream', 'pharmacy', 'doctors', 'dentist', 'atm', 'bicycle_rental', 'car_rental',
'car_wash', 'post_box', 'post_office', 'recycling', 'telephone', 'emergency_phone', 'toilets', 'taxi',
'drinking_water', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility',
'charging_station', 'arts_centre') THEN amenity ELSE NULL END,
'charging_station', 'arts_centre', 'ferry_terminal') THEN amenity ELSE NULL END,
'shop_' || CASE WHEN shop IN ('supermarket', 'bag','bakery', 'beauty', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion',
'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser',
'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', 'photo', 'photo_studio', 'photography',
Expand Down
43 changes: 43 additions & 0 deletions symbols/ferry.svg
View file
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 7fa948b

Please sign in to comment.