[classificator] Added new shop-* types.

9 files changed, 268 insertions, 25 deletions

diff --git a/data/categories.txt b/data/categories.txt
index 20a174ac45..40f2b3528c 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -215,7 +215,7 @@ da:2bager|bageri|butik
 tr:3fırın|mağaza
 sv:3bageri|butik
 
-shop|shop-convenience|shop-mall|shop-doityourself|shop-florist|shop-butcher
+shop|shop-convenience|shop-mall|shop-doityourself|shop-florist|shop-butcher|shop-furniture|shop-alcohol|shop-books|shop-shoes|shop-electronics|shop-hardware|shop-jewelry|shop-optician|shop-gift|shop-mobile_phone|shop-beauty|shop-greengrocer|shop-chemist|shop-garden_centre|shop-sports
 en:2shop
 ru:2магазин
 uk:2магазин|крамниця
diff --git a/data/classificator.txt b/data/classificator.txt
index e925816cf5..fae5ff3043 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -645,6 +645,7 @@ world  +
     shop  +
         alcohol  -
         bakery  -
+        beauty  -
         beverages  -
         bicycle  -
         books  -
@@ -672,6 +673,7 @@ world  +
         mobile_phone  -
         optician  -
         shoes  -
+        sports  -
         supermarket  -
         toys  -
         {}
