From 98b0faba186fa43082722aa6a7b16c98a3b95ec9 Mon Sep 17 00:00:00 2001
From: itomko <igor.n.tomko@gmail.com>
Date: Mon, 13 Mar 2017 17:08:40 +0300
Subject: [PATCH] Generated Style

---
 data/classificator.txt              |   2 +
 data/drules_proto.bin               | Bin 199119 -> 199436 bytes
 data/drules_proto.txt               | 182 ++++++++++++++++++++++++----
 data/drules_proto_clear.bin         | Bin 197549 -> 197866 bytes
 data/drules_proto_clear.txt         | 182 ++++++++++++++++++++++++----
 data/drules_proto_dark.bin          | Bin 196217 -> 196534 bytes
 data/drules_proto_dark.txt          | 182 ++++++++++++++++++++++++----
 data/drules_proto_vehicle_clear.bin | Bin 135830 -> 136009 bytes
 data/drules_proto_vehicle_clear.txt |  70 +++++++++++
 data/drules_proto_vehicle_dark.bin  | Bin 134193 -> 134372 bytes
 data/drules_proto_vehicle_dark.txt  |  70 +++++++++++
 data/types.txt                      |   2 +
 data/visibility.txt                 |   2 +
 13 files changed, 620 insertions(+), 72 deletions(-)

diff --git a/data/classificator.txt b/data/classificator.txt
index 450fb15fee..cc3aab476a 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -773,6 +773,7 @@ world  +
             {}
         chemist  -
         clothes  -
+        coffee  -
         computer  -
         confectionery  -
         convenience  -
@@ -802,6 +803,7 @@ world  +
         shoes  -
         sports  -
         supermarket  -
+        tea  -
         ticket  -
         toys  -
         travel_agency  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index f841bea7b60b35e5ca6950d708eb1f343a87bd47..048858c713aaace71e79d28582a787b77fe122ed 100644
