From 1bd4465607d4941455291f637f3ecd77069c7d89 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sat, 29 Jan 2022 19:49:39 +0300
Subject: [PATCH] [styles] Regenerated.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 data/classificator.txt              |   3 +
 data/drules_proto.bin               | Bin 209147 -> 209856 bytes
 data/drules_proto.txt               | 240 +++++++++++++++++++++++++++-
 data/drules_proto_clear.bin         | Bin 210088 -> 210797 bytes
 data/drules_proto_clear.txt         | 240 +++++++++++++++++++++++++++-
 data/drules_proto_dark.bin          | Bin 208753 -> 209462 bytes
 data/drules_proto_dark.txt          | 240 +++++++++++++++++++++++++++-
 data/drules_proto_vehicle_clear.bin | Bin 137443 -> 138045 bytes
 data/drules_proto_vehicle_clear.txt | 204 +++++++++++++++++++++++
 data/drules_proto_vehicle_dark.bin  | Bin 136809 -> 137411 bytes
 data/drules_proto_vehicle_dark.txt  | 204 +++++++++++++++++++++++
 data/types.txt                      |   8 +-
 data/visibility.txt                 |   5 +-
 13 files changed, 1136 insertions(+), 8 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index b97a9e8085..c532ebcf50 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -117,6 +117,9 @@ world  +
         vending_machine  +
             cigarettes  -
             drinks  -
+            excrement_bags  -
+            fuel  -
+            parcel_pickup  -
             parking_tickets  -
             public_transport_tickets  -
             {}
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 1b8b7f34b7ab562d0cb4ab27c956c050dd810544..85fd6beb00b40006d110249bf8a2bf85e2d906d3 100644
GIT binary patch
delta 267
zcmezUkmta2o(<pQS^5~c#3$<~icgkJC}Ww)$fX42NNg5PkYHq)%gCh$;_;?dBp0RT
zrskEzCncs&7ECH<nas!~1CnA%D^1M-Yn{W$r3w_0=1NY@i7&`Z&Mqwgi8pH}Zr4s^
zOt<z~#mL2%lbTsvT9m4rn^=^YmnfvnA)v(1#R1{z=1TmkRglx-<KpDt5;)Q^kx7G5
zVp5rqDu*D7qRq7mBGUt>G75{RatL9UQBvg)#*onx;NpfGY|(yu4&(OQbC?vS0012p
BPXzz~

delta 65
zcmV-H0KWgg=M4Md46yfK1epN}B9p*j7_+2c7y*NkW4DoG0cSfAObQNcWodJDa%C-T
XVRC71VV6;}0X>JMp8>a}p8^|{gi0DQ

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 214d73ef4c..ab54c31b77 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -8230,6 +8230,57 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "amenity-vending_machine"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-cigarettes"
   element {
@@ -8332,6 +8383,159 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-vending_machine-excrement_bags"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-fuel"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-parcel_pickup"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-parking_tickets"
   element {
@@ -35052,34 +35256,68 @@ cont {
 cont {
   name: "leisure-marina"
   element {
-    scale: 17
+    scale: 16
+    symbol {
+      name: "marina-m"
+      priority: 16122
+      min_distance: 30
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
       }
+      priority: 15122
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
       priority: 15051
     }
   }
   element {
     scale: 18
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
       priority: 15051
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
       priority: 15051
     }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 90fc4b7b55bc8320e06d4fd2b19265246ab71b35..7ab8f3b6743aed2ba63ca00ebe1276cd353916cf 100644
GIT binary patch
delta 250
zcmZ4SlIQI^o(;kAEPaez;*;$X#U~3Ul(EcY<Wd51BsS;AOE9v`W#m!=@pw}!l8aJv
zQ}asVlM>S>3nY}YOlIVg0ZFl>m8Rx^wa#JWQU!`g@+1}|r{=^LWF}{q7BmYcY!^&m
zOtkV`#mL2%lbTsvT9m4rn^=^YmnfvnA)v(1#R1{z=1TmkRglx-<KpDt5;)Q^kx7G5
pVp5rqDu*D7qRo>h<_n9QE(J;m;gS%>lxW{Oi*ftjSxm2I0ss@cP80wD

delta 64
zcmV-G0Kfn3?hL5u46svQ1epN}B9rlA7_wj(0fX&gx9ws9>p2lj3Jz>#X>)aQWi4%C
Wa%pa1mz$gcJ%@#z0k?&n0_d4;UmE-X

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 6d5d56d432..143f664cb3 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -8164,6 +8164,57 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "amenity-vending_machine"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-cigarettes"
   element {
@@ -8266,6 +8317,159 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-vending_machine-excrement_bags"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-fuel"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-parcel_pickup"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-parking_tickets"
   element {
@@ -34858,34 +35062,68 @@ cont {
 cont {
   name: "leisure-marina"
   element {
-    scale: 17
+    scale: 16
+    symbol {
+      name: "marina-m"
+      priority: 16122
+      min_distance: 30
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
       }
+      priority: 15122
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
       priority: 15051
     }
   }
   element {
     scale: 18
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
       priority: 15051
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
       priority: 15051
     }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 863d86e827990e6616d062b19f0041b6e44d5060..60f4cc08f2faba1a80cedbbf43ad602f25735f5c 100644
GIT binary patch
delta 252
zcmex(k7wHxo(+=mEPaez;*$dt#3$Rwm$A%b<Wd51BsQDIOE9v`W#m!=@pw}!l8aJv
zQ}asVlM>S>+r^i&OlIVg0ZFl>m8Rx^wa#JWQU!`gb0w$d#1~{HXO|X$#G8E+w)-Y9
zZnySa#mL2%lbTsvT9m4rn^=^YmnfvnA)v(1#R1{z=1TmkRglx-<KpDt61ckRDw77I
o#H2DIRSrQEMVlu#<_n9QE(J;m;gS%>lxX*#!?@jl4wKSk0Hs(?!2kdN