diff --git a/data/drules_proto-bw.bin b/data/drules_proto-bw.bin
index 4109971331..3b331f7540 100644
--- a/data/drules_proto-bw.bin
+++ b/data/drules_proto-bw.bin
diff --git a/data/drules_proto-bw.txt b/data/drules_proto-bw.txt
index 4db262dd1e..4a76c5cba5 100644
--- a/data/drules_proto-bw.txt
+++ b/data/drules_proto-bw.txt
@@ -47401,6 +47401,13 @@ cont {
 cont {
   name: "shop-alcohol"
   element {
+    scale: 16
+    symbol {
+      name: "supermarket"
+      priority: 16000
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "supermarket"
@@ -47508,9 +47515,13 @@ cont {
   }
 }
 cont {
-  name: "shop-beverages"
+  name: "shop-beauty"
   element {
     scale: 17
+    symbol {
+      name: "supermarket"
+      priority: 16002
+    }
     caption {
       primary {
         height: 11
@@ -47523,6 +47534,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "supermarket"
+      priority: 16002
+    }
     caption {
       primary {
         height: 11
@@ -47535,6 +47550,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "supermarket"
+      priority: 16002
+    }
     caption {
       primary {
         height: 11
@@ -47547,15 +47566,47 @@ cont {
   }
 }
 cont {
-  name: "shop-bicycle"
+  name: "shop-beverages"
   element {
-    scale: 16
-    symbol {
-      name: "supermarket"
-      priority: 16000
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
     }
   }
   element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+}
+cont {
+  name: "shop-bicycle"
+  element {
     scale: 17
     symbol {
       name: "supermarket"
@@ -48685,6 +48736,10 @@ cont {
   name: "shop-mobile_phone"
   element {
     scale: 17
+    symbol {
+      name: "supermarket"
+      priority: 16002
+    }
     caption {
       primary {
         height: 11
@@ -48697,6 +48752,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "supermarket"
+      priority: 16002
+    }
     caption {
       primary {
         height: 11
@@ -48709,6 +48768,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "supermarket"
+      priority: 16002
+    }
     caption {
       primary {
         height: 11
@@ -48811,6 +48874,57 @@ cont {
   }
 }
 cont {
+  name: "shop-sports"
+  element {
+    scale: 17
+    symbol {
+      name: "supermarket"
+      priority: 16002
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "supermarket"
+      priority: 16002
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "supermarket"
+      priority: 16002
+    }
+    caption {
+      primary {
+        height: 11
+        color: 0
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15002
+    }
+  }
+}
+cont {
   name: "shop-supermarket"
   element {
     scale: 16
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index b826d886b2..75f803f9ed 100644
--- a/data/drules_proto.bin
+++ b/data/drules_proto.bin
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index fdd277aefb..592a0ae124 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -56755,6 +56755,13 @@ cont {
 cont {
   name: "shop-alcohol"
   element {
+    scale: 16
+    symbol {
+      name: "supermarket"
+      priority: 16000
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "supermarket"
@@ -56862,9 +56869,13 @@ cont {
   }
 }
 cont {
-  name: "shop-beverages"
+  name: "shop-beauty"
   element {
     scale: 17
+    symbol {
+      name: "supermarket"
+      priority: 16003
+    }
     caption {
       primary {
         height: 11
@@ -56877,6 +56888,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "supermarket"
+      priority: 16003
+    }
     caption {
       primary {
         height: 11
@@ -56889,6 +56904,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "supermarket"
+      priority: 16003
+    }
     caption {
       primary {
         height: 11
@@ -56901,15 +56920,47 @@ cont {
   }
 }
 cont {
-  name: "shop-bicycle"
+  name: "shop-beverages"
   element {
-    scale: 16
-    symbol {
-      name: "supermarket"
-      priority: 16000
+    scale: 17
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
     }
   }
   element {
+    scale: 19
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
+  name: "shop-bicycle"
+  element {
     scale: 17
     symbol {
       name: "supermarket"
@@ -58039,6 +58090,10 @@ cont {
   name: "shop-mobile_phone"
   element {
     scale: 17
+    symbol {
+      name: "supermarket"
+      priority: 16003
+    }
     caption {
       primary {
         height: 11
@@ -58051,6 +58106,10 @@ cont {
   }
   element {
     scale: 18
+    symbol {
+      name: "supermarket"
+      priority: 16003
+    }
     caption {
       primary {
         height: 11
@@ -58063,6 +58122,10 @@ cont {
   }
   element {
     scale: 19
+    symbol {
+      name: "supermarket"
+      priority: 16003
+    }
     caption {
       primary {
         height: 11
@@ -58165,6 +58228,57 @@ cont {
   }
 }
 cont {
+  name: "shop-sports"
+  element {
+    scale: 17
+    symbol {
+      name: "supermarket"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "supermarket"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "supermarket"
+      priority: 16003
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+}
+cont {
   name: "shop-supermarket"
   element {
     scale: 16
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 842b5ca4de..95d1b4db72 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -989,3 +989,5 @@ hwtag|private;[hwtag=private];;name;int_name;988;
 route|ferry|motorcar;[route=ferry];;name;int_name;989;
 junction|roundabout;[junction=roundabout];;name;int_name;990;
 highway|speed_camera;[highway=speed_camera];;name;int_name;991;
+shop|beauty;[shop=beauty];;name;int_name;992;
+shop|sports;[shop=sports];;name;int_name;993;
diff --git a/data/styles/include/base_shop.mapcss b/data/styles/include/base_shop.mapcss
index 7cd86dad37..f981023e70 100644
--- a/data/styles/include/base_shop.mapcss
+++ b/data/styles/include/base_shop.mapcss
@@ -35,30 +35,39 @@ node|z16-[shop=bakery]
 
 area|z16-[shop=convenience],
 area|z16-[shop=mall],
-area|z17-[shop=florist],
-area|z17-[shop=butcher],
 area|z16-[shop=doityourself],
 area|z16-[shop=supermarket],
-area|z16-[shop=bicycle],
-area|z17-[shop=alcohol],
+area|z16-[shop=department_store],
+area|z16-[shop=furniture],
+area|z16-[shop=alcohol],
+
+area|z17-[shop=bicycle],
+area|z17-[shop=florist],
+area|z17-[shop=butcher],
 area|z17-[shop=books],
 area|z17-[shop=electronics],
 area|z17-[shop=shoes],
-area|z16-[shop=department_store],
+area|z17-[shop=sports],
+area|z17-[shop=beauty],
+area|z17-[shop=mobile_phone],
+
 node|z16-[shop=convenience],
 node|z16-[shop=mall],
+node|z16-[shop=doityourself],
+node|z16-[shop=supermarket],
+node|z16-[shop=department_store],
+node|z16-[shop=furniture],
+node|z16-[shop=alcohol],
+
+node|z17-[shop=bicycle],
 node|z17-[shop=florist],
 node|z17-[shop=butcher],
-node|z17-[shop=doityourself],
-node|z16-[shop=supermarket],
-node|z16-[shop=bicycle],
-node|z17-[shop=alcohol],
 node|z17-[shop=books],
 node|z17-[shop=electronics],
 node|z17-[shop=shoes],
-node|z16-[shop=department_store],
-area|z16-[shop=furniture],
-node|z16-[shop=furniture]
+node|z17-[shop=sports],
+node|z17-[shop=beauty],
+node|z17-[shop=mobile_phone],
 {
   icon-image: supermarket.svg;
 }
diff --git a/data/types.txt b/data/types.txt
index 6b955170b4..225b148c91 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -989,3 +989,5 @@ hwtag|private
 route|ferry|motorcar
 junction|roundabout
 highway|speed_camera
+shop|beauty
+shop|sports