From 13640bb49141d7e805f5dec5e6acef9f89299cd1 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Thu, 20 Jan 2022 17:54:57 +0300
Subject: [PATCH] [styles] Regenerated.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 data/classificator.txt              |  25 +-
 data/drules_proto.bin               | Bin 208557 -> 207647 bytes
 data/drules_proto.txt               | 734 +++++++++-------------------
 data/drules_proto_clear.bin         | Bin 209392 -> 208482 bytes
 data/drules_proto_clear.txt         | 734 +++++++++-------------------
 data/drules_proto_dark.bin          | Bin 207932 -> 207022 bytes
 data/drules_proto_dark.txt          | 734 +++++++++-------------------
 data/drules_proto_vehicle_clear.bin | Bin 137744 -> 137354 bytes
 data/drules_proto_vehicle_clear.txt | 312 +++++-------
 data/drules_proto_vehicle_dark.bin  | Bin 137110 -> 136720 bytes
 data/drules_proto_vehicle_dark.txt  | 312 +++++-------
 data/types.txt                      |  27 +-
 data/visibility.txt                 |  27 +-
 13 files changed, 1001 insertions(+), 1904 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index 4dbae186da..e5d190ae65 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -99,9 +99,12 @@ world  +
         prison  -
         pub  -
         public_bookcase  -
-        recycling  -
-        recycling_container  -
+        recycling  +
+            centre  -
+            container  -
+            {}
         restaurant  -
+        sanitary_dump_station  -
         school  -
         shelter  -
         shower  -
@@ -120,6 +123,7 @@ world  +
         veterinary  -
         waste_basket  -
         waste_disposal  -
+        waste_transfer_station  -
         water_point  -
         {}
     area:highway  +
@@ -163,9 +167,7 @@ world  +
             11  -
             2  -
             3  -
-            4  +
-                state  -
-                {}
+            4  -
             5  -
             6  -
             7  -
@@ -566,7 +568,9 @@ world  +
         cairn  -
         chimney  -
         cutline  -
+        flagpole  -
         lighthouse  -
+        mast  -
         pier  -
         pipeline  +
             overground  -
@@ -627,9 +631,7 @@ world  +
             marsh  -
             {}
         {}
-    noexit  +
-        motor_vehicle  -
-        {}
+    noexit  -
     office  +
         company  -
         diplomatic  -
@@ -805,14 +807,19 @@ world  +
             {}
         {}
     recycling  +
+        batteries  -
+        cans  -
+        cardboard  -
+        cartons  -
         clothes  -
         glass_bottles  -
+        green_waste  -
         paper  -
         plastic  -
         plastic_bottles  -
         scrap_metal  -
+        shoes  -
         small_appliances  -
-        toxic  -
         {}
     route  +
         ferry  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 27cc8843873d401660eda1f124b12f1985d629b0..fda8f0283d83591794c03a9d64b9944a86dc7254 100644
GIT binary patch
delta 705
zcmZ2`muLPpo(*YX(xqGyiMgqHnI)CFMXAY^$vK&M>AK0Oc_l@u)7KwjikX}iCc>z@
zxjHO}(Xy3^OBSZMI1#8Pv8XaWr8Ku7zPKc@Br`uxNQZ-8NsNmRB&G`$)6JE5H~FKg
zh*Vn@P+9=Lv><+IA^g(9xTKldsy3eqkKoeH;Sz&+pggg-BsD%Iv$!C?I59^^gF{G3
zgo_U>s+*KpoSj-S*)K_4Sc5|ti@2B)S2dR$s!=6HiFw6osYS5B00-aZo+M4-=GKbs
ztrd(CTvq#-xCC+%^HNHSQ*}XfT4qj;kQE2NlmN%;qm$Vsrg!{@07i66r`I<#imO_2
z2oSGSka(p+#48mhPN~@TbIpv?P1JI^1alMf;&T&IQgzdE64MLvb5ex_fXRf1i!~*`
zL^oG}QKF%Cx^)VZ=l0Ycj9iQY;at3M9l5|r0?W1M?_}Jbzmut$ZF}WmCX;Lc!@2>e

