[styles] Use _legacy suffix in code, merged style for generator tool

generator/generator_tool/generator_tool.cpp

@@ -18,6 +18,7 @@
 #include "indexer/features_offsets_table.hpp"
 #include "indexer/features_vector.hpp"
 #include "indexer/index_builder.hpp"
+#include "indexer/map_style_reader.hpp"
 #include "indexer/search_index_builder.hpp"
 
 #include "coding/file_name_utils.hpp"
@@ -114,7 +115,7 @@ int main(int argc, char ** argv)
   if (!FLAGS_osm_file_type.empty())
     genInfo.SetOsmFileType(FLAGS_osm_file_type);
 
-  // Generating intermediate files
+  // Generate intermediate files.
   if (FLAGS_preprocess)
   {
     LOG(LINFO, ("Generating intermediate data ...."));
@@ -124,7 +125,10 @@ int main(int argc, char ** argv)
     }
   }
 
-  // load classificator only if necessary
+  // Use merged style.
+  GetStyleReader().SetCurrentStyle(MapStyleMerged);
+
+  // Load classificator only when necessary.
   if (FLAGS_make_coasts || FLAGS_generate_features || FLAGS_generate_geometry ||
       FLAGS_generate_index || FLAGS_generate_search_index ||
       FLAGS_calc_statistics || FLAGS_type_statistics || FLAGS_dump_types || FLAGS_dump_prefixes ||
@@ -134,7 +138,7 @@ int main(int argc, char ** argv)
     classif().SortClassificator();
   }
 
-  // Generate dat file
+  // Generate dat file.
   if (FLAGS_generate_features || FLAGS_make_coasts)
   {
     LOG(LINFO, ("Generating final data ..."));
@@ -176,7 +180,7 @@ int main(int argc, char ** argv)
       if (country == WORLD_COASTS_FILE_NAME)
         mapType = feature::DataHeader::worldcoasts;
 
-      // If error - move to next bucket without index generation.
+      // On error move to the next bucket without index generation.
 
       LOG(LINFO, ("Generating result features for", country));
       if (!feature::GenerateFinalFeatures(genInfo, country, mapType))
@@ -204,7 +208,7 @@ int main(int argc, char ** argv)
     }
   }
 
-  // Create http update list for countries and corresponding files
+  // Create http update list for countries and corresponding files.
   if (FLAGS_generate_update)
   {
     LOG(LINFO, ("Updating countries file..."));

indexer/map_style.hpp

@@ -7,6 +7,7 @@ enum MapStyle
   MapStyleLight = 0, //< The first must be 0
   MapStyleDark = 1,
   MapStyleClear = 2,
+  MapStyleMerged = 3,
   // Add new map style here
 
   // Specifies number of MapStyle enum values, must be last

indexer/map_style_reader.cpp

@@ -11,7 +11,7 @@
 namespace
 {
 
-const char * const kSuffixLegacyLight = "";
+const char * const kSuffixLegacyLight = "_legacy";
 const char * const kSuffixLegacyDark = "_dark";
 const char * const kSuffixModernClear = "_clear";
 
@@ -25,6 +25,8 @@ string GetStyleSuffix(MapStyle mapStyle)
     return kSuffixLegacyDark;
   case MapStyleClear:
     return kSuffixModernClear;
+  case MapStyleMerged:
+    return string();
 
   case MapStyleCount:
     break;

platform/platform_tests/apk_test.cpp

@@ -15,18 +15,18 @@ namespace
 {
   char const * arrFiles[] = {
     "copyright.html",
-    "resources-ldpi/basic.skn",
-    "resources-ldpi/plus.png",
-    "resources-ldpi/symbols.png",
-    "resources-mdpi/basic.skn",
-    "resources-mdpi/plus.png",
-    "resources-mdpi/symbols.png",
-    "resources-hdpi/basic.skn",
-    "resources-hdpi/plus.png",
-    "resources-hdpi/symbols.png",
-    "resources-xhdpi/basic.skn",
-    "resources-xhdpi/plus.png",
-    "resources-xhdpi/symbols.png",
+    "resources-ldpi_legacy/basic.skn",
+    "resources-ldpi_legacy/plus.png",
+    "resources-ldpi_legacy/symbols.png",
+    "resources-mdpi_legacy/basic.skn",
+    "resources-mdpi_legacy/plus.png",
+    "resources-mdpi_legacy/symbols.png",
+    "resources-hdpi_legacy/basic.skn",
+    "resources-hdpi_legacy/plus.png",
+    "resources-hdpi_legacy/symbols.png",
+    "resources-xhdpi_legacy/basic.skn",
+    "resources-xhdpi_legacy/plus.png",
+    "resources-xhdpi_legacy/symbols.png",
     "categories.txt",
     "classificator.txt",
     "types.txt",
@@ -34,7 +34,7 @@ namespace
     "fonts_whitelist.txt",
     "languages.txt",
     "unicode_blocks.txt",
-    "drules_proto.bin",
+    "drules_proto_legacy.bin",
     "external_resources.txt",
     "packed_polygons.bin",
     "countries.txt"

platform/platform_tests/platform_test.cpp

@@ -63,7 +63,7 @@ UNIT_TEST(GetReader)
 {
   char const * NON_EXISTING_FILE = "mgbwuerhsnmbui45efhdbn34.tmp";
   char const * arr[] = {
-    "resources-ldpi/symbols.sdf",
+    "resources-ldpi_legacy/symbols.sdf",
     "classificator.txt",
     "minsk-pass.mwm"
   };