[styles] Add coffee and tea shop to the 7.2 releasebeta-723

12 files changed, 546 insertions, 0 deletions

diff --git a/data/classificator.txt b/data/classificator.txt
index e65ef5cefd..5b3ca69978 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..926e4f2a46 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..79ca458dd2 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -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..490c1bf195 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..704f7373f0 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -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..b8c8f091e5 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..65f015f1b5 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -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/visibility.txt b/data/visibility.txt
index c27b093124..0c90e55231 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  -