delta 578
zcmbP#jc4s$o(*YXlkbL!aK$I*=anR8=A{-*ZVZc=93K95vrl9=msT2=SYmE!US>(9
zZh2yHNossbW^qA&abk{;Du<AgAQyL0YI0?APG(;E<O|8-0;(Ls=z?OKdsDQ8S<bR@
z$xr@RBFUy(T#{Il+RRnDovW1bC=cWM=@%LqMU>1r_@x9mULT#zE-}61KLjwMm^Hnz
ziBX)<e7a&2qbLuu&0q<j0fNLB08}SLq&i_D)QN59Z)TisvR!lsBNt<P#ZJcU6+4-V
z*+lZV1mPj0o1Bwhl95^r3R$TVE^&lJdQM_-aePvKNl6YwS}2E$A0b_kSOAF+RO1SO
zx=J#WLB`3HaY-Vnhe#kBC{e^EicnCTT$ET4pPO2em;=%+Th1kgB$=C-lM|m<P>_?E
Vn3s&rJtg@S5No%;-p^!`4FHTB+;IQ^

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index e42cba3c86..9831f27fe6 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -7357,7 +7357,42 @@ cont {
   }
 }
 cont {
-  name: "amenity-recycling_container"
+  name: "amenity-recycling-centre"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
+cont {
+  name: "amenity-recycling-container"
   element {
     scale: 17
     symbol {
@@ -7476,6 +7511,94 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-sanitary_dump_station"
+  element {
+    scale: 15
+    symbol {
+      name: "dump-station-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "dump-station-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "dump-station-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dump-station-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dump-station-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-school"
   element {
@@ -8408,7 +8531,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16612
     }
     caption {
@@ -8423,7 +8546,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16612
     }
     caption {
@@ -8436,6 +8559,41 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-waste_transfer_station"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-water_point"
   element {
@@ -10060,208 +10218,6 @@ cont {
     }
   }
 }
-cont {
-  name: "boundary-administrative-4-state"
-  element {
-    scale: 5
-    lines {
-      width: 0.7
-      color: 863203947
-      dashdot {
-        dd: 1.35
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 0.8
-      color: 7565931
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 0.9
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 0.9
-      color: 7565931
-      dashdot {
-        dd: 1.44
-        dd: 1.44
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.0
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-    }
-  }
-}
 cont {
   name: "boundary-national_park"
   element {
@@ -32863,7 +32819,7 @@ cont {
       priority: -15337
     }
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16663
     }
     caption {
@@ -32882,7 +32838,7 @@ cont {
       priority: -15337
     }
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16663
     }
     caption {
@@ -32901,7 +32857,7 @@ cont {
       priority: -15337
     }
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16663
     }
     caption {
@@ -32920,7 +32876,7 @@ cont {
       priority: -15337
     }
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16663
     }
     caption {
@@ -32939,7 +32895,7 @@ cont {
       priority: -15337
     }
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16663
     }
     caption {
@@ -37384,6 +37340,49 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-flagpole"
+  element {
+    scale: 15
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+}
 cont {
   name: "man_made-lighthouse"
   element {
@@ -37478,6 +37477,41 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-mast"
+  element {
+    scale: 16
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+}
 cont {
   name: "man_made-pier"
   element {
@@ -58245,286 +58279,6 @@ cont {
     }
   }
 }
-cont {
-  name: "recycling-clothes"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-glass_bottles"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-paper"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-plastic"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-plastic_bottles"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-scrap_metal"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-small_appliances"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-toxic"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
 cont {
   name: "route-ferry"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 0eafa613c37b304fb37cf54929baf71c66ddd7e7..98b3b96ab864c98d9d9b6ac051cd658aa7e70cb5 100644
GIT binary patch
delta 678
zcmezHnCH<Qo(+dWrAxUa5_41YGD|9Ti&B#-lXEij(sh$l^Gb?Rr#tRpikW;URD?@6
zIX|x?F*7f<2qI<^_SU?WiAxryvp5lGKw?p4d`f9<L40vZVo7Fxo{$a)zmgaiA4p6W
zDyEw|{rn+DNl_gR0o+o8xTS<}O9^9_lGv;f9>K+!Gr2KQQdomSNJ)f?uRO81Bvm&l
zu{b-mWb(yCF%cmR4q+@3;)>N=axg!FHN}?{CFT{Ur53?F2@a3VFA_C{n;({Me^|~q
zhr?<g6PG|vVqQvVajGtePRq>65whaomlEK3eRMLr#Pp8;5Wt9T=k)kSMsZau4guno
z3KFkWh<K&K#3>cqzOIq6(L^nmOE5PvFFrRhB~>>qCo#PsKPOd402uu|T&yYiCAzr+
wj1mpC(^-?4Jh$s_W8`8K2<PI3>&OL02UxD%ay#R8%k4~cEZhC|Gc76t069JQnE(I)

delta 582
zcmaEKhv&m%o(+dWCtHSzFvf583kzc0ydol;i!p6dvZSvnhmevW7k5!=a%FN(W?s5(
zuEdi@MlC)rP7ZE?BOMc&G#DlRR0^qb2os@f^UGu{VV1M3T=J6zizL`hbc;(8OH!ND
zO17t!FnV$`uAjc4o>4@}oP%FVfaCSi$?Ou-JN`oeBZ~3U6B`)C8O^6NHZY3vAUh8%
z0W?667z2RngosopOoTeI?e7~H8%?&~-^$3v*zUBQal6xYraBgpJT5^*@FnNumt>?C
zPwq>Okt*R5M@XdSBo-IPC*_xv<Upi_a=7>r(gleHsYM`NsKyllb(Lf$gCu0ixFnI(
zLnM$5lqlj7MJOmvE=nwj&rK~!%mL|^E$5O#lFUua$%#)aD9Fi7%uB}Ro|60uh_%}f
J>}Fb21OT&G*sTBn

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index c1492e6338..bb5a3f5dc4 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -7291,7 +7291,42 @@ cont {
   }
 }
 cont {
-  name: "amenity-recycling_container"
+  name: "amenity-recycling-centre"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
+cont {
+  name: "amenity-recycling-container"
   element {
     scale: 17
     symbol {
@@ -7410,6 +7445,94 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-sanitary_dump_station"
+  element {
+    scale: 15
+    symbol {
+      name: "dump-station-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "dump-station-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "dump-station-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dump-station-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dump-station-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-school"
   element {
@@ -8342,7 +8465,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16612
     }
     caption {
@@ -8357,7 +8480,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16612
     }
     caption {
@@ -8370,6 +8493,41 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-waste_transfer_station"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-water_point"
   element {
@@ -9994,208 +10152,6 @@ cont {
     }
   }
 }
-cont {
-  name: "boundary-administrative-4-state"
-  element {
-    scale: 5
-    lines {
-      width: 0.7
-      color: 863203947
-      dashdot {
-        dd: 1.35
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 0.8
-      color: 7565931
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 0.9
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 0.9
-      color: 7565931
-      dashdot {
-        dd: 1.44
-        dd: 1.44
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.0
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-    }
-  }
-}
 cont {
   name: "boundary-national_park"
   element {
@@ -32669,7 +32625,7 @@ cont {
       priority: -15337
     }
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16663
     }
     caption {
@@ -32688,7 +32644,7 @@ cont {
       priority: -15337
     }
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16663
     }
     caption {
@@ -32707,7 +32663,7 @@ cont {
       priority: -15337
     }
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16663
     }
     caption {
@@ -32726,7 +32682,7 @@ cont {
       priority: -15337
     }
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16663
     }
     caption {
@@ -32745,7 +32701,7 @@ cont {
       priority: -15337
     }
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16663
     }
     caption {
@@ -37182,6 +37138,49 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-flagpole"
+  element {
+    scale: 15
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+}
 cont {
   name: "man_made-lighthouse"
   element {
@@ -37276,6 +37275,41 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-mast"
+  element {
+    scale: 16
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+}
 cont {
   name: "man_made-pier"
   element {
@@ -57907,286 +57941,6 @@ cont {
     }
   }
 }
-cont {
-  name: "recycling-clothes"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-glass_bottles"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-paper"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-plastic"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-plastic_bottles"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-scrap_metal"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-small_appliances"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-toxic"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
 cont {
   name: "route-ferry"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 4938b256c3a26800ac6d3d5ccd2f9e0886e37836..9260825731bae658d5bbc6855e18a92e9d881ffb 100644
GIT binary patch
delta 677
zcmdmUgJ<1Eo(&zL(xqGyiMgqHnI)CFMXAY^$vK&M>AK0Oc_l@u(--bwikaLID#EC{
zd2VPBqh%`-mn=+iaUxJpVo_y$N@;FEd~r!)NoIbYkPZjGk{A~sNK6+hrkgAAZt_P}
z5vjH+ptJyfX+iwbLinYHaY-|^Rc(G37Qv;P!zBjuKzU+uNossbW^qA&abk{;28WQ6
z2p1n%R5vNHI6JjuazUcFum*=P7I85pu4*nhRHI6Y67!1FQj1`L0S>;+>k>7Eo0pew
zUtZ4G!Ns_9x<M18h>9f#zZ5^m%oQmT(>wk{03(Ji{Ndt2g#yGX6eL!m5U~n{iBTxF
zJ-V4u*;p-?OE5PvFFrRhB~>>qCo#PsKPOd40GJ$jxL8y2OLTJu7$q8Nr`yIdd2X-U
f#>mAe5YEL5*O3d142WFEc1Fwp+aq={Jt+hLe0cUZ

delta 633
zcma)&!Ab%_7{?hQ*hb5BHQg+Uk|4zGQVG3Apmm6rad)(V+1YJp()O5LyoLt}dVuIq
zf#6<xf~Z3Wp$G6W0#o*|dTPJx@Av<IAK%M&;{7M_)~)s?)eO)Fnc4{$u(MOxY``qC
zFeAd#+K3CRn}j<yM^xFBl${ieyV&pyN?22~)bTASt-@s~E{~o^u|1&vdQ&YOK^wdp
zrF8LY32xQxYi1(X(~xNqM!0a1AT6vNYFr?J@5;h23vjg3|Fl4&L=iI^gi@s<CG$z?
z;mK6{-AOQDVQ*jVfZTRPlA~#<XqpmDOaHHB{l^X{9{Br10D*t+gX2kt!BqHOgWBQ}
z^IoBLo)<6|f+j_r>vdZQ8eo~iWQZN)^fqc2i)GF<BZx68+ib!0IXeLJb*c;3LV+7D
oa&!v|L}%$j8|LSrg(%gL<4}T_5nQ7zTqEq8V6Fc#jE%4U0I?V9kpKVy

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 099e2dcbfc..304ed0797b 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -7291,7 +7291,42 @@ cont {
   }
 }
 cont {
-  name: "amenity-recycling_container"
+  name: "amenity-recycling-centre"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
+cont {
+  name: "amenity-recycling-container"
   element {
     scale: 17
     symbol {
@@ -7410,6 +7445,94 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-sanitary_dump_station"
+  element {
+    scale: 15
+    symbol {
+      name: "dump-station-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "dump-station-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "dump-station-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dump-station-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dump-station-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-school"
   element {
@@ -8342,7 +8465,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16612
     }
     caption {
@@ -8357,7 +8480,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16612
     }
     caption {
@@ -8370,6 +8493,41 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-waste_transfer_station"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16622
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-water_point"
   element {
@@ -9994,208 +10152,6 @@ cont {
     }
   }
 }
-cont {
-  name: "boundary-administrative-4-state"
-  element {
-    scale: 5
-    lines {
-      width: 0.7
-      color: 862348902
-      dashdot {
-        dd: 1.35
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 0.8
-      color: 6710886
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 0.9
-      color: 6710886
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 0.9
-      color: 6710886
-      dashdot {
-        dd: 1.44
-        dd: 1.44
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.0
-      color: 6710886
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.2
-      color: 6710886
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.2
-      color: 6710886
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.2
-      color: 6710886
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.2
-      color: 6710886
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.2
-      color: 6710886
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 6710886
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.2
-      color: 6710886
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.2
-      color: 6710886
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.2
-      color: 6710886
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.2
-      color: 6710886
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1214
-    }
-  }
-}
 cont {
   name: "boundary-national_park"
   element {
@@ -32820,7 +32776,7 @@ cont {
       priority: -15337
     }
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16663
     }
     caption {
@@ -32839,7 +32795,7 @@ cont {
       priority: -15337
     }
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16663
     }
     caption {
@@ -32858,7 +32814,7 @@ cont {
       priority: -15337
     }
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16663
     }
     caption {
@@ -32877,7 +32833,7 @@ cont {
       priority: -15337
     }
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16663
     }
     caption {
@@ -32896,7 +32852,7 @@ cont {
       priority: -15337
     }
     symbol {
-      name: "recycling-m"
+      name: "waste-basket-m"
       priority: 16663
     }
     caption {
@@ -37313,6 +37269,49 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-flagpole"
+  element {
+    scale: 15
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+}
 cont {
   name: "man_made-lighthouse"
   element {
@@ -37407,6 +37406,41 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-mast"
+  element {
+    scale: 16
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dot-m"
+      apply_for_type: 1
+      priority: 16000
+    }
+  }
+}
 cont {
   name: "man_made-pier"
   element {
@@ -57994,286 +58028,6 @@ cont {
     }
   }
 }
-cont {
-  name: "recycling-clothes"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-glass_bottles"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-paper"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-plastic"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-plastic_bottles"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-scrap_metal"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-small_appliances"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
-cont {
-  name: "recycling-toxic"
-  element {
-    scale: 17
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "recycling-m"
-      priority: 16622
-      min_distance: 30
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15622
-    }
-  }
-}
 cont {
   name: "route-ferry"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 2e5097a50b93e6ced59f3995753daf8f7796ff9b..2ffa632a8a83ebe25d9be2d26a64b15d14ee554c 100644
GIT binary patch
delta 321
zcmbQRg`;aD$A<MP0sdTkiMgqHnI)CF1^GFd$*DrZ9D+*xTpSRdZmvW_tpYz#PzYU+
z3n(azAvk%R%7OZCj9juXQ;QRUh9?$P#;26#7Q`2qB$j06=Lu<Y@GFUO@qxs2p<)oL
zM6~$0I5~I(j&w|9(qNQ0QVvuqK)g~xkWzC@WBI|x@}d|kgl_EQjU3`4K>LKTNJwnX
RQ{Bej{Kb6x7js6LM*wxNUlITS

delta 43
zcmV+`0M!4Au?Uc~2(Ygtk|n>hxF)s_1kD8sACqh`7zZ>hb97;JWrM*px4|<3$>e^7
B5q|&x

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 43f037896a..d90cbc17ac 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -3051,6 +3051,33 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-police"
+  element {
+    scale: 17
+    symbol {
+      name: "police-m"
+      priority: 16000
+      min_distance: 15
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "police-m"
+      priority: 16000
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "police-m"
+      priority: 16000
+      min_distance: 10
+    }
+  }
+}
 cont {
   name: "amenity-restaurant"
   element {
@@ -3118,6 +3145,89 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-sanitary_dump_station"
+  element {
+    scale: 15
+    symbol {
+      name: "dump-station-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "dump-station-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "dump-station-m"
+      priority: 16000
+      min_distance: 15
+    }
+    caption {
+      primary {
+        height: 13
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dump-station-m"
+      priority: 16000
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dump-station-m"
+      priority: 16000
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
 cont {
   name: "amenity-theatre"
   element {
@@ -4407,208 +4517,6 @@ cont {
     }
   }
 }
-cont {
-  name: "boundary-administrative-4-state"
-  element {
-    scale: 5
-    lines {
-      width: 0.7
-      color: 863203947
-      dashdot {
-        dd: 1.35
-        dd: 1.0
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 0.8
-      color: 7565931
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 0.9
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 0.9
-      color: 7565931
-      dashdot {
-        dd: 1.44
-        dd: 1.44
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.0
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.2
-      color: 7565931
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-    }
-  }
-}
 cont {
   name: "boundary-national_park"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 67f64f46dc1c3262f8c628a7acc24ab08c6ad850..3c86f6716f29708263eb4d8200071ea96d6012b8 100644
GIT binary patch
delta 301
zcmbQXo@2rqjt!nF0sdTkiMgqHnI)CF1^GFd$*DrZ9D+*xTpSRdZmvW_tpYz#PzYU+
z3n(azAvoDX<v{&6MlM;Hsl|yv!xM`t<5Nm=3*w7Q5=%1k^Mo`x_?1Mt_&{R1P%(&A
zB3gW0oE$s?&(6$b)?k!4QVvuqK)g~xkWwCGV<-D^NC;~JosVYS<N~m`Fcxv~&Fre%
P`J4O9xA&Pday$S4AsAS8

delta 63
zcmbQRhGW`#jt!nFlV_>y-yEd2jbHgJE0=syeraAxVo{}TVoGjiUS@GgQDRAES*osy
TZgELsNosSn@%CtA#;uP493vRt

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index d4e8594215..e79324fb80 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -3051,6 +3051,33 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-police"
+  element {
+    scale: 17
+    symbol {
+      name: "police-m"
+      priority: 16000
+      min_distance: 15
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "police-m"
+      priority: 16000
+      min_distance: 10
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "police-m"
+      priority: 16000
+      min_distance: 10
+    }
+  }
+}
 cont {
   name: "amenity-restaurant"
   element {
@@ -3118,6 +3145,89 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-sanitary_dump_station"
+  element {
+    scale: 15
+    symbol {
+      name: "dump-station-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 12
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "dump-station-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 12
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "dump-station-m"
+      priority: 16000
+      min_distance: 15
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dump-station-m"
+      priority: 16000
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dump-station-m"
+      priority: 16000
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
 cont {
   name: "amenity-theatre"
   element {
@@ -4407,208 +4517,6 @@ cont {
     }
   }
 }
-cont {
-  name: "boundary-administrative-4-state"
-  element {
-    scale: 5
-    lines {
-      width: 0.7
-      color: 861690972
-      dashdot {
-        dd: 1.35
-        dd: 1.0
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 6
-    lines {
-      width: 0.8
-      color: 6052956
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 7
-    lines {
-      width: 0.9
-      color: 6052956
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 8
-    lines {
-      width: 0.9
-      color: 6052956
-      dashdot {
-        dd: 1.44
-        dd: 1.44
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.0
-      color: 6052956
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.2
-      color: 6052956
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.2
-      color: 6052956
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.2
-      color: 6052956
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.2
-      color: 6052956
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.2
-      color: 6052956
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 6052956
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.2
-      color: 6052956
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.2
-      color: 6052956
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.2
-      color: 6052956
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.2
-      color: 6052956
-      dashdot {
-        dd: 1.8
-        dd: 1.0
-      }
-      priority: 1235
-    }
-  }
-}
 cont {
   name: "boundary-national_park"
   element {
diff --git a/data/types.txt b/data/types.txt
index e9408e2df3..e911a66187 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -106,7 +106,7 @@ mapswithme
 *sport|soccer
 *boundary|administrative|4
 *amenity|cafe
-*amenity|recycling
+*amenity|recycling|container
 *leisure|garden
 *landuse|commercial
 *railway|station
@@ -208,10 +208,10 @@ mapswithme
 *railway|disused
 *aeroway|runway
 *railway|halt
-mapswithme
+*man_made|mast
 *railway|rail|tunnel
 *man_made|wastewater_plant
-mapswithme
+*man_made|flagpole
 *place|county
 mapswithme
 mapswithme
@@ -233,8 +233,8 @@ mapswithme
 *amenity|parking|permissive
 *boundary|administrative|5
 *highway|unclassified|tunnel
-mapswithme
-mapswithme
+*amenity|recycling|centre
+*amenity|recycling
 *highway|residential|tunnel
 *aeroway|helipad
 *highway|path|permissive
@@ -411,7 +411,7 @@ mapswithme
 mapswithme
 *leisure|park|private
 mapswithme
-*noexit|motor_vehicle
+*noexit
 *healthcare|laboratory
 *highway|motorway|tunnel
 *railway|light_rail|tunnel
@@ -428,9 +428,9 @@ mapswithme
 *area:highway|path
 *railway|siding
 *highway|track|area
-mapswithme
+*amenity|sanitary_dump_station
 *railway|funicular
-mapswithme
+*amenity|waste_transfer_station
 *historic|battlefield
 mapswithme
 *sport|australian_football
@@ -733,7 +733,7 @@ mapswithme
 *tourism|museum
 *tourism|guest_house
 *tourism|motel
-*boundary|administrative|4|state
+boundary|administrative|4
 *place|state|USA
 *building|address
 *amenity|parking|no-access
@@ -1335,7 +1335,7 @@ mapswithme
 *isoline|step_10
 *isoline|zero
 *complex_entry
-*recycling|toxic
+*recycling|batteries
 *recycling|clothes
 *recycling|glass_bottles
 *recycling|paper
@@ -1343,7 +1343,12 @@ mapswithme
 *recycling|plastic_bottles
 *recycling|scrap_metal
 *recycling|small_appliances
-*amenity|recycling_container
+amenity|recycling|container
 *hwtag|onedir_bicycle
 *shop|video_games
 *natural|strait
+*recycling|cardboard
+*recycling|cans
+*recycling|shoes
+*recycling|green_waste
+*recycling|cartons
diff --git a/data/visibility.txt b/data/visibility.txt
index b34a8de9fa..72cbf0e35e 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -93,15 +93,18 @@ world  00000000000000000000  +
             shinto  00000000000000001111  -
             taoist  00000000000000001111  -
             {}
-        police  00000000000000000000  -
+        police  00000000000000000111  -
         post_box  00000000000000000000  -
         post_office  00000000000000000000  -
         prison  00000000000000000000  -
         pub  00000000000000000000  -
         public_bookcase  00000000000000000000  -
-        recycling  00000000000000000000  -
-        recycling_container  00000000000000000000  -
+        recycling  00000000000000000000  +
+            centre  00000000000000000000  -
+            container  00000000000000000000  -
+            {}
         restaurant  00000000000000001111  -
+        sanitary_dump_station  00000000000000011111  -
         school  00000000000000000000  -
         shelter  00000000000000000000  -
         shower  00000000000000000000  -
@@ -120,6 +123,7 @@ world  00000000000000000000  +
         veterinary  00000000000000000000  -
         waste_basket  00000000000000000000  -
         waste_disposal  00000000000000000000  -
+        waste_transfer_station  00000000000000000000  -
         water_point  00000000000000000000  -
         {}
     area:highway  00000000000000000000  +
@@ -163,9 +167,7 @@ world  00000000000000000000  +
             11  00000000000000000000  -
             2  00111111111111111111  -
             3  00001000000000000000  -
-            4  00000111111111111111  +
-                state  00000111111111111111  -
-                {}
+            4  00000111111111111111  -
             5  00000000000000000000  -
             6  00000000000000000000  -
             7  00000000000000000000  -
@@ -566,7 +568,9 @@ world  00000000000000000000  +
         cairn  00000000000000000000  -
         chimney  00000000000000000000  -
         cutline  00000000000000111111  -
+        flagpole  00000000000000000000  -
         lighthouse  00000000000000000000  -
+        mast  00000000000000000000  -
         pier  00000000000011111111  -
         pipeline  00000000000000000000  +
             overground  00000000000000000000  -
@@ -627,9 +631,7 @@ world  00000000000000000000  +
             marsh  00000000000111111111  -
             {}
         {}
-    noexit  00000000000000000000  +
-        motor_vehicle  00000000000000000000  -
-        {}
+    noexit  00000000000000000000  -
     office  00000000000000000000  +
         company  00000000000000000000  -
         diplomatic  00000000000000000000  -
@@ -805,14 +807,19 @@ world  00000000000000000000  +
             {}
         {}
     recycling  00000000000000000000  +
+        batteries  00000000000000000000  -
+        cans  00000000000000000000  -
+        cardboard  00000000000000000000  -
+        cartons  00000000000000000000  -
         clothes  00000000000000000000  -
         glass_bottles  00000000000000000000  -
+        green_waste  00000000000000000000  -
         paper  00000000000000000000  -
         plastic  00000000000000000000  -
         plastic_bottles  00000000000000000000  -
         scrap_metal  00000000000000000000  -
+        shoes  00000000000000000000  -
         small_appliances  00000000000000000000  -
-        toxic  00000000000000000000  -
         {}
     route  00000000000000000000  +
         ferry  00000000000000000000  -