From 04d4de387e9af1b205c7c59a8f4e010c2caccb3b Mon Sep 17 00:00:00 2001
From: Nick Shaforostov <shaforostoff@gmail.com>
Date: Thu, 21 May 2020 12:14:32 +0200
Subject: [PATCH] [styles][generated] recycling types

---
 data/classificator.txt      |  11 ++
 data/drules_proto.bin       | Bin 209762 -> 210803 bytes
 data/drules_proto.txt       | 315 ++++++++++++++++++++++++++++++++++++
 data/drules_proto_clear.bin | Bin 210429 -> 211470 bytes
 data/drules_proto_clear.txt | 315 ++++++++++++++++++++++++++++++++++++
 data/drules_proto_dark.bin  | Bin 209347 -> 210388 bytes
 data/drules_proto_dark.txt  | 315 ++++++++++++++++++++++++++++++++++++
 data/types.txt              |   9 ++
 data/visibility.txt         |  11 ++
 9 files changed, 976 insertions(+)

diff --git a/data/classificator.txt b/data/classificator.txt
index bd34f1d6a7..1ae9e61212 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -99,6 +99,7 @@ world  +
         pub  -
         public_bookcase  -
         recycling  -
+        recycling_container  -
         restaurant  -
         school  -
         shelter  -
@@ -832,6 +833,16 @@ world  +
             tunnel  -
             {}
         {}
+    recycling  +
+        clothes  -
+        glass_bottles  -
+        paper  -
+        plastic  -
+        plastic_bottles  -
+        scrap_metal  -
+        small_appliances  -
+        toxic  -
+        {}
     route  +
         ferry  +
             motor_vehicle  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 18a2900823b5cf8a3dab4b0db593499166321c7e..5f790d1fa313e172cc956cbfb9f4698c88d983cd 100644
GIT binary patch
delta 282
zcmaF#jOX(^o(;@laur<CiMgqHnI)CFMXAY^$vK&M>G8?=c_oRNd8tLs%R}3jhca$o
z9?Hb+E0V`02v?(<oReRYky<=?d1#DO370rRB0VRuxHvv3zoaAwA}y4|#gC9KNGwP#
z0_j3Et^la3Br_Q#AydXBiKHGPfoz~e5tk@JL2+_XVnKXvYDr=aNVjY`mlTp@ZemVO
bd}2XCPG(|WGB)>=<X1qf-M(oN(}oEEZ0K#=

delta 28
kcmezTj_1)co(;@l&9!0ewPB3gYr~k<`)ohFjA_FJ0LmZ@WdHyG

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 5c0eabbea1..4356338ce9 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -7322,6 +7322,41 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-recycling_container"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
 cont {
   name: "amenity-restaurant"
   element {
@@ -56344,6 +56379,286 @@ cont {
     }
   }
 }
+cont {
+  name: "recycling-clothes"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-glass_bottles"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-paper"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-plastic"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-plastic_bottles"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-scrap_metal"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-small_appliances"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-toxic"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
 cont {
   name: "route-ferry"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index ed9e89c32a6715ed1fc4cd940599bee38f64744e..e780ad33f20435297d9d2bd3617550fc09bac896 100644
GIT binary patch
delta 354
zcmezSny2pz&xZI=r3x<T#N5=p%#upoqSWNd<ebdB^!VibypqJsywoBgaSp-B3ZY`n
zvZ3v=p^V#QLz&n;CGxlg;c9i0bMi|vQj1|KC(DL9$(3-4BNU|PBo-IPC*_xv<e(}O
z%i-cjC@V-TK-dQ|1=X4YpeZGp$;j3ylyONS>4zx5W|2%0mncGEadJ^&L40m%Nn#GN
nX^Q1sQb>w&6LWIn6AKD*G86NX@wvMszXH`++g0W<-JA{p@TqfD

delta 28
kcmeDC!t?hv&xZKW=9{7IH$xe>-wb6s>apE)5!21-0N4i(LI3~&

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 4d63b1c0cf..1401b5088a 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -7256,6 +7256,41 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-recycling_container"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
 cont {
   name: "amenity-restaurant"
   element {
@@ -55976,6 +56011,286 @@ cont {
     }
   }
 }
+cont {
+  name: "recycling-clothes"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-glass_bottles"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-paper"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-plastic"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-plastic_bottles"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-scrap_metal"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-small_appliances"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-toxic"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
 cont {
   name: "route-ferry"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 0144ed9c1923f2fd4de6c3484a1553abf3fd0177..bc06d7eb751e3cb59dc1dcffe33c09557259ba5a 100644
GIT binary patch
delta 354
zcmX^7nCHrCo(-y@N)=qviMgqHnI)CFMXAY^$vK&M>G8?=c_oRNd8tK0;v9mL|A&Y+
zKMHAo6vDXuQ3%s5SBX3>LAYAo<edDHjMQS7%E^yHoaIWm#1RV8a}tY-<CF4BN^($@
ziREzdBa{^+79i{cnSyFf0nn6^%w%M16w0_Hk@Q0pV6#Z3h)WcqusFFWu^>J-wIneI
o*)+v+E-55MxrsSB@reZmIhl!h$@tt|l3#)9tnGVdF|khv09qe|-v9sr

delta 28
kcmccen&<Fio(-y@&GSRs=Z7+GpC8IJ-F5rfc}(on0m)Yk<^TWy

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 9d37efeee3..36c5faacf2 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -7256,6 +7256,41 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-recycling_container"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
 cont {
   name: "amenity-restaurant"
   element {
@@ -56063,6 +56098,286 @@ cont {
     }
   }
 }
+cont {
+  name: "recycling-clothes"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-glass_bottles"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-paper"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-plastic"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-plastic_bottles"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-scrap_metal"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-small_appliances"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
+cont {
+  name: "recycling-toxic"
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "recycling-m"
+      priority: 16455
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15455
+    }
+  }
+}
 cont {
   name: "route-ferry"
   element {
diff --git a/data/types.txt b/data/types.txt
index 9e070c59f9..86442f3adb 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1335,3 +1335,12 @@ mapswithme
 *isoline|step_10
 *isoline|zero
 *complex_entry
+*recycling|toxic
+*recycling|clothes
+*recycling|glass_bottles
+*recycling|paper
+*recycling|plastic
+*recycling|plastic_bottles
+*recycling|scrap_metal
+*recycling|small_appliances
+*amenity|recycling_container
diff --git a/data/visibility.txt b/data/visibility.txt
index 8c11072702..a8411457fa 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -99,6 +99,7 @@ world  00000000000000000000  +
         pub  00000000000000000000  -
         public_bookcase  00000000000000000000  -
         recycling  00000000000000000000  -
+        recycling_container  00000000000000000000  -
         restaurant  00000000000000001111  -
         school  00000000000000000000  -
         shelter  00000000000000000000  -
@@ -832,6 +833,16 @@ world  00000000000000000000  +
             tunnel  00000000000111111111  -
             {}
         {}
+    recycling  00000000000000000000  +
+        clothes  00000000000000000000  -
+        glass_bottles  00000000000000000000  -
+        paper  00000000000000000000  -
+        plastic  00000000000000000000  -
+        plastic_bottles  00000000000000000000  -
+        scrap_metal  00000000000000000000  -
+        small_appliances  00000000000000000000  -
+        toxic  00000000000000000000  -
+        {}
     route  00000000000000000000  +
         ferry  00000000000000000000  +
             motor_vehicle  00000000000000000000  -