From f894f49017cfed69e54b2eade7f79906c24b8022 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Mon, 6 Feb 2012 19:51:13 +0300
Subject: [PATCH] [styles] New changes from AK.

---
 data/drules_proto.bin            | Bin 201545 -> 201445 bytes
 data/drules_proto.txt            | 253 +++++++++++++------------------
 indexer/classificator_loader.cpp |   7 +-
 3 files changed, 108 insertions(+), 152 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 7a7d450c8466cc4b9b95abcb2a9564db922282fb..06d39d5f28636b093c838c1ebec716f678dacbb2 100644
GIT binary patch
delta 1421
zcmZ8hT}TvB6z<+#ox9^YJ2N|jmo;_OEl4nsr07Acr(Q}TkjNt0R7&tC%!nv(OQWYs
z5S)IH@F9bG&{%CkOk4~qi0FrCH3`j()-3yZC`_<(@666F&C9vpcfL70_dDn8(*f_o
zE$>iFa?Qjhdmc%}JTBT%_E~tV9S`|7hqj5naC1XTWBcjS`qsMk*0vLBh$uzbA~}96
z+}0efJ57K0%;o9PnD2{=R~z(ORo>X~uN@0Di{GXFcEx|p_w3XIJRY{=89fjLUQi{^
z^=s@&RLVa`Zwqvfx|zs<9Kv22(M#D&(FOfo=0UiFK*vYctOuzYkpeQ|?C||G)|X^g
z%`{d{vhT+nwvZ?m8_mtzhxv7m7g(R&YsWD=ez0Pc1iSJ=T}UKHPBu2xH?|yAy~GzF
z<l*42OuB^Ca`<*ahWg(23|8ocCAuh(Ectunyjx8k=z~L`QY=;UdBvvf!OwH^0)333
z6nmMY^BI7ch@sA$Q)bR7<Zf$Vj?oM?iwFUMIb;En4m{~VOb1yhpb;<JoENx}ax_G;
z13?luA_=qs#f<?TdKZyq%qCC)io<aWiksz&XuBJKL`Lg3bin;0)+rdzzM=J=B5*<`
zfDN>a{JYt$>7{D52yVq`flfQ#mw3S$FL#Fa*MNp~f|a6Q$CLfx8cCjroWo{h8BL3s
z3zHWGx?;>F5Y4vAa%N`Ch<!qu&nd*&Wur{T)SOsBhiS*Fm!?3GZJYy`aSmX{Ie;1G
z0A`#GEaN!nO&O<wak3>DPG{MGa;<jf{|N=!xaY_I{XGBLF$Tt(S;5&)juql%EJ{t`
zmim(?8cN$5+QW@aAY?sUnt~y?n)*?zhf7n&xdieXXEm(2Kw@-jxEKSA7J+@D;Q|M&
z0$>s|U&pmoY~74V9p=kw^d%3YaHwG8;;idbrQE%?CeUIvH@U8<B<!-2RIFV#m3mxO
zP|MaeXu4FLNUGvl#~=3&nbTL?K>Hk8v+3aspk;>++4M~h(27HsbK30h#J%ku{7+#c
zbena~29{kM45aMJg3j5JZJ?Kupi0e$X|^*}C5q^UX&suKKoq7^phh+1<z#;Ee|bru
QcWXePSOW9WAABM353iUVNdN!<

delta 1355
zcmZ8hT}TvB6z<-2XRfohGdnv=)8^{tnoy)7SmA>xy<`sw`BnsJDzTs|tt%E0fmYB{
z#)enzAtKU>gqGEYBt$W2eG8PNlt{84HH+;<QDeJ5<LuIXIp_PnGk5NH=bZWaIA?k=
z=f$McHXC~sed7$UxMD^{=J==?&&ef$Ba+<E+8hc-t`s-5HAdRP?P>vX6*we;Lw(&5
zy`*UIDS6e#HjBCWCUa)|YsP@a`IFkZe<GC<RcH1<KV46&ls{ubqF$=*L%Y3u5D}yG
z9<PnYYi1lUqv0v0eEhp-UMM9NM16cT#TQUD<n$_tu_G@tSediYWUhNJQ$M}7)cwfC
z)ws`B2bqCzK0j!m8OP1I#A96Y-|!u8mC%KbU`talbWzPgvKOIulTlIs2~{6b2uj4Z
z1bxU}AgAjTpg*yz<>ZA3O+1{5|EN4z;eXygCFpM<*@HgCP?wz`T0~KIS*KCf39`b?
ziR2eix2p~$dPQUblnJskfs_dxX`rDT;+So4KYe$F<m&w>fd`hs0g%8GB)~)xpVpuo
zZ!Uv;3zV#Ye2_3|S3pG;ya(~^U*HU0+X5aC!?tbm@CM#m26_0zHlaS^(iM_lrTH4Z
zyA5<B^c%dFvX+MD1zfWU`~uDN1zM*|q_N1+C}Z?&g3J2#&x<pn4ouG$pq?#2JzIc!
zwgB~P0`8fC-n3_pcvg7HNG40Wh}9l?_J12OI%!z#qmj?XigC;h-Tb`Y#&=|C0ZPu6
zhEP*SdvkHPInoepAzlP>uGwkQx;E381*kC#P-7OL#w<XMnSdK(pl>wg;x7g&|C+0F
zDJ*C(V57<5oup2KWsJFHCdQZs&)3qi!nuvmdzK{W;e1u4^bo8&$#6RPaHhp+Qw$JM
z{$Ko%Au3$NJ!F6SB4fA_mgUoF!;4)|tD#frzmuhUkgU40cd?~aD~uko6I!w8LX&=w
zO=y=zmowU^?1sIOQ*6kK$nCP5qJN1Z@^heV&y>OR$99kwAeTu?j*)uj4yaZ0h$E(8
S{|5B2qgI=VQNICidjA18o%+21

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 0cc694c923..7d4c5aae18 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -1248,7 +1248,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       border {
         width: 0.1
         color: 0xE9DD72
@@ -1259,7 +1259,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       border {
         width: 0.4
         color: 0xE9DD72
@@ -1270,7 +1270,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       border {
         width: 0.8
         color: 0xE9DD72
@@ -1281,7 +1281,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       border {
         width: 0.8
         color: 0xE9DD72
@@ -1292,7 +1292,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       border {
         width: 1.6
         color: 0xE9DD72
@@ -1310,7 +1310,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "doctor"
+      name: "pharmacy"
       priority: 1527
     }
     caption {
@@ -1645,7 +1645,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       border {
         width: 0.1
         color: 0xE9DD72
@@ -1656,7 +1656,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       border {
         width: 0.4
         color: 0xE9DD72
@@ -1667,7 +1667,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       border {
         width: 0.8
         color: 0xE9DD72
@@ -1678,7 +1678,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       border {
         width: 0.8
         color: 0xE9DD72
@@ -1689,7 +1689,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       border {
         width: 1.6
         color: 0xE9DD72
@@ -1769,7 +1769,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 0xFFFFC0
+      color: 0xF8F8D8
       border {
         width: 0.05
         color: 0xE9DD72
@@ -1780,7 +1780,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 0xFFFFC0
+      color: 0xF8F8D8
       border {
         width: 0.1
         color: 0xE9DD72
@@ -1791,7 +1791,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 0xFFFFC0
+      color: 0xF8F8D8
       border {
         width: 0.4
         color: 0xE9DD72
@@ -1802,7 +1802,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xFFFFC0
+      color: 0xF8F8D8
       border {
         width: 0.8
         color: 0xE9DD72
@@ -1813,7 +1813,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 0xFFFFC0
+      color: 0xF8F8D8
       border {
         width: 0.8
         color: 0xE9DD72
@@ -1828,7 +1828,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 0xFFFFC0
+      color: 0xF8F8D8
       border {
         width: 1.6
         color: 0xE9DD72
@@ -2299,35 +2299,35 @@ cont {
   element {
     scale: 13
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: -9538
     }
   }
   element {
     scale: 14
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: -9420
     }
   }
   element {
     scale: 15
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: -9220
     }
   }
   element {
     scale: 16
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: -8610
     }
   }
   element {
     scale: 17
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: -8332
     }
     symbol {
@@ -2538,7 +2538,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       border {
         width: 0.1
         color: 0xE9DD72
@@ -2549,7 +2549,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       border {
         width: 0.4
         color: 0xE9DD72
@@ -2560,7 +2560,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       border {
         width: 0.8
         color: 0xE9DD72
@@ -2571,7 +2571,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       border {
         width: 0.8
         color: 0xE9DD72
@@ -2582,7 +2582,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       border {
         width: 1.6
         color: 0xE9DD72
@@ -4405,14 +4405,14 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xe4e0d0
+      color: 0xdcd7bd
       priority: 364
     }
   }
   element {
     scale: 16
     area {
-      color: 0xded8c8
+      color: 0xd5ceb0
       priority: 679
     }
     symbol {
@@ -4420,11 +4420,22 @@ cont {
       apply_for_type: 1
       priority: 680
     }
+    caption {
+      primary {
+        height: 11
+        color: 0x808070
+      }
+      secondary {
+        height: 11
+        color: 0x808070
+      }
+      priority: 11832
+    }
   }
   element {
     scale: 17
     area {
-      color: 0xd4d0c0
+      color: 0xd5ceb0
       priority: 720
     }
     symbol {
@@ -8224,21 +8235,21 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xD0CCAC
+      color: 0xf8f0e8
       priority: 327
     }
   }
   element {
     scale: 16
     area {
-      color: 0xD0CCAC
+      color: 0xf8f0e8
       priority: 642
     }
   }
   element {
     scale: 17
     area {
-      color: 0xD0CCAC
+      color: 0xf8f0e8
       priority: 682
     }
   }
@@ -32685,56 +32696,56 @@ cont {
   element {
     scale: 6
     area {
-      color: 0xF8F8C8
+      color: 0xF8F8D8
       priority: 5
     }
   }
   element {
     scale: 7
     area {
-      color: 0xF8F8C8
+      color: 0xF8F8D8
       priority: 5
     }
   }
   element {
     scale: 8
     area {
-      color: 0xF8F8C8
+      color: 0xF8F8D8
       priority: 5
     }
   }
   element {
     scale: 9
     area {
-      color: 0xF8F8C8
+      color: 0xF8F8D8
       priority: 5
     }
   }
   element {
     scale: 10
     area {
-      color: 0xF8F8C8
+      color: 0xF8F8D8
       priority: 5
     }
   }
   element {
     scale: 11
     area {
-      color: 0xF8F8C8
+      color: 0xF8F8D8
       priority: 5
     }
   }
   element {
     scale: 12
     area {
-      color: 0xF8F8C8
+      color: 0xF8F8D8
       priority: -9573
     }
   }
   element {
     scale: 13
     area {
-      color: 0xF8F8C8
+      color: 0xF8F8D8
       border {
         width: 0.1
         color: 0xE4E4E4
@@ -32745,7 +32756,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 0xF8F8C8
+      color: 0xF8F8D8
       border {
         width: 0.4
         color: 0xE4E4E4
@@ -32756,7 +32767,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xF8F8C8
+      color: 0xF8F8D8
       border {
         width: 0.8
         color: 0xE4E4E4
@@ -32774,7 +32785,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 0xF8F8C8
+      color: 0xF8F8D8
       border {
         width: 0.8
         color: 0xE4E4E4
@@ -32792,7 +32803,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 0xF8F8C8
+      color: 0xF8F8D8
       border {
         width: 1.6
         color: 0xE4E4E4
@@ -33176,7 +33187,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 0xD8D8C4
+      color: 0xE0E0D0
       border {
         width: 0.2
         color: 0xE4E4E4
@@ -33187,17 +33198,13 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xD8D8C4
-      border {
-        width: 0.4
-        color: 0xE4E4E4
-      }
+      color: 0xE0E0D0
       priority: -9224
     }
     caption {
       primary {
         height: 12
-        color: 0x202020
+        color: 0x808070
       }
       priority: 10893
     }
@@ -33205,17 +33212,13 @@ cont {
   element {
     scale: 16
     area {
-      color: 0xD8D8C4
-      border {
-        width: 0.8
-        color: 0xE4E4E4
-      }
+      color: 0xE0E0D0
       priority: -8614
     }
     caption {
       primary {
-        height: 16
-        color: 0x202020
+        height: 12
+        color: 0x808070
       }
       priority: 11553
     }
@@ -33223,17 +33226,13 @@ cont {
   element {
     scale: 17
     area {
-      color: 0xD8D8C4
-      border {
-        width: 1.6
-        color: 0xE4E4E4
-      }
+      color: 0xE0E0D0
       priority: -8339
     }
     caption {
       primary {
-        height: 16
-        color: 0x202020
+        height: 14
+        color: 0x404040
       }
       priority: 11787
     }
@@ -34278,7 +34277,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xD6D6E4
+      color: 0xe1e1e5
       priority: -9222
     }
     caption {
@@ -34292,7 +34291,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 0xD6D6E4
+      color: 0xe1e1e5
       priority: -8612
     }
     caption {
@@ -34306,7 +34305,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 0xD6D6E4
+      color: 0xe1e1e5
       priority: -8337
     }
     caption {
@@ -36577,143 +36576,101 @@ cont {
   element {
     scale: 6
     area {
-      color: 0xf4f0e0
+      color: 0xede8d2
       priority: 1
     }
   }
   element {
     scale: 7
     area {
-      color: 0xf4f0e0
+      color: 0xede8d2
       priority: 1
     }
   }
   element {
     scale: 8
     area {
-      color: 0xf4f0e0
+      color: 0xede8d2
       priority: 1
     }
   }
   element {
     scale: 9
     area {
-      color: 0xf4f0e0
+      color: 0xede8d2
       priority: 1
     }
   }
   element {
     scale: 10
     area {
-      color: 0xf4f0e0
+      color: 0xede8d2
       priority: 1
     }
   }
   element {
     scale: 11
     area {
-      color: 0xf4f0e0
+      color: 0xede8d2
       priority: 1
     }
   }
   element {
     scale: 12
     area {
-      color: 0xf4f0e0
+      color: 0xede8d2
       priority: -9578
     }
   }
   element {
     scale: 13
     area {
-      color: 0xf4f0e0
+      color: 0xede8d2
       priority: -9548
     }
   }
   element {
     scale: 14
     area {
-      color: 0xf4f0e0
+      color: 0xede8d2
       priority: -9430
     }
   }
   element {
     scale: 15
     area {
-      color: 0xf4f0e0
+      color: 0xede8d2
       priority: -9231
     }
   }
   element {
     scale: 16
     area {
-      color: 0xf4f0e0
+      color: 0xede8d2
       priority: -8621
     }
   }
   element {
     scale: 17
     area {
-      color: 0xf4f0e0
+      color: 0xede8d2
       priority: -8346
     }
   }
 }
 cont {
   name: "landuse-retail"
-  element {
-    scale: 6
-    area {
-      color: 0xE8E4D4
-      priority: 3
-    }
-  }
-  element {
-    scale: 7
-    area {
-      color: 0xE8E4D4
-      priority: 3
-    }
-  }
-  element {
-    scale: 8
-    area {
-      color: 0xE8E4D4
-      priority: 3
-    }
-  }
-  element {
-    scale: 9
-    area {
-      color: 0xE8E4D4
-      priority: 3
-    }
-  }
-  element {
-    scale: 10
-    area {
-      color: 0xE8E4D4
-      priority: 3
-    }
-  }
-  element {
-    scale: 11
-    area {
-      color: 0xE8E4D4
-      priority: 3
-    }
-  }
   element {
     scale: 12
     area {
-      color: 0xE8E4D4
+      color: 0xF8ECEC
       priority: -9576
     }
   }
   element {
     scale: 13
     area {
-      color: 0xFFEBEB
+      color: 0xF8ECEC
       border {
         width: 0.1
         color: 0xE4E4E4
@@ -36724,7 +36681,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 0xFFEBEB
+      color: 0xF8ECEC
       border {
         width: 0.4
         color: 0xE4E4E4
@@ -36735,7 +36692,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xFFEBEB
+      color: 0xF8ECEC
       border {
         width: 0.8
         color: 0xE4E4E4
@@ -36753,7 +36710,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 0xFFEBEB
+      color: 0xF8ECEC
       border {
         width: 0.8
         color: 0xE4E4E4
@@ -36771,7 +36728,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 0xFFEBEB
+      color: 0xF8ECEC
       border {
         width: 1.6
         color: 0xE4E4E4
@@ -43478,7 +43435,7 @@ cont {
   element {
     scale: 12
     area {
-      color: 0xFFFFC0
+      color: 0xF8F8D8
       border {
         width: 0.05
         color: 0xFFFF90
@@ -43489,7 +43446,7 @@ cont {
   element {
     scale: 13
     area {
-      color: 0xFFFFC0
+      color: 0xF8F8D8
       border {
         width: 0.1
         color: 0xFFFF90
@@ -43500,7 +43457,7 @@ cont {
   element {
     scale: 14
     area {
-      color: 0xFFFFC0
+      color: 0xF8F8D8
       border {
         width: 0.2
         color: 0xFFFF90
@@ -43511,7 +43468,7 @@ cont {
   element {
     scale: 15
     area {
-      color: 0xFFFFC0
+      color: 0xF8F8D8
       border {
         width: 0.4
         color: 0xFFFF90
@@ -43522,7 +43479,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 0xFFFFC0
+      color: 0xF8F8D8
       border {
         width: 0.8
         color: 0xFFFF90
@@ -43533,7 +43490,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 0xFFFFC0
+      color: 0xF8F8D8
       border {
         width: 1.6
         color: 0xFFFF90
@@ -46377,7 +46334,7 @@ cont {
     scale: 13
     lines {
       width: 1.25
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: 439
     }
   }
@@ -46385,7 +46342,7 @@ cont {
     scale: 14
     lines {
       width: 2.5
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: 527
     }
   }
@@ -46393,7 +46350,7 @@ cont {
     scale: 15
     lines {
       width: 5
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: 692
     }
   }
@@ -46401,7 +46358,7 @@ cont {
     scale: 16
     lines {
       width: 10
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: 1183
     }
   }
@@ -46409,7 +46366,7 @@ cont {
     scale: 17
     lines {
       width: 20
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: 1336
     }
   }
@@ -54542,42 +54499,42 @@ cont {
   element {
     scale: 10
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: 38
     }
   }
   element {
     scale: 11
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: 38
     }
   }
   element {
     scale: 12
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: -9562
     }
   }
   element {
     scale: 13
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: 55
     }
   }
   element {
     scale: 14
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: 78
     }
   }
   element {
     scale: 15
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: 78
     }
     caption {
@@ -54592,7 +54549,7 @@ cont {
   element {
     scale: 16
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: 80
     }
     caption {
@@ -54607,7 +54564,7 @@ cont {
   element {
     scale: 17
     area {
-      color: 0xE8D8D4
+      color: 0xF0E0DC
       priority: 81
     }
     caption {
diff --git a/indexer/classificator_loader.cpp b/indexer/classificator_loader.cpp
index ba23a21e8e..27f65bb984 100644
--- a/indexer/classificator_loader.cpp
+++ b/indexer/classificator_loader.cpp
@@ -68,12 +68,11 @@ namespace classificator
 
 #if defined(OMIM_PRODUCTION) || defined(USE_BINARY_STYLES)
     // Load from proto buffer binary file.
-    ModelReaderPtr reader(p.GetReader(DRAWING_RULES_BIN_FILE));
-
     string buffer;
-    reader.ReadAsString(buffer);
+    ModelReaderPtr(p.GetReader(DRAWING_RULES_BIN_FILE)).ReadAsString(buffer);
 
-    rules.LoadFromBinaryProto(buffer);
+    istream s(&buffer);
+    rules.LoadFromBinaryProto(s);
 #else
     // Load from proto buffer text file.
     string buffer;