From a9558def540f4fe1adf5896e4d56d1e6c2d0754d Mon Sep 17 00:00:00 2001
From: Darafei Praliaskouski <komzpa@mapswith.me>
Date: Tue, 4 Jun 2013 15:52:48 +0300
Subject: [PATCH] [style] labels for shops

---
 data/drules_proto.bin |  Bin 177631 -> 179918 bytes
 data/drules_proto.txt | 1068 +++++++++++++++++++++++++++++++++++++++--
 data/normal.mapcss    |    4 +-
 3 files changed, 1019 insertions(+), 53 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 6f7c9ba364f6d8902d853d6e3ad3b4fe35247d41..4c9bde0aaed3031385eeec89aa54e385c017cb9e 100644
GIT binary patch
delta 919
zcmZWoO=}ZD7-j}_(>EW@S6jEHNL!<gP@(>U7VkX>7F0BBwr{d)HalT<Yw5`vQ(F{2
zV34_r=s^#q2f>qw7muF23tm0w9}t|~e09>>ydONzGtV>g^EZ6|2fJPJkp`XY3j(RY
zVeMthvzfy@@u$?GFNyrtq34qq61jyWoT*t&6uYH!^7VCMoElW(L3vorPQz`;#5gs)
zkKAftke^B9#C&>Mu65{D`i@BR5iN_qrH7ek1faLeSTl$iM>1+#q3s}#nv*vm5wF=6
z*TLQrx!9$bvP(+eB!HS%IkqiVe4U#W>r2Lj-Z{Fccg!N(?B7~(wcH@o;a?H?q)X>B
zWd)xC!}eI{U?5g9rZ}21j@N3XaC~JgZ5D4qx~H18+FK#&(#<O5`%}M;cIYx6`HoKi
zp2%NaT8XTpheWRL(JS%!1Cd|$=;i2K6a=y{4tffOGvBqxjI4W%tD8ke4oMpp-$cJ^
zqaSkANV6L-5#u%7y6(ozojy~8Bl-=_?6E6RrT52UTFF(EU0FyvmdiIe1_4HKsBZpb
zSA5PJpe>qHFfh(hDz~jMfrUY0_i!7%am$_(xw=p1Qj1Cg!0D#Tf@YMLT-_kXs8sX9
zXs*JdZ-{)pPZuIj&)$VxY(b0FTo0>lM`fd#G>n$DL)UgKUz?7ewL($PCHhFpnrjEW
SD2EP*Y)AhapAHY`%JP3y`xwUn

delta 954
zcmb7C%Sr<=6vc>kxGn8;QnC0zEJ&$PK@r>vZbcNttxRLeOlLGDnJ!!i#fn;xQde2%
z7q}Ay@gKxr@B{n+SAv-V!Re$}cgf-A<etad7rcK!`(o?~iF3RQ8R4*I)%FQ<m~Rz~
zynO5<JYF!Y=rCO{aLI(UXf-K6wz)@xV*3pCWU7M})^kR_l!nQg?NNTJa4Tn6g8+^J
zP?w(_w50e4J}T=!+5w0btTE<^<a!nTs~=glRzMuelkbMeqOy32%9~ip$^j6YA9C8X
zT^>rqN}2}52@nqC%oSSPFcnJ%Qp9J0Lq$koDvCh_#}Q~qc8w}Ye}-(#<ZKtMj6Cki
z*DhL4j#u?Q?t>Y*Pkl-P&Q4tN{|xFr<E{us&Y&S*Zct@Q6(sDPquf8@R0tY{plYc_
zqmIUBVO!4i(EMsv5dlniE)!lDLRL}4@A&r}h<xawQqrP73aWgf8gquk){u97UCLA1
L9G>rQ(OUHz>#+!B

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 49b3982f0b..f76d94082c 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -51622,21 +51622,48 @@ cont {
     scale: 17
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -51653,21 +51680,87 @@ cont {
     scale: 17
     symbol {
       name: "bakery"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "bakery"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "bakery"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+}
+cont {
+  name: "shop-beverages"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -51684,21 +51777,48 @@ cont {
     scale: 17
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -51708,21 +51828,48 @@ cont {
     scale: 17
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -51732,21 +51879,87 @@ cont {
     scale: 17
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+}
+cont {
+  name: "shop-car"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -51763,21 +51976,87 @@ cont {
     scale: 17
     symbol {
       name: "car_repair"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "car_repair"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "car_repair"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+}
+cont {
+  name: "shop-chemist"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -51794,21 +52073,126 @@ cont {
     scale: 17
     symbol {
       name: "clothes"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "clothes"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "clothes"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+}
+cont {
+  name: "shop-computer"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+}
+cont {
+  name: "shop-confectionery"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -51825,21 +52209,48 @@ cont {
     scale: 17
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -51856,21 +52267,48 @@ cont {
     scale: 17
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -51887,21 +52325,48 @@ cont {
     scale: 17
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -51911,21 +52376,48 @@ cont {
     scale: 17
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -51935,21 +52427,165 @@ cont {
     scale: 17
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+}
+cont {
+  name: "shop-garden_centre"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+}
+cont {
+  name: "shop-gift"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+}
+cont {
+  name: "shop-greengrocer"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -51966,21 +52602,126 @@ cont {
     scale: 17
     symbol {
       name: "hairdresser"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "hairdresser"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "hairdresser"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+}
+cont {
+  name: "shop-hardware"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+}
+cont {
+  name: "shop-jewelry"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -51997,21 +52738,48 @@ cont {
     scale: 17
     symbol {
       name: "kiosk"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "kiosk"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "kiosk"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -52028,21 +52796,126 @@ cont {
     scale: 17
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+}
+cont {
+  name: "shop-mobile_phone"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+}
+cont {
+  name: "shop-optician"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -52052,21 +52925,48 @@ cont {
     scale: 17
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
@@ -52083,21 +52983,87 @@ cont {
     scale: 17
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 18
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
   element {
     scale: 19
     symbol {
       name: "supermarket"
-      priority: 16000
+      priority: 16005
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+}
+cont {
+  name: "shop-toys"
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
+    }
+  }
+  element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 0x444444
+        stroke_color: 0xFFFFFF
+        offset_y: 10
+      }
+      priority: 15005
     }
   }
 }
diff --git a/data/normal.mapcss b/data/normal.mapcss
index fa18cf0ac8..88190ac3bc 100644
--- a/data/normal.mapcss
+++ b/data/normal.mapcss
@@ -3992,7 +3992,7 @@ area|z17-[historic=memorial],
 area|z17-[historic=monument],
 area|z17-[historic=museum],
 area|z17-[historic=ruins],
-area|z17-[shop?],
+area|z17-[shop][shop!=no],
 area|z17-[tourism=camp_site],
 area|z17-[tourism=guest_house],
 area|z17-[tourism=hostel],
@@ -4041,7 +4041,7 @@ node|z17-[historic=memorial],
 node|z17-[historic=monument],
 node|z17-[historic=museum],
 node|z17-[historic=ruins],
-node|z17-[shop?],
+node|z17-[shop][shop!=no],
 node|z17-[tourism=camp_site],
 node|z17-[tourism=guest_house],
 node|z17-[tourism=hostel],