From 46d85ec71d6e1c71c91c36a1f7c491c096f04c43 Mon Sep 17 00:00:00 2001
From: "i.tomko" <igor.n.tomko@gmail.com>
Date: Mon, 20 Jun 2016 15:11:58 +0300
Subject: [PATCH] generated styles

---
 data/colors.txt                          |   8 +++++++
 data/drules_proto.bin                    | Bin 255228 -> 255256 bytes
 data/drules_proto.txt                    |  28 +++++++++++------------
 data/drules_proto_clear.bin              | Bin 220338 -> 220366 bytes
 data/drules_proto_clear.txt              |  28 +++++++++++------------
 data/drules_proto_dark.bin               | Bin 217705 -> 217743 bytes
 data/drules_proto_dark.txt               |  28 +++++++++++------------
 data/styles/clear/include/natural.mapcss |   2 +-
 8 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/data/colors.txt b/data/colors.txt
index 90df90b49f..c23ee6f707 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -282,5 +282,13 @@
 3019359744
 3019863808
 3019898879
+3423803648
+3423869952
+3433742181
+3434005099
+3434136176
+3434333297
+3434924158
+3435581331
 4281018407
 4294506744
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index cdf09c3a4dfd98be9bb70be6a7cc4aec6bdc6ebb..dcdca63d19b0299f79ff632ad3b5c08ecc8770f8 100644
GIT binary patch
delta 393
zcmex!l7Gf2{tca4k`o!Z1QT;p^D;{+b(1qPb5fEMi&BL&I0Ppzu+iLnLhCKF?rcUb
zA-IzK(xQ@#{L<o7A#DypC2=mng3_d%%w*l9QlQ?<y!6TMeZ|GJIfSrDO$-D{31gEI
zG!k!i(ckW(&&agHb~g)`SWaqYacNPiZeC&ukcux#Elw>eOBE93;F1#Lm^^>>GaiXI
z&Ho{QQAmx08z}s5!sn+v(;J^N%5vLq@E{9FPkX^A0Tko~3V!T34^agXwBq0c3chaH
z4HV>i$tX76;sv8Lw-pCJQ1nB~VVLMTh^PQi^y$A<XrhA1qJ}`tLg)g*$N~oKl`k2$
KSH5Iw{tW;|%Z&m6

delta 327
zcmbPnivQ0^{tca4YJH4cf{D4Qd6^}Zy2%-tIVs7BMX5rn9D+)MT-<Ph$$2)Cn@?-K
zW!C6n<Pw6b&o3=1$;dA)P8CuEY7pY$NrsC|PSh5kyf=cK6D~AaP)%GAs8AS1Ay8DJ
zIZS_hm_8%Z4ylbSTw*z?nZ>0=sk(WIB|s{^D784Xs4R7Qz-mTuM%C$#+ZaWrpLotF
zz#}4L&A}rj!0~UwXV&R^pEDXWT2Eh?!UUGpV6>cm@gSr4^!+awIi~x+V3Y<4Y=;Oa
z1KAsw0*%@8f>8~~R@?|vX#Wzd@MAjA6rd#cbf|#BDkK$B?NeVeZlC&+srfemc^Pwo

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 6ab2affeca..c48dee6951 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -3595,7 +3595,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "childcare-l"
+      name: "kindergarten-l"
       priority: 16824
     }
     caption {
@@ -3996,7 +3996,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -4011,7 +4011,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -4026,7 +4026,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -40547,14 +40547,14 @@ cont {
   element {
     scale: 10
     area {
-      color: 13029267
+      color: 3435581331
       priority: -15892
     }
   }
   element {
     scale: 11
     area {
-      color: 12372094
+      color: 3434924158
       priority: -15892
     }
     symbol {
@@ -40566,7 +40566,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 12372094
+      color: 3434924158
       priority: -15892
     }
     symbol {
@@ -40587,7 +40587,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 11781233
+      color: 3434333297
       priority: -15892
     }
     symbol {
@@ -40608,7 +40608,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 11453035
+      color: 3434005099
       priority: -15892
     }
     symbol {
@@ -40628,7 +40628,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 11584112
+      color: 3434136176
       priority: -15892
     }
     symbol {
@@ -40648,7 +40648,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
@@ -40668,7 +40668,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
@@ -40688,7 +40688,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
@@ -40708,7 +40708,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 348f3701417f4d6cd8e7230c66ee3c5a49838e75..3e25d867ad8adff928e96600f64ae3160f7a620d 100644
GIT binary patch
delta 315
zcmdnAllR<C-VJu@j1wo@tBX#aWL~%VygDN@<Lt>7wZz1<IRur&xdaPJlX5bXb(2an
zb5b(%(kD-p6bDKPVUt?u1CkQPE+y6+r@cK+n=z@5arg9tD;cGfL^-&m1UV+ppZ$zS
z;!X2^2w)Ua<KPAg|C{jnDbMuyRgBWSB0@GCJjg=E+%_D%K!J}P=OJp0xve<(fC8^u
zb^`_GtYS0-3h)C3KC~PL3S5T>2ml41{#%6*5QGc(t_EunLKhH57BFc4yqa<Q=haO6
GHvj+*+;DjS

delta 287
zcmX@NlXufj-VJu@jD3^s)kOtVIRupixww-vGILUr6N^$er>o~MYxFR32_@#H=4F;t
z>L%xx7L{b=mlmfAsR0!Waq%ETCQp<UpR5qX&V?jo7$k?xUFap=T&TUhP@6HaPHH0y
zmsn0}W^rjzs%~Cl36P2}N-a(;DodT-*uf~ys5)IRgHdF<)G9_HM(gQ}#Spf@^a-mN
zC4d4SYEc9%r`OjpickN$ijiab$yJQfjF!_EW<ms%f$YXI1UoPn$bP$;QHe>&a=Kv^
U66awxqj)<|X8YUKOb<5z0Fe4(3IG5A

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 4f1c04b1d2..b94a446945 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -3274,7 +3274,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "childcare-l"
+      name: "kindergarten-l"
       priority: 16824
     }
     caption {
@@ -3612,7 +3612,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -3627,7 +3627,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -3642,7 +3642,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -35631,14 +35631,14 @@ cont {
   element {
     scale: 10
     area {
-      color: 13029267
+      color: 3435581331
       priority: -15892
     }
   }
   element {
     scale: 11
     area {
-      color: 12372094
+      color: 3434924158
       priority: -15892
     }
     symbol {
@@ -35650,7 +35650,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 12372094
+      color: 3434924158
       priority: -15892
     }
     symbol {
@@ -35671,7 +35671,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 11781233
+      color: 3434333297
       priority: -15892
     }
     symbol {
@@ -35692,7 +35692,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 11453035
+      color: 3434005099
       priority: -15892
     }
     symbol {
@@ -35712,7 +35712,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 11584112
+      color: 3434136176
       priority: -15892
     }
     symbol {
@@ -35732,7 +35732,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
@@ -35752,7 +35752,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
@@ -35772,7 +35772,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
@@ -35792,7 +35792,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 11190117
+      color: 3433742181
       priority: -15892
     }
     symbol {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 3fb4d0d4b6fbc85cb6ef4e983c47de871ca96bd3..ee78b0a6b6b391c44e464ff0e450905382d4698d 100644
GIT binary patch
delta 333
zcmaF4gtvbw?*=<{#)*^d)kP;anAdGSug=KKID7I%Eio}|4nZYxF2RD*q@2uT-K5gY
zoRrMG^vM$?#eq^nSfr*O3}+M*7t-bs#vv)*9Iw4SUYl`aCFAbtf=d~tltekWqy#w{
zHl2CEBk`vBKLjuesc~?Fgm+wcz%xC6DWf#6h>#5j53-Okw+#m`vVbWkADpYWj8Sa*
wU!Xp2D-M2SQA41B0J?x6vVhoh`Q?mKJVI6+LfD0cQH0xps<+E8XYyJN00M_>*8l(j

delta 296
zcmeBQ%KLH&?*=<{#=gn+>Y@Uw9D+)MT-?bSnK>!RiAAZK)75jBHF_Aigc5U8^D;{+
zb(8Z;i%K%`ON&#5)PRbGxOfmElP5}w3#f4jp@>d)^b?=_FOY*1t_~<7(Ojs#y-=HR
zW2Mw`7A~=z)Xd`2qEy|y#1bGCUzA#$T2z)gePRlu7^eycw-i4|!;XOI@k<$HIjuN&
z5M1f$50)}YO%D=e5}Ka1lu-c0m0+}(E?B@QHr;m_Bgb^fWsK550mpPk;ptw>7}bF6
ugLM!|Wgz=u2~gZ>Iio6*kj3<ijX(+8<%~)o&O-qv;dY?RcB|z~p{oJb&0W|4

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 03e8509167..bb4a6a81c5 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -3274,7 +3274,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "childcare-l"
+      name: "kindergarten-l"
       priority: 16824
     }
     caption {
@@ -3612,7 +3612,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -3627,7 +3627,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -3642,7 +3642,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "courthouse-l"
+      name: "public-building-l"
       priority: 16864
     }
     caption {
@@ -35631,14 +35631,14 @@ cont {
   element {
     scale: 10
     area {
-      color: 1251584
+      color: 3423803648
       priority: -15892
     }
   }
   element {
     scale: 11
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35650,7 +35650,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35671,7 +35671,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35692,7 +35692,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35712,7 +35712,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35732,7 +35732,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35752,7 +35752,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35772,7 +35772,7 @@ cont {
   element {
     scale: 18
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
@@ -35792,7 +35792,7 @@ cont {
   element {
     scale: 19
     area {
-      color: 1317888
+      color: 3423869952
       priority: -15892
     }
     symbol {
diff --git a/data/styles/clear/include/natural.mapcss b/data/styles/clear/include/natural.mapcss
index 9be7bb1e3b..e16a94f3d8 100644
--- a/data/styles/clear/include/natural.mapcss
+++ b/data/styles/clear/include/natural.mapcss
@@ -233,7 +233,7 @@ line[waterway][tunnel]
 /* VEGETATION */
 
 area|z10[natural=wood],
-area|z10[landuse=forest]]
+area|z10[landuse=forest]
 {
   fill-color: @green1;
 	fill-position: background;