delta 56
zcmV-80LTBf<P7oN46qqrv#MV-0fVz*x3gjaw>uF`3Jz>#X>)aQWi4%Ca%pa1m(7;}
OJ%<;c0k;>Q0w0sLHWr-#

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 9dc6fbd3ac..c5badc4590 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -8164,6 +8164,57 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "amenity-vending_machine"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-cigarettes"
   element {
@@ -8266,6 +8317,159 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-vending_machine-excrement_bags"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-fuel"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-parcel_pickup"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-parking_tickets"
   element {
@@ -35034,34 +35238,68 @@ cont {
 cont {
   name: "leisure-marina"
   element {
-    scale: 17
+    scale: 16
+    symbol {
+      name: "marina-m"
+      priority: 16122
+      min_distance: 30
+    }
     caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
       }
+      priority: 15122
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
       priority: 15051
     }
   }
   element {
     scale: 18
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
     caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
       priority: 15051
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
     caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
       priority: 15051
     }
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index bc3c2cd8d4384879f2e54294bc591748d40745f1..b55750c45bcc472d665392391ac38e1b2465b4fe 100644
GIT binary patch
delta 113
zcmaF7kz?;RjtyTlSh^Xx#3xVG6ra3avzTQXBbO48Be7XPQ;3me79*D$h{u~+kzACT
zo0?Y=pOlzBd7Wkn%LGO)8ITl9T4`zySnEtiE>*DNg2bZa)SUQ&%;fCSg68#_+t+I{
Hn!E=9dIBcW

delta 23
fcmdnHjpOk~jtyTlHaBVNF*eueY_HK_JopX(h4Bij

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 3a48be95d5..3734ca4037 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -3453,6 +3453,57 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "amenity-vending_machine"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-cigarettes"
   element {
@@ -3555,6 +3606,159 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-vending_machine-excrement_bags"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-fuel"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-parcel_pickup"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-parking_tickets"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 0551350d50c21de88fe711df3400f4c75be77fd5..eefa8fe6af2e69bdd591000ecb0a5d37bf1986d6 100644
GIT binary patch
delta 105
zcmaF4hU4%?jtzYpEZvM;;*$?(icemkRlK=RLywVV79*D$P(*?^wIaDFH8(Y{Bt9uI
zee!&*5|#;!TrwajmbB8;9FPu{nT%YjKoM!K<kXz_g3RRX(gKip^B&FZdo&r>z5xKj
CASQ|c

delta 23
fcmX@Sk>lkWjtzYpn`Jch7@Ng(wu|X7u6+XlbwCLJ

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 41aeb5f63a..0e739239d7 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -3453,6 +3453,57 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "amenity-vending_machine"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-cigarettes"
   element {
@@ -3555,6 +3606,159 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-vending_machine-excrement_bags"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-fuel"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-parcel_pickup"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-parking_tickets"
   element {
diff --git a/data/types.txt b/data/types.txt
index c0cd360dd5..7dd332f582 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1080,14 +1080,14 @@ mapswithme
 *highway|rest_area
 *highway|traffic_signals
 *leisure|fitness_centre
-mapswithme
-mapswithme
+*amenity|vending_machine|excrement_bags
+*amenity|vending_machine|parcel_pickup
 *leisure|sauna
-mapswithme
+*amenity|vending_machine|fuel
 *man_made|chimney
 *man_made|tower
 *man_made|water_well
-mapswithme
+*amenity|vending_machine
 *shop|bookmaker
 *shop|car_repair|tyres
 *shop|cosmetics
diff --git a/data/visibility.txt b/data/visibility.txt
index aadda5dfc8..83f8c56bd3 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -114,9 +114,12 @@ world  00000000000000000000  +
         toilets  00000000000000000000  -
         townhall  00000000000000000000  -
         university  00000000000000011111  -
-        vending_machine  00000000000000000000  +
+        vending_machine  00000000000000000111  +
             cigarettes  00000000000000000111  -
             drinks  00000000000000000111  -
+            excrement_bags  00000000000000000111  -
+            fuel  00000000000000000111  -
+            parcel_pickup  00000000000000000111  -
             parking_tickets  00000000000000000111  -
             public_transport_tickets  00000000000000000111  -
             {}