From 470673457da1cb1c1356e311aa3c5131ebbd74a0 Mon Sep 17 00:00:00 2001 From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> Date: Fri, 6 Oct 2023 23:26:15 +0200 Subject: [PATCH] [styles] Add amenity=parking + parking=lane + access=private icon Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com> --- data/mapcss-mapping.csv | 1 + data/styles/clear/include/Icons.mapcss | 6 ++++++ data/styles/clear/include/priorities_1_BG-by-size.prio.txt | 1 + data/styles/clear/include/priorities_4_overlays.prio.txt | 2 ++ data/styles/vehicle/include/Icons.mapcss | 6 ++++++ .../styles/vehicle/include/priorities_1_BG-by-size.prio.txt | 1 + data/styles/vehicle/include/priorities_4_overlays.prio.txt | 2 ++ 7 files changed, 19 insertions(+) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index c403488058..d339e3adbe 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1669,3 +1669,4 @@ railway|station|light_rail|porto;[railway=station][station=light_rail][city=port amenity|place_of_worship|christian|jehovahs_witness;[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness];;name;int_name;1588; amenity|parking|underground|private;[amenity=parking][location=underground][access=private],[amenity=parking][parking=underground][access=private];;name;int_name;1589; amenity|parking|street_side|private;[amenity=parking][parking=street_side][access=private];;name;int_name;1590; +amenity|parking|lane|private;[amenity=parking][parking=lane][access=private];;name;int_name;1591; diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss index e24ff14eb0..0ab52cc55a 100644 --- a/data/styles/clear/include/Icons.mapcss +++ b/data/styles/clear/include/Icons.mapcss @@ -2683,6 +2683,12 @@ area|z18-[amenity=parking][location=underground][access=private], node|z18-[amenity=parking][parking=street_side][access=private], area|z18-[amenity=parking][parking=street_side][access=private], {icon-image: parking_private-s.svg;} +node|z18-[amenity=parking][parking=lane][access=private], +area|z18-[amenity=parking][parking=lane][access=private], +{icon-image: none; text: none;} +node|z19-[amenity=parking][parking=lane][access=private], +area|z19-[amenity=parking][parking=lane][access=private], +{icon-image: parking_private-s.svg; text: name;} node|z17-[amenity=bicycle_parking], area|z17-[amenity=bicycle_parking], diff --git a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt index 7f31bfa06e..f6478ec0a3 100644 --- a/data/styles/clear/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/clear/include/priorities_1_BG-by-size.prio.txt @@ -86,6 +86,7 @@ amenity-parking # area z15- (also has icon z amenity-parking-fee # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-lane # area z17- (also has icon z18-, caption(optional) z18-) amenity-parking-lane-fee # area z17- (also has icon z18-, caption(optional) z18-) +amenity-parking-lane-private # area z17- (also has icon z19-, caption(optional) z19-) amenity-parking-multi-storey # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-multi-storey-fee # area z15- (also has icon z16-, caption(optional) z18-) amenity-parking-no-access # area z15- (also has icon z16-, caption(optional) z18-) diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt index ff9df4f440..1ed308ccf1 100644 --- a/data/styles/clear/include/priorities_4_overlays.prio.txt +++ b/data/styles/clear/include/priorities_4_overlays.prio.txt @@ -1282,6 +1282,7 @@ amenity-parking-street_side # icon z18- (also has captio amenity-parking-street_side-fee # icon z18- (also has caption(optional) z18-, area z17-) === 150 +amenity-parking-lane-private # icon z19- (also has caption(optional) z19-, area z17-) amenity-parking-no-access # icon z16- (also has caption(optional) z18-, area z15-) amenity-parking-private # icon z18- (also has caption(optional) z18-, area z17-) amenity-parking-street_side-private # icon z18- (also has caption(optional) z18-, area z17-) @@ -2171,6 +2172,7 @@ amenity-parking_entrance-private # icon z19- (also has captio # amenity-parking-street_side-fee # caption(optional) z18- (also has icon z18-, area z17-) # === -9850 +# amenity-parking-lane-private # caption(optional) z19- (also has icon z19-, area z17-) # amenity-parking-no-access # caption(optional) z18- (also has icon z16-, area z15-) # amenity-parking-private # caption(optional) z18- (also has icon z18-, area z17-) # amenity-parking-street_side-private # caption(optional) z18- (also has icon z18-, area z17-) diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 7e0d84d18c..4facfbf6b5 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -948,6 +948,12 @@ area|z17-[amenity=parking][parking=lane][fee?], node|z17-[amenity=parking][parking=street_side][access=private], area|z17-[amenity=parking][parking=street_side][access=private], {icon-image: parking_private-s.svg;} +node|z17-[amenity=parking][parking=lane][access=private], +area|z17-[amenity=parking][parking=lane][access=private], +{icon-image: none; text: none;} +node|z18-[amenity=parking][parking=lane][access=private], +area|z18-[amenity=parking][parking=lane][access=private], +{icon-image: parking_private-s.svg; text: name;} node|z16-[amenity=parking_entrance], area|z16-[amenity=parking_entrance], diff --git a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt index 964c12868f..739b6d0932 100644 --- a/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt +++ b/data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt @@ -18,6 +18,7 @@ amenity-parking # area z15- (also has icon z amenity-parking-fee # area z15- (also has icon z15-, caption(optional) z16-) amenity-parking-lane # area z15- (also has icon z17-) amenity-parking-lane-fee # area z15- (also has icon z15-) +amenity-parking-lane-private # area z15- (also has icon z18-, caption(optional) z18-) amenity-parking-multi-storey # area z15- (also has icon z15-, caption(optional) z16-) amenity-parking-multi-storey-fee # area z15- (also has icon z15-, caption(optional) z16-) amenity-parking-no-access # area z15- (also has icon z15-, caption(optional) z16-) diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index 709c484df9..60cc4c323c 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -663,6 +663,7 @@ railway-subway_entrance-yerevan # icon z16- (also has captio railway-subway_entrance-yokohama # icon z16- (also has caption(optional) z17-) === 550 +amenity-parking-lane-private # icon z18- (also has caption(optional) z18-, area z15-) amenity-parking-no-access # icon z15- (also has caption(optional) z16-, area z15-) amenity-parking-private # icon z17- (also has caption(optional) z17-, area z15-) amenity-parking-street_side-private # icon z17- (also has caption(optional) z17-, area z15-) @@ -1126,6 +1127,7 @@ entrance-main # icon z18- (also has captio # railway-subway_entrance-yokohama # caption(optional) z17- (also has icon z16-) # === -9450 +# amenity-parking-lane-private # caption(optional) z18- (also has icon z18-, area z15-) # amenity-parking-no-access # caption(optional) z16- (also has icon z15-, area z15-) # amenity-parking-private # caption(optional) z17- (also has icon z17-, area z15-) # amenity-parking-street_side-private # caption(optional) z17- (also has icon z17-, area z15-)