GIT binary patch
delta 422
zcmX><nWtwOPs0|*qEz22&5Q~XT6|ob99#lNIwmq{a7nzW7E<F7P!i(e%FWL!%}vcK
z(an_rspG*=r@|qqB!Eyiz3wfOIKK*q5H>+!bV0G{ifN3R^%y3zL0rIx;(}sK7eLkV
zqo{+plms8ip?RG$FSUE7Gj8`xXWA9WH<yu%yEr4iKsPx*EiH9=;Vve%>2c?oa;Ed_
lX5!w?x0C6R2+u4=E)KAolGMcMg`1gF!78?2ILq|k8UPJTdt?9r

delta 475
zcmeB~#&do$Ps0|*qSX4=O^gZ>T6|ob99#lNIwmq{a7i>*3#oAkC<$?K<>u#==BDPA
z=;lg*)bU`bQ{fO)5<pUy15$@Yl@Kmf`bd_la0ug423Iv*A&pTB>}V9nut6NnhvMjB
zOh-f2@uR4Nc#ecXs7DJeibDbJy=oz10-@a_opHNII@9jJ>1%c~ac^I@lj)GicHZ+$
G|E&T0Yks8w

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 716eecab86..f1164a8218 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -30502,7 +30502,7 @@ cont {
     scale: 15
     symbol {
       name: "monument-m"
-      priority: 16747
+      priority: 16852
       min_distance: 24
     }
     caption {
@@ -30511,14 +30511,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 16
     symbol {
       name: "monument-m"
-      priority: 16747
+      priority: 16852
       min_distance: 12
     }
     caption {
@@ -30527,14 +30527,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 17
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30542,14 +30542,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 18
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30557,14 +30557,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 19
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30572,7 +30572,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
 }
@@ -30582,7 +30582,7 @@ cont {
     scale: 13
     symbol {
       name: "monument-s"
-      priority: 16747
+      priority: 16852
       min_distance: 12
     }
     caption {
@@ -30591,14 +30591,14 @@ cont {
         color: 4473924
         offset_y: 6
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 14
     symbol {
       name: "monument-s"
-      priority: 16747
+      priority: 16852
       min_distance: 12
     }
     caption {
@@ -30607,14 +30607,14 @@ cont {
         color: 4473924
         offset_y: 6
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 15
     symbol {
       name: "monument-m"
-      priority: 16747
+      priority: 16852
       min_distance: 24
     }
     caption {
@@ -30623,14 +30623,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 16
     symbol {
       name: "monument-m"
-      priority: 16747
+      priority: 16852
       min_distance: 12
     }
     caption {
@@ -30639,14 +30639,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 17
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30654,14 +30654,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 18
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30669,14 +30669,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 19
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30684,7 +30684,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
 }
@@ -58334,6 +58334,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-coffee"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+}
 cont {
   name: "shop-computer"
   element {
@@ -60373,6 +60440,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-tea"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+}
 cont {
   name: "shop-ticket"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index f45f65ca08b5f283a6e1bb2c89cb9dda6b943d92..6d694a47fcb317ed8f951e1bb9e4f1b39c97c227 100644
GIT binary patch
delta 483
zcmZ46&hx61r(p|YLeliZ&zQvO)i?x{gt)kJ^Ycn`Q}ar6b0w}cGb-?C@o{l-a0wjg
zn8>8TCGn<ONQFaCNdQS*4oDpqRYF9m5{9XoE}O#0E`({+biQOpEnf_$uz{SS#=(c;
z<YG)GL)GyktDAn{8I$B-^>4db3gdRO6sFgHd~+GOxQjFL3v`q7)6!C>8}4FKoBrkm
tQ_gg)txVk8bv82@iSW!~<l+FUDM?M7zHm2_&UF5jOsU)Bjx+h&007&Xhc^HK

delta 447
zcmaFW$+Nbdr(p|YLQ?(fCPoDbEj}(z4laQs9TS-}xFnjZh156%l!Umra`W>_b5rw5
zbaN#@>Uc2Jsc;A?2_UJ<0ja~HN(h%KPPnDh1yUGAgfO*F=SybP0y`7MdNznN`B0o$
zjOk3MI(`&&5bu!S?MSrnq1fL9z1?n>!noZmh3U25^ix}zxVN9#%w#08ef9|^e;WWZ
C5_QD@

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 617dad82db..b5bf89c33b 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -30210,7 +30210,7 @@ cont {
     scale: 15
     symbol {
       name: "monument-m"
-      priority: 16747
+      priority: 16852
       min_distance: 24
     }
     caption {
@@ -30219,14 +30219,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 16
     symbol {
       name: "monument-m"
-      priority: 16747
+      priority: 16852
       min_distance: 12
     }
     caption {
@@ -30235,14 +30235,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 17
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30250,14 +30250,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 18
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30265,14 +30265,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 19
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30280,7 +30280,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
 }
@@ -30290,7 +30290,7 @@ cont {
     scale: 13
     symbol {
       name: "monument-s"
-      priority: 16747
+      priority: 16852
       min_distance: 12
     }
     caption {
@@ -30299,14 +30299,14 @@ cont {
         color: 4473924
         offset_y: 6
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 14
     symbol {
       name: "monument-s"
-      priority: 16747
+      priority: 16852
       min_distance: 12
     }
     caption {
@@ -30315,14 +30315,14 @@ cont {
         color: 4473924
         offset_y: 6
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 15
     symbol {
       name: "monument-m"
-      priority: 16747
+      priority: 16852
       min_distance: 24
     }
     caption {
@@ -30331,14 +30331,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 16
     symbol {
       name: "monument-m"
-      priority: 16747
+      priority: 16852
       min_distance: 12
     }
     caption {
@@ -30347,14 +30347,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 17
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30362,14 +30362,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 18
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30377,14 +30377,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 19
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30392,7 +30392,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
 }
@@ -57793,6 +57793,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-coffee"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+}
 cont {
   name: "shop-computer"
   element {
@@ -59768,6 +59835,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-tea"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+}
 cont {
   name: "shop-ticket"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 55c29217e88f8e0c7e942c503ffdbc908bd94c22..57507b45d23f4aa10c751d894442cf0888da3b33 100644
GIT binary patch
delta 398
zcmezQhkM(9?uIRl#mTx?ni&-&wD`C<Ik*I_uDZ&k!6osgT1bsUKuL&;D>px{G&eP`
zL^oFgq>g7g<0B?vUO^=Rgw*tjkC?>yRXBvO2@0bNicMEaVbrV#8-{Et8^lsR6ibUC
zmSR!IkD?CZIHEnF#W$V#5tATA-e~tqW!&zS$`s?tKbMh<yEr4iKsPx*EiE;5I^%LC
p)#<%Um~y7C-@wGZed9VNBN3iij9eUGMJ1_;2o>8OA7Ywj4FIm~c#{AC

delta 475
zcmdn?pZn(@?uIRl#mV)rn-~=&wD`C<Ik*I_uDZ&k!6ngLEu_XFpd`e_m7AYenwy$e
zqMIuLQpba#PK85INdQS*4oDpqRYJH_=_6UH!Xb=H8C=zL#S}&@u%l5N!v=9QABv-k
zF&zz6$B&{8;yDrmp&l)?C=La<_o{`6350gfRL1R|sZ6n+)BQIxac>V?&txRBUEv7R
GG;07uWrH*T

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 5fdf4bffad..db1643c12d 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -30210,7 +30210,7 @@ cont {
     scale: 15
     symbol {
       name: "monument-m"
-      priority: 16747
+      priority: 16852
       min_distance: 24
     }
     caption {
@@ -30219,14 +30219,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 16
     symbol {
       name: "monument-m"
-      priority: 16747
+      priority: 16852
       min_distance: 12
     }
     caption {
@@ -30235,14 +30235,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 17
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30250,14 +30250,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 18
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30265,14 +30265,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 19
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30280,7 +30280,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
 }
@@ -30290,7 +30290,7 @@ cont {
     scale: 13
     symbol {
       name: "monument-s"
-      priority: 16747
+      priority: 16852
       min_distance: 12
     }
     caption {
@@ -30299,14 +30299,14 @@ cont {
         color: 5592405
         offset_y: 6
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 14
     symbol {
       name: "monument-s"
-      priority: 16747
+      priority: 16852
       min_distance: 12
     }
     caption {
@@ -30315,14 +30315,14 @@ cont {
         color: 5592405
         offset_y: 6
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 15
     symbol {
       name: "monument-m"
-      priority: 16747
+      priority: 16852
       min_distance: 24
     }
     caption {
@@ -30331,14 +30331,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 16
     symbol {
       name: "monument-m"
-      priority: 16747
+      priority: 16852
       min_distance: 12
     }
     caption {
@@ -30347,14 +30347,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 17
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30362,14 +30362,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 18
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30377,14 +30377,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
   element {
     scale: 19
     symbol {
       name: "monument-l"
-      priority: 16747
+      priority: 16852
     }
     caption {
       primary {
@@ -30392,7 +30392,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15747
+      priority: 15852
     }
   }
 }
@@ -57793,6 +57793,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-coffee"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+}
 cont {
   name: "shop-computer"
   element {
@@ -59768,6 +59835,73 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-tea"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16621
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15621
+    }
+  }
+}
 cont {
   name: "shop-ticket"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 30eb2280437d85ce082a227eac1a13aed8d2dd94..444033cad1051c6e2bac781a3becb14a78b802cc 100644
GIT binary patch
delta 66
zcmbQXl;h+wj)pCaE-$9veZ<JYnw+1OmO5SV4Wr-m3m+Icw)?zb{LjrD#>G*bkzb%&
UlA1XE;!8$fu-fgxUl^U`0JFmzt^fc4

delta 23
fcmX@PjAPnTj)pCaE-$vvf5FJkv;E%}MsGO)gS`rY

diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 60b6908ecf..4d438c869e 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -40145,6 +40145,41 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-coffee"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+}
 cont {
   name: "shop-computer"
   element {
@@ -41320,6 +41355,41 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-tea"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+}
 cont {
   name: "shop-ticket"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index b7d0fa5480144dcccc040168f1af375e3bb43265..bac9089f697cdf8e80e86ef2464ef7f63f1c78de 100644
GIT binary patch
delta 67
zcmdlugX76ej)pCa*B?zUxXZ}FmYkoKmYO>K<2^>->A5c$Ikw+_#Q2|^JB*8?I3vG6
Sw<I+YA_r2u{n<N4Z&?5XJ{@%c

delta 28
mcmV+%0OSAUnFz6%2!ON!*W#DH>j4P2I^zNV3%8N)0aG2%@(q;$

diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index b403f921f5..713e110f61 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -40145,6 +40145,41 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-coffee"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+}
 cont {
   name: "shop-computer"
   element {
@@ -41320,6 +41355,41 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-tea"
+  element {
+    scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 16000
+      min_distance: 20
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-l"
+      priority: 16000
+      min_distance: 27
+    }
+  }
+}
 cont {
   name: "shop-ticket"
   element {
diff --git a/data/types.txt b/data/types.txt
index bc79430407..52bed12fd5 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1151,3 +1151,5 @@ hwtag|yescar
 hwtag|nocar
 tourism|gallery
 historic|fort
+shop|coffee
+shop|tea
diff --git a/data/visibility.txt b/data/visibility.txt
index 8babd4335c..60d7e3feb4 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -773,6 +773,7 @@ world  00000000000000000000  +
             {}
         chemist  00000000000000001111  -
         clothes  00000000000000001111  -
+        coffee  00000000000000001111  -
         computer  00000000000000001111  -
         confectionery  00000000000000001111  -
         convenience  00000000000000001111  -
@@ -802,6 +803,7 @@ world  00000000000000000000  +
         shoes  00000000000000001111  -
         sports  00000000000000001111  -
         supermarket  00000000000000111111  -
+        tea  00000000000000001111  -
         ticket  00000000000000001111  -
         toys  00000000000000001111  -
         travel_agency  00000000000000001111  -