Generated Stylebeta-681

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 f841bea7b6..048858c713 100644
--- a/data/drules_proto.bin
+++ b/data/drules_proto.bin
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
     }
   }
 }
@@ -58335,6 +58335,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 {
     scale: 16
@@ -60374,6 +60441,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 {
     scale: 16
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index f45f65ca08..6d694a47fc 100644
--- a/data/drules_proto_clear.bin
+++ b/data/drules_proto_clear.bin
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
     }
   }
 }
@@ -57794,6 +57794,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 {
     scale: 16
@@ -59769,6 +59836,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 {
     scale: 16
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 55c29217e8..57507b45d2 100644
--- a/data/drules_proto_dark.bin
+++ b/data/drules_proto_dark.bin
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
     }
   }
 }
@@ -57794,6 +57794,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 {
     scale: 16
@@ -59769,6 +59836,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 {
     scale: 16
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 30eb228043..444033cad1 100644
--- a/data/drules_proto_vehicle_clear.bin
+++ b/data/drules_proto_vehicle_clear.bin
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
@@ -40146,6 +40146,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 {
     scale: 16
@@ -41321,6 +41356,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 {
     scale: 16
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index b7d0fa5480..bac9089f69 100644
--- a/data/drules_proto_vehicle_dark.bin
+++ b/data/drules_proto_vehicle_dark.bin
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
@@ -40146,6 +40146,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 {
     scale: 16
@@ -41321,6 +41356,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 {
     scale: 16
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  -