From ed76f8b069919d11880d2e00b409b8df328cb7a0 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Thu, 12 Oct 2023 11:08:48 -0300
Subject: [PATCH] [classifier] Regenerated.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 data/classificator.txt              |  20 +-
 data/drules_proto.bin               | Bin 347308 -> 347566 bytes
 data/drules_proto.txt               | 478 ++++++++++++++------------
 data/drules_proto_clear.bin         | Bin 348281 -> 348538 bytes
 data/drules_proto_clear.txt         | 405 ++++++++++++----------
 data/drules_proto_dark.bin          | Bin 346667 -> 346921 bytes
 data/drules_proto_dark.txt          | 405 ++++++++++++----------
 data/drules_proto_vehicle_clear.bin | Bin 247800 -> 248184 bytes
 data/drules_proto_vehicle_clear.txt | 515 ++++++++++++++++------------
 data/drules_proto_vehicle_dark.bin  | Bin 247367 -> 247748 bytes
 data/drules_proto_vehicle_dark.txt  | 515 ++++++++++++++++------------
 data/types.txt                      |  10 +-
 data/visibility.txt                 |  20 +-
 13 files changed, 1360 insertions(+), 1008 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index c077aa5792..1b26891065 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -89,18 +89,23 @@ world  +
         nursing_home  -
         parcel_locker  -
         parking  +
-            fee  +
-                lane  -
-                street_side  -
+            fee  -
+            lane  +
+                fee  -
+                {}
+            multi-storey  +
+                fee  -
                 {}
-            lane  -
-            multi-storey  -
             no-access  -
             park_and_ride  -
             permissive  -
             private  -
-            street_side  -
-            underground  -
+            street_side  +
+                fee  -
+                {}
+            underground  +
+                fee  -
+                {}
             {}
         parking_entrance  +
             permissive  -
@@ -479,7 +484,6 @@ world  +
         service  +
             area  -
             bridge  -
-            busway  -
             driveway  -
             parking_aisle  -
             tunnel  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 865772504f69983b50b87d4a27231f961d9b03ed..96457547c1f6448a1220a89021f27c958286fd03 100644
