Skip to content

Commit

Permalink
Add support of parking=multi-storey to amenity=parking_entrance (#3599)
Browse files Browse the repository at this point in the history
Render svg icon for `amenity=parking_entrance` + `parking=multi-storey`
Rename current parking_entrance.svg to parking_entrance_underground.svg
  • Loading branch information
jragusa authored and jeisenbe committed Dec 20, 2019
1 parent acc2153 commit 635dae6
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 3 deletions.
5 changes: 3 additions & 2 deletions amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -1446,7 +1446,8 @@
[feature = 'amenity_parking'] { marker-file: url('symbols/amenity/parking.svg'); }
[feature = 'amenity_bicycle_parking'] { marker-file: url('symbols/amenity/bicycle_parking.svg'); }
[feature = 'amenity_motorcycle_parking'] { marker-file: url('symbols/amenity/motorcycle_parking.svg'); }
[feature = 'amenity_parking_entrance'] { marker-file: url('symbols/amenity/parking_entrance.svg'); }
[feature = 'amenity_parking_entrance']["parking"='underground'] { marker-file: url('symbols/amenity/parking_entrance_underground.svg'); }
[feature = 'amenity_parking_entrance']["parking"='multi-storey'] { marker-file: url('symbols/amenity/parking_entrance_multistorey.svg'); }
marker-clip: false;
marker-fill: @transportation-icon;
[access != ''][access != 'permissive'][access != 'yes'] { marker-opacity: 0.33; }
Expand Down Expand Up @@ -2924,7 +2925,7 @@
[feature = 'amenity_parking'],
[feature = 'amenity_bicycle_parking'],
[feature = 'amenity_motorcycle_parking'],
[feature = 'amenity_parking_entrance'] {
[feature = 'amenity_parking_entrance']["parking"='underground'] {
[zoom >= 14][way_pixels > 3000],
[zoom >= 18] {
text-name: "[name]";
Expand Down
3 changes: 2 additions & 1 deletion project.mml
Original file line number Diff line number Diff line change
Expand Up @@ -1446,6 +1446,7 @@ Layer:
THEN CONCAT(ROUND((tags->'height')::NUMERIC)::TEXT, U&'\00A0', 'm') ELSE NULL END
)
) AS name,
tags->'parking' as "parking",
COALESCE(
'aeroway_' || CASE WHEN aeroway IN ('gate', 'apron', 'helipad', 'aerodrome') THEN aeroway ELSE NULL END,
'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'apartment', 'artwork', 'camp_site', 'caravan_site', 'chalet', 'gallery', 'guest_house',
Expand Down Expand Up @@ -1499,7 +1500,7 @@ Layer:
'amenity_' || CASE WHEN amenity IN ('bicycle_parking', 'motorcycle_parking') THEN amenity ELSE NULL END,
'amenity_' || CASE WHEN amenity IN ('parking') AND (tags->'parking' NOT IN ('underground') OR (tags->'parking') IS NULL) THEN amenity ELSE NULL END,
'amenity_' || CASE WHEN amenity IN ('parking_entrance')
AND tags->'parking' IN ('underground')
AND tags->'parking' IN ('multi-storey', 'underground')
AND (access IS NULL OR access NOT IN ('private', 'no'))
AND way_area IS NULL
THEN amenity ELSE NULL END,
Expand Down
14 changes: 14 additions & 0 deletions symbols/amenity/parking_entrance_multistorey.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes

0 comments on commit 635dae6

Please sign in to comment.