From d11242d0bad206448b354dd4226004243d48b4e1 Mon Sep 17 00:00:00 2001 From: Adamant36 Date: Thu, 20 Sep 2018 18:11:54 -0700 Subject: [PATCH] Adds icon for bicycle repair station, updates car repair icon (#3391) --- amenity-points.mss | 19 +++++++++++ project.mml | 8 ++--- symbols/amenity/bicycle_repair_station.svg | 39 ++++++++++++++++++++++ symbols/shop/car_repair.svg | 35 ++++++++++--------- 4 files changed, 79 insertions(+), 22 deletions(-) create mode 100644 symbols/amenity/bicycle_repair_station.svg diff --git a/amenity-points.mss b/amenity-points.mss index 5a37ac49f3..6116e52bd1 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -289,6 +289,13 @@ marker-clip: false; } + [feature = 'amenity_bicycle_repair_station'][zoom >= 19] { + marker-file: url('symbols/amenity/bicycle_repair_station.svg'); + marker-fill: @amenity-brown; + marker-placement: interior; + marker-clip: false; + } + [feature = 'amenity_hospital'][zoom >= 15] { marker-file: url('symbols/amenity/hospital.svg'); marker-fill: @health-color; @@ -2315,6 +2322,18 @@ text-face-name: @standard-font; } + [feature = 'amenity_bicycle_repair_station'][zoom >= 19] { + text-name: "[name]"; + text-size: @standard-font-size; + text-wrap-width: @standard-wrap-width; + text-line-spacing: @standard-line-spacing-size; + text-dy: 10; + text-fill: @amenity-brown; + text-halo-radius: @standard-halo-radius; + text-halo-fill: @standard-halo-fill; + text-placement: interior; + text-face-name: @standard-font; + } [feature = 'tourism_alpine_hut'][zoom >= 14], [feature = 'amenity_shelter'][zoom >= 17], [feature = 'tourism_hotel'][zoom >= 17], diff --git a/project.mml b/project.mml index 63c056dda2..3e1e1cf5fc 100644 --- a/project.mml +++ b/project.mml @@ -1481,7 +1481,7 @@ Layer: 'fast_food', 'telephone', 'taxi', 'theatre', 'toilets', 'drinking_water', 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'waste_disposal', 'shower', 'bbq', - 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, + 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') THEN amenity ELSE NULL END, 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END, 'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END, @@ -1599,7 +1599,7 @@ Layer: 'fast_food', 'telephone', 'taxi', 'theatre', 'toilets', 'drinking_water', 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', - 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, + 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') 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, @@ -2062,7 +2062,7 @@ Layer: 'recycling', 'telephone', 'toilets', 'taxi', 'drinking_water', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', 'nursing_home', 'childcare', 'driving_school', - 'casino', 'boat_rental') THEN amenity ELSE NULL END, + 'casino', 'boat_rental', 'bicycle_repair_station') 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', @@ -2233,7 +2233,7 @@ Layer: 'car_wash', 'post_box', 'post_office', 'recycling', 'telephone', 'toilets', 'taxi', 'drinking_water', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower', 'bbq', - 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental') THEN amenity ELSE NULL END, + 'nursing_home', 'childcare', 'driving_school', 'casino', 'boat_rental', 'bicycle_repair_station') 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/bicycle_repair_station.svg b/symbols/amenity/bicycle_repair_station.svg new file mode 100644 index 0000000000..d90beae963 --- /dev/null +++ b/symbols/amenity/bicycle_repair_station.svg @@ -0,0 +1,39 @@ + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/symbols/shop/car_repair.svg b/symbols/shop/car_repair.svg index 582b31dbed..9fd280370f 100644 --- a/symbols/shop/car_repair.svg +++ b/symbols/shop/car_repair.svg @@ -1,19 +1,19 @@ - - + id="svg3800" + version="1.1" + viewBox="0 0 14 14"> + + id="metadata3805"> @@ -24,16 +24,15 @@ - - - + + + + +