GIT binary patch
delta 218
zcmZ28Q*_;I(G3N`lU+k^Pc8@+VaZ9%OPyR8Bt5w-N@w!<;Ev4-Vcd)gbC|dk5_41Y
zGD|9T3lfX6GxO4Qb4zndGIfhf@{3X{fja(g)((HpGC4d%guA$;C^fYtzBn@l#i+?b
zG5^%BGjhqJn^c;Yl3J8rln<nJ(^6A~BslmdFANfAmf#S8(t?xigT+{cj5vgV3<D5D
h7|1Ye7Kq(05X*Rpx&3A$BM>tIG4uADi7c020RU!1PhkK6

delta 142
zcmZ2CTXfA#(G3N`(oYz<BocE|^D;{+bqf-UvNQA2b<<K)b#oH)CMSeROr9UCGkH}=
z$7JUi5k8Q3aY<2XYDs)?W(taQLGbO(Mxoq{n`6SCvrIOO{nyMHznwFl@e=d&(<zK1
gY)PfX<%yNk;}aO~w%<--1Y#y2X5M}~iRJPu0HZWH-T(jq

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 905f5b38e7..c13856f299 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -6471,134 +6471,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-parking-fee-lane"
-  element {
-    scale: 15
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-}
-cont {
-  name: "amenity-parking-fee-street_side"
-  element {
-    scale: 15
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-}
 cont {
   name: "amenity-parking-lane"
   element {
@@ -6663,6 +6535,70 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-lane-fee"
+  element {
+    scale: 15
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+}
 cont {
   name: "amenity-parking-multi-storey"
   element {
@@ -6739,6 +6675,82 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-multi-storey-fee"
+  element {
+    scale: 15
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 300
+      min_distance: 5
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+}
 cont {
   name: "amenity-parking-no-access"
   element {
@@ -7095,6 +7107,70 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-street_side-fee"
+  element {
+    scale: 15
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+}
 cont {
   name: "amenity-parking-underground"
   element {
@@ -7156,6 +7232,67 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-underground-fee"
+  element {
+    scale: 15
+    symbol {
+      name: "parking_pay-s"
+      priority: 300
+      min_distance: 5
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "parking_pay-s"
+      priority: 300
+      min_distance: 5
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+}
 cont {
   name: "amenity-parking_entrance"
   element {
@@ -27979,91 +28116,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-service-busway"
-  element {
-    scale: 14
-    lines {
-      width: 1.2
-      color: 16777215
-      priority: 190
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 16777215
-      priority: 190
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.6
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 16777215
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 16777215
-      }
-      priority: 2800
-    }
-  }
-}
 cont {
   name: "highway-service-driveway"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index be4098f84c653c47bbd256ee722a21e46c1c9516..4e05f75b3946ed0510d27829836450c22341ae9c 100644
GIT binary patch
delta 195
zcmeylK=jul(G6n3lP8C)pDY$E!k&|um#UkVI@vII!DgpWZbs!fOk4_yxv6=XC6&4b
ziAC9&dFi^jr8y;;y2T~=MX8k_#f9M#lZ}F&Z1xT7XPJC4SY)zQ6gM-}l*xCZ?y&4-
z<dUEKAWB*ZD3~fF!6Bd|!o>?UExsVJQny%Q4U+;ZP)2a_{2(zFAtMeUAj6Q^h(j1i
e8#Hf^-o8DW@fA~heLN!&gJ|aM_3<pfJ^%nPIz=M@

delta 104
zcmeyhNc86d(G6n3laB_Au&1S_>gFWoO<ou!G5JSu$7IWB5oVy+<Y`gLV7^%J`ppd?
z+>D!7h4r&c{vCa%d3x;j>9LG2nWpO`F^WuHbIW7;oLI)D_J#yTAZ7w$=Isp$EWbVg
E073RGA^-pY

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index f9887df425..87e817498f 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -6437,106 +6437,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-parking-fee-lane"
-  element {
-    scale: 17
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-}
-cont {
-  name: "amenity-parking-fee-street_side"
-  element {
-    scale: 17
-    area {
-      color: 15921852
-      priority: -1900
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 15921852
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-}
 cont {
   name: "amenity-parking-lane"
   element {
@@ -6587,6 +6487,56 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-lane-fee"
+  element {
+    scale: 17
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+}
 cont {
   name: "amenity-parking-multi-storey"
   element {
@@ -6663,6 +6613,82 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-multi-storey-fee"
+  element {
+    scale: 15
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 300
+      min_distance: 5
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+}
 cont {
   name: "amenity-parking-no-access"
   element {
@@ -6991,6 +7017,56 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-street_side-fee"
+  element {
+    scale: 17
+    area {
+      color: 15921852
+      priority: -1900
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 15921852
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+}
 cont {
   name: "amenity-parking-underground"
   element {
@@ -7044,6 +7120,59 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-underground-fee"
+  element {
+    scale: 16
+    symbol {
+      name: "parking_pay-s"
+      priority: 300
+      min_distance: 5
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+}
 cont {
   name: "amenity-parking_entrance"
   element {
@@ -27793,82 +27922,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-service-busway"
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 16777215
-      priority: 190
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.6
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 16777215
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 16777215
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 3355443
-        stroke_color: 16777215
-      }
-      priority: 2800
-    }
-  }
-}
 cont {
   name: "highway-service-driveway"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 3f1b7fb84d1f0ed43da676ffc777923dd2189dd9..961fb9e4741c04bdbce2190750c9c9c04fa97b9b 100644
GIT binary patch
delta 177
zcmZ2IMResf(G9<XCKraRnfxnAgexa8FI6`!HC0G>a$~sgWbNSg&9b3vj4accxD+NU
zhRRF|`n6d(tcqpwreKlD|022BP!&&}8+C_eFC&-y<b_ev9AG&K4uQ#fLE^F!9D+(B
zT)YK|McJ8o>G1`LmAbhSYnT+cgp4?ZCZ7y4U;#3Ofegdu%INKt(To>a+SL*nftU%1
MnYXJYvar4c0Ckx;*Z=?k

delta 103
zcmZ2EO?34X(G9<XCNB#XVNXj<)y+xFn|v^M?&Kd)BFsSk<cKJx$v1-ACjSarvpFt=
zjd62bSQX3U?a_CdgJZV`$1+}InSLgjQG_k2w75L6a{9e^#zXBYNsK_u1jNkSRgzd(
GUjhIeX)0R)

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 8787b3ea82..6c48851e92 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -6437,106 +6437,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-parking-fee-lane"
-  element {
-    scale: 17
-    area {
-      color: 2038555
-      priority: -1900
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 2038555
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 2038555
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-}
-cont {
-  name: "amenity-parking-fee-street_side"
-  element {
-    scale: 17
-    area {
-      color: 2038555
-      priority: -1900
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 2038555
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 2038555
-      priority: -1900
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 150
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9850
-    }
-  }
-}
 cont {
   name: "amenity-parking-lane"
   element {
@@ -6587,6 +6487,56 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-lane-fee"
+  element {
+    scale: 17
+    area {
+      color: 2038555
+      priority: -1900
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+}
 cont {
   name: "amenity-parking-multi-storey"
   element {
@@ -6663,6 +6613,82 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-multi-storey-fee"
+  element {
+    scale: 15
+    area {
+      color: 2038555
+      priority: -1900
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 300
+      min_distance: 5
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+}
 cont {
   name: "amenity-parking-no-access"
   element {
@@ -6991,6 +7017,56 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-street_side-fee"
+  element {
+    scale: 17
+    area {
+      color: 2038555
+      priority: -1900
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038555
+      priority: -1900
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 150
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9850
+    }
+  }
+}
 cont {
   name: "amenity-parking-underground"
   element {
@@ -7044,6 +7120,59 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-underground-fee"
+  element {
+    scale: 16
+    symbol {
+      name: "parking_pay-s"
+      priority: 300
+      min_distance: 5
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking_pay-m"
+      priority: 300
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9700
+    }
+  }
+}
 cont {
   name: "amenity-parking_entrance"
   element {
@@ -27906,82 +28035,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-service-busway"
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 4933187
-      priority: 190
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.6
-      color: 4933187
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 2.0
-      color: 4933187
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 4933187
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 1118464
-      }
-      priority: 2800
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 4933187
-      priority: 190
-    }
-    path_text {
-      primary {
-        height: 12
-        color: 7829367
-        stroke_color: 1118464
-      }
-      priority: 2800
-    }
-  }
-}
 cont {
   name: "highway-service-driveway"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 21b1b5fba19024a282ac9e908f5e6bf78840953b..aafe2b1b25dd7f8e58c013ba5fe7bf79a102e34c 100644
GIT binary patch
delta 213
zcmey-&;Mf*|AtADle?w&PM#zw!k&|um#UkVI(e<+z0Dpnfs8EAn79-s`^d;JLqs(<
zmrBSoZk{Q7lU3<2BbR()Zfag;Nu_Q<Vo`QxUb=2^Nl|KQNqli;3f!0?Wi>|iZYE5%
zrFki-Md?NPKpJRxs*nT+|KvnTF%}^s4gnxTdh%WwF=itUK_FXn@+%1$AX^B?HUKFQ
d1~Lpc&rs=~(k!>DU2Yd65HoF;+r@l~7XZBUNGAXQ

delta 169
zcmew{iT_7G|AtADa^D!aBocE|^D;{+bqf-UvNQA2b<<K)b#oH)QiZf8E6RyZo**GO
zdA}6<WL=eYs(%@|<gqC)E-6Y)Er~DAOu?dS@+8T<n?0lh88<V@-DKT-TSbj=GrxNO
pl*!9?iL#a!mnT+EKDaA-@}J#J&GUA*&)dxi#7x`g?Pk8k3jp1FLURBB

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 1bb9de6fb9..2578ef0aa1 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -1981,132 +1981,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-parking-fee-lane"
-  element {
-    scale: 15
-    area {
-      color: 15921870
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 15921870
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 16579778
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 15
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 16579778
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 16579778
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-}
-cont {
-  name: "amenity-parking-fee-street_side"
-  element {
-    scale: 15
-    area {
-      color: 15921870
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 15921870
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 16579778
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 15
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 16579778
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 16579778
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-}
 cont {
   name: "amenity-parking-lane"
   element {
@@ -2160,6 +2034,69 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-lane-fee"
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921870
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 15
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+}
 cont {
   name: "amenity-parking-multi-storey"
   element {
@@ -2259,6 +2196,105 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-multi-storey-fee"
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921870
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 15
+    }
+    caption {
+      primary {
+        height: 13
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+}
 cont {
   name: "amenity-parking-no-access"
   element {
@@ -2689,6 +2725,69 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-street_side-fee"
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 15921870
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 15
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 16579778
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+}
 cont {
   name: "amenity-parking-underground"
   element {
@@ -2768,6 +2867,85 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-underground-fee"
+  element {
+    scale: 15
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 15
+    }
+    caption {
+      primary {
+        height: 13
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+}
 cont {
   name: "amenity-parking_entrance"
   element {
@@ -14747,91 +14925,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-service-busway"
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 16579836
-      priority: 140
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.6
-      color: 16579836
-      priority: 140
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 16579836
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2150
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 6.0
-      color: 16579836
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 2150
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 7.0
-      color: 16579836
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 16777215
-      }
-      priority: 2150
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 8.0
-      color: 16579836
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 3355443
-        stroke_color: 16777215
-      }
-      priority: 2150
-    }
-  }
-}
 cont {
   name: "highway-service-driveway"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 73726aab170b80cbbd0c7f9621fccff2d81da9f0..bf4cf9595bb5c06dc3c4134bdb5dbff37970f7b6 100644
GIT binary patch
delta 191
zcmX@!!+)foe?y$)WMAnWEFT%UBqj$+i%gc1(4IU;YU5^B86QTLhfG`wlR0H%HcLsk
zFm4W%J-|9SNJ@mexTGjGwIsecGbI(SUQk($QN5dqOFl6-H7~QIQnw(nC_6JRUAHtZ
zCABEMC?81crlqC|NpSE_j*}2$5i;Ts05S}jjW`4+F9y>>K)&>3Ygti{q%f2tw%J_e
W+l*$VeeFv77=f5+yV5>pRSp1fLOJ*V

delta 139
zcmX@o&wsp!e?y$4^hZW6iNxI0yv&kH-GaoT?99A$-L%wH-JHa{$%axlm3}aC$zzi*
zE-6Y)Er~DAOaUpI94EPBGncdv<K|tm2Us_ks;Dt;Ua9tN#^hD|L|IFV%M&XnpWhoj
Z`S1RQ=K1^E=kI3(Vy5l$_cN<<007+1Ikf-)

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index e4aaaeefe2..7ca8cdcd24 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -1981,132 +1981,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-parking-fee-lane"
-  element {
-    scale: 15
-    area {
-      color: 1643785
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 1643785
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 2038026
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 15
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 2038026
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 2038026
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-}
-cont {
-  name: "amenity-parking-fee-street_side"
-  element {
-    scale: 15
-    area {
-      color: 1643785
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 1643785
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-m"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 2038026
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 15
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 2038026
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 2038026
-      priority: -1840
-    }
-    symbol {
-      name: "parking_pay-s"
-      priority: 2520
-      min_distance: 10
-    }
-  }
-}
 cont {
   name: "amenity-parking-lane"
   element {
@@ -2160,6 +2034,69 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-lane-fee"
+  element {
+    scale: 15
+    area {
+      color: 1643785
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643785
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 15
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+}
 cont {
   name: "amenity-parking-multi-storey"
   element {
@@ -2259,6 +2196,105 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-multi-storey-fee"
+  element {
+    scale: 15
+    area {
+      color: 1643785
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643785
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 15
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+}
 cont {
   name: "amenity-parking-no-access"
   element {
@@ -2689,6 +2725,69 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-street_side-fee"
+  element {
+    scale: 15
+    area {
+      color: 1643785
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    area {
+      color: 1643785
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-m"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 17
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 15
+    }
+  }
+  element {
+    scale: 18
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 2038026
+      priority: -1840
+    }
+    symbol {
+      name: "parking_pay-s"
+      priority: 2520
+      min_distance: 10
+    }
+  }
+}
 cont {
   name: "amenity-parking-underground"
   element {
@@ -2768,6 +2867,85 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-parking-underground-fee"
+  element {
+    scale: 15
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 15
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "parking_pay-m"
+      priority: 2550
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7450
+    }
+  }
+}
 cont {
   name: "amenity-parking_entrance"
   element {
@@ -15025,91 +15203,6 @@ cont {
     }
   }
 }
-cont {
-  name: "highway-service-busway"
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 3354929
-      priority: 140
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.6
-      color: 3354929
-      priority: 140
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 3.0
-      color: 3354929
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 2150
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 6.0
-      color: 3354929
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 856756480
-      }
-      priority: 2150
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 7.0
-      color: 3354929
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 1118464
-      }
-      priority: 2150
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 8.0
-      color: 3354929
-      priority: 140
-    }
-    path_text {
-      primary {
-        height: 15
-        color: 9211020
-        stroke_color: 1118464
-      }
-      priority: 2150
-    }
-  }
-}
 cont {
   name: "highway-service-driveway"
   element {
diff --git a/data/types.txt b/data/types.txt
index bde533d14f..461ad28ec8 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -353,14 +353,14 @@ mapswithme
 *highway|cycleway|permissive
 *highway|unclassified|area
 *natural|volcano
-amenity|parking|underground
+*amenity|parking|underground|fee
 *amenity|parking|underground
 *amenity|parking|street_side
 *amenity|parking|multi-storey
 *leisure|recreation_ground
 *highway|footway|mountain_hiking
 highway|service|driveway
-amenity|parking|multi-storey
+*amenity|parking|multi-storey|fee
 *sport|9pin
 *sport|10pin
 *piste:type|downhill|novice
@@ -439,8 +439,8 @@ mapswithme
 mapswithme
 mapswithme
 *aerialway|t-bar
-*amenity|parking|fee|lane
-*amenity|parking|fee|street_side
+*amenity|parking|lane|fee
+*amenity|parking|street_side|fee
 *highway|path|difficult_alpine_hiking
 *earthquake:damage|spontaneous_camp
 *natural|water|drain
@@ -854,7 +854,7 @@ mapswithme
 *railway|rail|highspeed|tunnel
 *railway|rail|tourism|tunnel
 *mapswithme|grid
-*highway|service|busway
+highway|busway
 *highway|busway
 *highway|busway|bridge
 *highway|busway|tunnel
diff --git a/data/visibility.txt b/data/visibility.txt
index ddfc18df7c..e3b425cae7 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -89,18 +89,23 @@ world  00000000000000000000  +
         nursing_home  00000000000000000000  -
         parcel_locker  00000000000000000111  -
         parking  00000000000000011111  +
-            fee  00000000000000011111  +
-                lane  00000000000000011111  -
-                street_side  00000000000000011111  -
+            fee  00000000000000011111  -
+            lane  00000000000000011111  +
+                fee  00000000000000011111  -
+                {}
+            multi-storey  00000000000000011111  +
+                fee  00000000000000011111  -
                 {}
-            lane  00000000000000011111  -
-            multi-storey  00000000000000011111  -
             no-access  00000000000000011111  -
             park_and_ride  00000000000000011111  -
             permissive  00000000000000011111  -
             private  00000000000000011111  -
-            street_side  00000000000000011111  -
-            underground  00000000000000011111  -
+            street_side  00000000000000011111  +
+                fee  00000000000000011111  -
+                {}
+            underground  00000000000000011111  +
+                fee  00000000000000011111  -
+                {}
             {}
         parking_entrance  00000000000000001111  +
             permissive  00000000000000001111  -
@@ -479,7 +484,6 @@ world  00000000000000000000  +
         service  00000000000000111111  +
             area  00000000000000111111  -
             bridge  00000000000000111111  -
-            busway  00000000000000111111  -
             driveway  00000000000000011111  -
             parking_aisle  00000000000000111111  -
             tunnel  00000000000000111111  -