From 27850ccd11a981eaf899a1e1315c5a4984bb7816 Mon Sep 17 00:00:00 2001
From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
Date: Fri, 6 Oct 2023 23:26:36 +0200
Subject: [PATCH] [styles] Add amenity=parking + parking=street_side +
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 | 3 +++
data/styles/clear/include/priorities_1_BG-by-size.prio.txt | 1 +
data/styles/clear/include/priorities_4_overlays.prio.txt | 2 ++
data/styles/clear/style-clear/symbols/parking_private-s.svg | 5 +++++
data/styles/clear/style-night/symbols/parking_private-s.svg | 5 +++++
data/styles/vehicle/include/Icons.mapcss | 5 +++++
data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt | 1 +
data/styles/vehicle/include/priorities_4_overlays.prio.txt | 2 ++
9 files changed, 25 insertions(+)
create mode 100644 data/styles/clear/style-clear/symbols/parking_private-s.svg
create mode 100644 data/styles/clear/style-night/symbols/parking_private-s.svg
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 5269b6100e..c403488058 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1668,3 +1668,4 @@ railway|station|light_rail|london;[railway=station][station=light_rail][city=lon
railway|station|light_rail|porto;[railway=station][station=light_rail][city=porto];;name;int_name;1587;
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;
diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 36a33a5b87..e24ff14eb0 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -2680,6 +2680,9 @@ area|z18-[amenity=parking][access=private],
node|z18-[amenity=parking][location=underground][access=private],
area|z18-[amenity=parking][location=underground][access=private],
{icon-image:parking_underground_private-m.svg;}
+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|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 cc6f9fa1c6..7f31bfa06e 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
@@ -94,6 +94,7 @@ amenity-parking-permissive # area z15- (also has icon z
amenity-parking-private # area z17- (also has icon z18-, caption(optional) z18-)
amenity-parking-street_side # area z17- (also has icon z18-, caption(optional) z18-)
amenity-parking-street_side-fee # area z17- (also has icon z18-, caption(optional) z18-)
+amenity-parking-street_side-private # area z17- (also has icon z18-, caption(optional) z18-)
=== 100
natural-wetland # area z11- (also has caption z16-)
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index 71b28d3119..ff9df4f440 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -1284,6 +1284,7 @@ amenity-parking-street_side-fee # icon z18- (also has captio
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-)
amenity-parking-underground-private # icon z18- (also has caption(optional) z18-)
amenity-parking_entrance-private # icon z19- (also has caption(optional) z19-)
=== 100
@@ -2172,6 +2173,7 @@ amenity-parking_entrance-private # icon z19- (also has captio
# 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-)
# amenity-parking-underground-private # caption(optional) z18- (also has icon z18-)
# amenity-parking_entrance-private # caption(optional) z19- (also has icon z19-)
# === -9900
diff --git a/data/styles/clear/style-clear/symbols/parking_private-s.svg b/data/styles/clear/style-clear/symbols/parking_private-s.svg
new file mode 100644
index 0000000000..55f5695523
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/parking_private-s.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/data/styles/clear/style-night/symbols/parking_private-s.svg b/data/styles/clear/style-night/symbols/parking_private-s.svg
new file mode 100644
index 0000000000..33a4a24a0f
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/parking_private-s.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index f4b6e27e7a..7e0d84d18c 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -938,12 +938,17 @@ area|z17-[amenity=parking][parking=street_side],
node|z17-[amenity=parking][parking=lane],
area|z17-[amenity=parking][parking=lane],
{icon-image: parking-s.svg;}
+
node|z17-[amenity=parking][parking=street_side][fee?],
area|z17-[amenity=parking][parking=street_side][fee?],
node|z17-[amenity=parking][parking=lane][fee?],
area|z17-[amenity=parking][parking=lane][fee?],
{icon-image: parking_pay-s.svg;}
+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|z16-[amenity=parking_entrance],
area|z16-[amenity=parking_entrance],
{icon-image: parking_entrance-m.svg; font-size: 12.5;}
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 c639423e50..964c12868f 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
@@ -26,6 +26,7 @@ amenity-parking-permissive # area z15- (also has icon z
amenity-parking-private # area z15- (also has icon z17-, caption(optional) z17-)
amenity-parking-street_side # area z15- (also has icon z17-)
amenity-parking-street_side-fee # area z15- (also has icon z15-)
+amenity-parking-street_side-private # area z15- (also has icon z17-, caption(optional) z17-)
=== 160
leisure-stadium # area z15-
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index d3f88a965f..709c484df9 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -665,6 +665,7 @@ railway-subway_entrance-yokohama # icon z16- (also has captio
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-)
amenity-parking-underground-private # icon z17- (also has caption(optional) z17-)
amenity-parking_entrance-private # icon z19-
=== 500
@@ -1127,6 +1128,7 @@ entrance-main # icon z18- (also has captio
# 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-)
# amenity-parking-underground-private # caption(optional) z17- (also has icon z17-)
# === -9500