From cdb6162412a29da286f3a8992eb9f47cf697961b Mon Sep 17 00:00:00 2001
From: Constantin Shalnev <c.shalnev@corp.mail.ru>
Date: Thu, 24 Sep 2015 11:32:36 +0300
Subject: [PATCH] Styles were rebuilt 20150924

---
 data/drules_proto.bin       | Bin 201097 -> 201238 bytes
 data/drules_proto.txt       |  42 +++
 data/drules_proto_clear.bin | Bin 106016 -> 107671 bytes
 data/drules_proto_clear.txt | 601 +++++++++++++++++++++++++++++++++++-
 data/drules_proto_dark.bin  | Bin 104461 -> 106116 bytes
 data/drules_proto_dark.txt  | 601 +++++++++++++++++++++++++++++++++++-
 data/visibility.txt         |   2 +-
 7 files changed, 1239 insertions(+), 7 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index a6cda9f88e99de873714a2846103d76734e8e2ef..e944e8488f7150f83e044d8602435c20116412a9 100644
GIT binary patch
delta 51
zcmV-30L=f1qYRd$46va{1cV0)ACn+o7?Zt72$R`HD3h#5Wdmyn3X@z&Eraz)hxJGS
JxAjN@l*sP)6dC{k

delta 33
pcmbQXgr{>c&xVB_Oy5~28w5*D-s{299OT&^<jJ@_$dl>F2>{`L4F>=K

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 19b770d0ff..0df60d2ca8 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -6305,6 +6305,48 @@ cont {
 }
 cont {
   name: "boundary-administrative-4-state"
+  element {
+    scale: 4
+    lines {
+      width: 0.75
+      color: 13421772
+      dashdot {
+        dd: 2.0
+        dd: 2.0
+      }
+      priority: 1345
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 5
+    lines {
+      width: 0.75
+      color: 13421772
+      dashdot {
+        dd: 2.0
+        dd: 2.0
+      }
+      priority: 1345
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
+  element {
+    scale: 6
+    lines {
+      width: 0.75
+      color: 12303291
+      dashdot {
+        dd: 2.0
+        dd: 2.0
+      }
+      priority: 1345
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
   element {
     scale: 10
     lines {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index a75f2ecaa3eb814329d02b7ae8450bd9305480d3..a122920a0d58ecd72dd07926a85a7c8f80050bb0 100644
GIT binary patch
delta 1372
zcmai!zi$&U6vu0UqQq?=gcg)Se<Hy^1K~$S7t$(!1zT{OcXuXt_Q~f<bQ4n3g%L&Q
z1WTEjSfC)$0XD>c!5@Ic#027c*SZq6f+tJ<y!XETzGuJwR7$^=-oAU-dXI3;W3D$M
zNs}hjhip?{ELZE7Dz9E1t&iKaH_!j<pIQAj*P7XynFQ@;4-OH&{BKaRCt2Tx|HY!u
zlV9z%#?<`iaI(L>G@TiDb`Cl_=xJx+20j~kBCM~JFRstx($T&dOn&~JM~~7kyJ$20
zv4={yLVPMb;TK0&Z{gV-?2!S;#Ed-!fW*oItlYupiVQFWNnD7`BulsPT*0v1T9dfa
z#JC`Y7);F&E9!wXGc<1Ea-M+_%jxP}eE#ILD<LGz0%@69g@8rMEOJWtLV32UF1K*C
zC?tX~RyL*AHgWwJ;SNy61h-nhb`RH1xFK)`oPsIo`W9ZuseX1VsRH1t8z~_z==yzp
zp+E&wiHKzczGG(8b-~ZnNx>PN))B`S(rT8T3@4VHsn{k-d*Kq<2i~Qbd>gm8fh)Om
zmpPWcXvwYw;I0(ZX1u1nto?lnQDmcZ2fa+vh}hKVF?a$a@NLgV&+~wZXkdDbUZl%o
zG^`qLRre?mJ?29<^s?zN<F!Z;Dn=RMCZZ)|zS$;Kzw9U!Qdv5TcGC}I^!WJOC`?U?
SZ$r03iNq3l(B4De8-D@x5yANY

delta 148
zcmbP!l5N2rwhdctMP@N_31noZXOt&a>Lynv=cED|lQZo*85d5@x09WmW8cQObh5s^
zB8VlukdaFqU9oOSX<lAxPP3-Nc1;IH4rj)w>Cw%MrpziF!qan`8I_p0rcYne!B{rE
ip@)%u`o9iFX(q0g>C9b>31B4-U5rZGw{$T+mIMHU1Tww=

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 3ca0d2da5a..47a3a45bff 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -5148,6 +5148,16 @@ cont {
 }
 cont {
   name: "highway-cycleway"
+  element {
+    scale: 13
+    lines {
+      width: 0.1
+      color: 872384682
+      priority: 1611
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
   element {
     scale: 15
     lines {
@@ -5201,6 +5211,16 @@ cont {
 }
 cont {
   name: "highway-cycleway-bridge"
+  element {
+    scale: 13
+    lines {
+      width: 0.1
+      color: 872384682
+      priority: 1611
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
   element {
     scale: 15
     lines {
@@ -5254,6 +5274,16 @@ cont {
 }
 cont {
   name: "highway-cycleway-permissive"
+  element {
+    scale: 13
+    lines {
+      width: 0.1
+      color: 872384682
+      priority: 1611
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
   element {
     scale: 15
     lines {
@@ -5307,6 +5337,16 @@ cont {
 }
 cont {
   name: "highway-cycleway-tunnel"
+  element {
+    scale: 13
+    lines {
+      width: 0.1
+      color: 872384682
+      priority: 1611
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
   element {
     scale: 15
     lines {
@@ -33578,6 +33618,24 @@ cont {
     }
   }
 }
+cont {
+  name: "shop"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "shop-alcohol"
   element {
@@ -33600,7 +33658,456 @@ cont {
     scale: 19
     symbol {
       name: "alcohol-m"
-      apply_for_type: 1
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-bakery"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-beauty"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-beverages"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-bicycle"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-books"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-butcher"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-car"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-car_repair"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-chemist"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-clothes"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-computer"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-confectionery"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-convenience"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-department_store"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-doityourself"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-electronics"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-florist"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-furniture"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-garden_centre"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-gift"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-greengrocer"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-hairdresser"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-hardware"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-jewelry"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-kiosk"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
       priority: 16000
     }
     caption {
@@ -33667,7 +34174,78 @@ cont {
     scale: 19
     symbol {
       name: "shop-m"
-      apply_for_type: 1
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-mobile_phone"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-optician"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-shoes"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-sports"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
       priority: 16000
     }
     caption {
@@ -33718,7 +34296,24 @@ cont {
     scale: 19
     symbol {
       name: "grocery-m"
-      apply_for_type: 1
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-toys"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
       priority: 16000
     }
     caption {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 37005e96afd7e100345197ba235b1fdcb11edd79..853f6333c1537ec64c997d200a1211a98c7be645 100644
GIT binary patch
delta 1295
zcmai!PjAyO7{+G-)#`4gbfRp){tAf$+ZcZ)?b7xGzz5(~GWSj5HMJwh>6F8U1RUVN
zDMHcUGk`WBF>&aj7cN}*CVU0lgnAOTx}2iCzt`{M=dttQwDfjZI{nf_-_x(n#?pMf
zQT}u?etxuT-`<^kzOwdfZf9n1CLJ~3qhb22wR{OPO8>OhFJXph)}FG?o3r-$SsSgi
z7VhJ#k<Y{W>g>Ws1((L}S?wBXpcmQiBeYxHP~WS#>;#1SJjhG8w{d06ZS6Zf5Q))x
zQ3ofMW_|e)t`_|;0O5EL8B5%Gi02A~l7s|c083jK7XatIY5lPzJ_w`#)&o47_Y=n~
zt~|!qC&i9{(4i)y6{_X?G?K=I3n1Xqx9sum4xTTj@O~Iei^%m|T>nQf7l@>s+5BF8
zf@>3O0E_}7reXK?@XZ|Rs{IJr2PQj_<iaG^p5hw?$*D|uEFuV8V|#ii1WK9UjFKra
zxB(Y7lk`z=W5KA5EpoI8o+G-zIz%bAV2hi$oU8VzYlflKdIErXf)k6~8uC@(T>(*K
zfpluVl5^--l<43O;1B}K{m^H(M|spUoJAkA&0{pE{C^{LE`7dF1L%alIu1s+*2hCh
w33Zr3=<&)f%dynAHww9sW~S(M_VXCMoctIHFO&Sopfiv>F&odHze1zMzlFnGMF0Q*

delta 115
zcmZqK%htPrZNpky##xis*@{h0v2SBsI62);7R*{YS>0X{D)!o5wpqntyNUy&v>jvA
z^vpU&Q)U$o;px?Nj7m&g)2DB0W-Obm@P&<)tvDmUVDiUb;!IpE(*;`@6Tr&+S{aqL
KA8KVhBmn?q11HV^

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index ff38bf09d2..ccf63bb751 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -5148,6 +5148,16 @@ cont {
 }
 cont {
   name: "highway-cycleway"
+  element {
+    scale: 13
+    lines {
+      width: 0.1
+      color: 862340147
+      priority: 1611
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
   element {
     scale: 15
     lines {
@@ -5201,6 +5211,16 @@ cont {
 }
 cont {
   name: "highway-cycleway-bridge"
+  element {
+    scale: 13
+    lines {
+      width: 0.1
+      color: 862340147
+      priority: 1611
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
   element {
     scale: 15
     lines {
@@ -5254,6 +5274,16 @@ cont {
 }
 cont {
   name: "highway-cycleway-permissive"
+  element {
+    scale: 13
+    lines {
+      width: 0.1
+      color: 862340147
+      priority: 1611
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
   element {
     scale: 15
     lines {
@@ -5307,6 +5337,16 @@ cont {
 }
 cont {
   name: "highway-cycleway-tunnel"
+  element {
+    scale: 13
+    lines {
+      width: 0.1
+      color: 862340147
+      priority: 1611
+      join: ROUNDJOIN
+      cap: ROUNDCAP
+    }
+  }
   element {
     scale: 15
     lines {
@@ -33578,6 +33618,24 @@ cont {
     }
   }
 }
+cont {
+  name: "shop"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "shop-alcohol"
   element {
@@ -33600,7 +33658,456 @@ cont {
     scale: 19
     symbol {
       name: "alcohol-m"
-      apply_for_type: 1
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-bakery"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-beauty"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-beverages"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-bicycle"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-books"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-butcher"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-car"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-car_repair"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-chemist"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-clothes"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-computer"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-confectionery"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-convenience"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-department_store"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-doityourself"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-electronics"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-florist"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-furniture"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-garden_centre"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-gift"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-greengrocer"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-hairdresser"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-hardware"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-jewelry"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-kiosk"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
       priority: 16000
     }
     caption {
@@ -33667,7 +34174,78 @@ cont {
     scale: 19
     symbol {
       name: "shop-m"
-      apply_for_type: 1
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-mobile_phone"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-optician"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-shoes"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-sports"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
       priority: 16000
     }
     caption {
@@ -33718,7 +34296,24 @@ cont {
     scale: 19
     symbol {
       name: "grocery-m"
-      apply_for_type: 1
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15000
+    }
+  }
+}
+cont {
+  name: "shop-toys"
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
       priority: 16000
     }
     caption {
diff --git a/data/visibility.txt b/data/visibility.txt
index c30ab87c3a..e1c99f36ad 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -126,7 +126,7 @@ world  00000000000000000000  +
             2  01111111111111111111  -
             3  00001110000000000000  -
             4  00001110001100000000  +
-                state  00000000001111111111  -
+                state  00001110001111111111  -
                 {}
             5  00000000000000111111  -
             6  00000000000000111111  -