From fdf944d3d529cbc1deaec3d2fac40071e1c289c8 Mon Sep 17 00:00:00 2001 From: johsin18 Date: Mon, 12 Nov 2018 20:48:39 +0100 Subject: [PATCH] Parking entrance (#3505) --- amenity-points.mss | 9 +++++++-- project.mml | 2 ++ symbols/amenity/parking_entrance.svg | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 symbols/amenity/parking_entrance.svg diff --git a/amenity-points.mss b/amenity-points.mss index d42f9b5426..2098f74d1e 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -593,7 +593,8 @@ [feature = 'amenity_parking'][way_pixels > 900], [feature = 'amenity_bicycle_parking'][way_pixels > 900], - [feature = 'amenity_motorcycle_parking'][way_pixels > 900] { + [feature = 'amenity_motorcycle_parking'][way_pixels > 900], + [feature = 'amenity_parking_entrance'][zoom >= 18] { [feature = 'amenity_parking'] { marker-file: url('symbols/amenity/parking.svg'); } @@ -603,6 +604,9 @@ [feature = 'amenity_motorcycle_parking'] { marker-file: url('symbols/amenity/motorcycle_parking.svg'); } + [feature = 'amenity_parking_entrance'] { + marker-file: url('symbols/amenity/parking_entrance.svg'); + } marker-placement: interior; marker-clip: false; marker-fill: @transportation-icon; @@ -1743,7 +1747,8 @@ [feature = 'amenity_parking'][zoom >= 10][way_pixels > 900], [feature = 'amenity_bicycle_parking'][zoom >= 10][way_pixels > 900], - [feature = 'amenity_motorcycle_parking'][zoom >= 10][way_pixels > 900] { + [feature = 'amenity_motorcycle_parking'][zoom >= 10][way_pixels > 900], + [feature = 'amenity_parking_entrance'][zoom >= 18] { text-name: "[name]"; text-size: @standard-font-size; text-wrap-width: @standard-wrap-width; diff --git a/project.mml b/project.mml index 0079e29ac7..1389537cb6 100644 --- a/project.mml +++ b/project.mml @@ -1590,6 +1590,7 @@ Layer: 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'vehicle_inspection', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') 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')) THEN amenity ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'emergency_' || CASE WHEN tags->'emergency' IN ('phone') THEN tags->'emergency' ELSE NULL END, 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END, @@ -2251,6 +2252,7 @@ Layer: 'drinking_water', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'vehicle_inspection', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') 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')) THEN amenity ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop_' || CASE WHEN shop IN ('supermarket', 'bag','bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser', diff --git a/symbols/amenity/parking_entrance.svg b/symbols/amenity/parking_entrance.svg new file mode 100644 index 0000000000..ad26720147 --- /dev/null +++ b/symbols/amenity/parking_entrance.svg @@ -0,0 +1,14 @@ + + + + + + image/svg+xml + + + + + + + +