From 743da8868ebf153ebbde2c36c854e1239abf1790 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Thu, 16 Feb 2023 08:58:02 +0000
Subject: [PATCH] [styles] Fix parkings priorities in vehicle style

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/styles/clear/include/Icons.mapcss     | 17 +++++++--------
 data/styles/vehicle/include/Basemap.mapcss |  1 -
 data/styles/vehicle/include/Icons.mapcss   | 25 +++++++++-------------
 3 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index 3d55bcdd49..d59c274c92 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -2968,20 +2968,19 @@ area|z15-[amenity=sanitary_dump_station]
 node|z16[amenity=parking],
 area|z16[amenity=parking]
 {icon-image: parking-s.svg;icon-min-distance: 25;}
-node|z16[amenity=parking][access=permissive],
-node|z16[amenity=parking][access=private]
-{icon-image: zero-icon.svg;}
 
-node|z17[amenity=parking],
-area|z17[amenity=parking]
+node|z17-[amenity=parking],
+area|z17-[amenity=parking]
 {icon-image: parking-m.svg;}
-node|z17[amenity=parking][access=permissive],
-node|z17[amenity=parking][access=private]
-{icon-image: zero-icon.svg;}
 
 node|z18-[amenity=parking],
 area|z18-[amenity=parking]
-{icon-image: parking-m.svg;font-size: 11;}
+{font-size: 11;}
+
+node|z16-17[amenity=parking][access=permissive],
+node|z16-17[amenity=parking][access=private],
+{icon-image: zero-icon.svg;}
+
 
 node|z17[amenity=parking_entrance],
 area|z17[amenity=parking_entrance]
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index 87ba02d3ae..a7df50de14 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -183,7 +183,6 @@ line[barrier=fence],
 line[barrier=hedge],
 line[barrier=city_wall],
 line[historic=citywalls],
-area[amenity=parking],
 area[amenity=parking_space],
 {z-index: 950;}
 
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index b0fdf9f444..9e59e28265 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -1032,30 +1032,25 @@ area|z16-[amenity=water_point],
 
 /* 7.1 Parking */
 
-node|z15-16[amenity=parking],
-area|z15-16[amenity=parking]
-{icon-image: parking-m.svg;icon-min-distance: 3;z-index: 20000;}
-node|z15-16[amenity=parking][access=permissive],
-node|z15-16[amenity=parking][access=private]
-{icon-image: zero-icon.svg; icon-min-distance: 3;z-index: 20000;}
+node|z15-[amenity=parking],
+area|z15-[amenity=parking]
+{icon-image: parking-m.svg; icon-min-distance: 3;}
 
 node|z17[amenity=parking],
 area|z17[amenity=parking]
-{icon-image: parking-m.svg;icon-min-distance: 15;}
-node|z17[amenity=parking][access=permissive],
-node|z17[amenity=parking][access=private]
-{icon-image: zero-icon.svg;z-index: 6;icon-min-distance: 7;}
+{icon-min-distance: 15;}
 
 node|z18[amenity=parking],
 area|z18[amenity=parking]
-{icon-image: parking-m.svg;icon-min-distance: 10;}
-node|z18[amenity=parking][access=permissive],
-node|z18[amenity=parking][access=private]
-{icon-image: zero-icon.svg;}
+{icon-min-distance: 10;}
 
 node|z19-[amenity=parking],
 area|z19-[amenity=parking]
-{icon-image: parking-m.svg;icon-min-distance: 6;}
+{icon-min-distance: 6;}
+
+node|z15-18[amenity=parking][access=permissive],
+node|z15-18[amenity=parking][access=private],
+{icon-image: zero-icon.svg;}
 
 /*
 node|z17-[amenity=bicycle_parking],