[generator] Reorder command-line arguments

1 files changed, 40 insertions, 29 deletions

diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
index ccf1ec38b9..aef0ff54f1 100644
--- a/generator/generator_tool/generator_tool.cpp
+++ b/generator/generator_tool/generator_tool.cpp
@@ -35,56 +35,67 @@
 
 #include "3party/gflags/src/gflags/gflags.h"
 
-DEFINE_bool(generate_classif, false, "Generate classificator.");
-
-DEFINE_bool(preprocess, false, "1st pass - create nodes/ways/relations data.");
+// Coastlines.
 DEFINE_bool(make_coasts, false, "Create intermediate file with coasts data.");
+DEFINE_bool(fail_on_coasts, false, "Stop and exit with '255' code if some coastlines are not merged.");
 DEFINE_bool(emit_coasts, false,
             "Push coasts features from intermediate file to out files/countries.");
 
+// Generator settings and paths.
+DEFINE_string(osm_file_name, "", "Input osm area file.");
+DEFINE_string(osm_file_type, "xml", "Input osm area file type [xml, o5m].");
+DEFINE_string(data_path, "", "Working directory, 'path_to_exe/../../data' if empty.");
+DEFINE_string(user_resource_path, "", "User defined resource path for classificator.txt and etc.");
+DEFINE_string(intermediate_data_path, "", "Path to stored nodes, ways, relations.");
+DEFINE_string(output, "", "File name for process (without 'mwm' ext).");
+DEFINE_bool(preload_cache, false, "Preload all ways and relations cache.");
+DEFINE_string(node_storage, "map",
+              "Type of storage for intermediate points representation. Available: raw, map, mem.");
+DEFINE_uint64(planet_version, my::SecondsSinceEpoch(),
+              "Version as seconds since epoch, by default - now.");
+
+// Preprocessing and feature generator.
+DEFINE_bool(preprocess, false, "1st pass - create nodes/ways/relations data.");
 DEFINE_bool(generate_features, false, "2nd pass - generate intermediate features.");
 DEFINE_bool(generate_geometry, false,
             "3rd pass - split and simplify geometry and triangles for features.");
 DEFINE_bool(generate_index, false, "4rd pass - generate index.");
 DEFINE_bool(generate_search_index, false, "5th pass - generate search index.");
-DEFINE_bool(calc_statistics, false, "Calculate feature statistics for specified mwm bucket files.");
-DEFINE_bool(type_statistics, false, "Calculate statistics by type for specified mwm bucket files.");
-DEFINE_bool(preload_cache, false, "Preload all ways and relations cache.");
-DEFINE_string(node_storage, "map",
-              "Type of storage for intermediate points representation. Available: raw, map, mem.");
-DEFINE_string(data_path, "", "Working directory, 'path_to_exe/../../data' if empty.");
-DEFINE_string(output, "", "File name for process (without 'mwm' ext).");
-DEFINE_string(intermediate_data_path, "", "Path to stored nodes, ways, relations.");
 DEFINE_bool(generate_world, false, "Generate separate world file.");
 DEFINE_bool(split_by_polygons, false,
             "Use countries borders to split planet by regions and countries.");
+
+// Routing.
+DEFINE_string(osrm_file_name, "", "Input osrm file to generate routing info.");
+DEFINE_bool(make_routing, false, "Make routing info based on osrm file.");
+DEFINE_bool(make_cross_section, false, "Make cross section in routing file for cross mwm routing.");
+DEFINE_bool(make_routing_index, false, "Make sections with the routing information.");
+DEFINE_string(srtm_path, "",
+              "Path to srtm directory. If set, generates a section with altitude information "
+              "about roads.");
+
+// Sponsored-related.
+DEFINE_string(booking_data, "", "Path to booking data in .tsv format.");
+DEFINE_string(booking_reference_path, "", "Path to mwm dataset for booking addresses matching.");
+DEFINE_string(opentable_data, "", "Path to opentable data in .tsv format.");
+DEFINE_string(opentable_reference_path, "", "Path to mwm dataset for opentable addresses matching.");
+
+// Printing stuff.
+DEFINE_bool(calc_statistics, false, "Calculate feature statistics for specified mwm bucket files.");
+DEFINE_bool(type_statistics, false, "Calculate statistics by type for specified mwm bucket files.");
 DEFINE_bool(dump_types, false, "Prints all types combinations and their total count.");
 DEFINE_bool(dump_prefixes, false, "Prints statistics on feature's' name prefixes.");
 DEFINE_bool(dump_search_tokens, false, "Print statistics on search tokens.");
 DEFINE_string(dump_feature_names, "", "Print all feature names by 2-letter locale.");
-DEFINE_bool(unpack_mwm, false, "Unpack each section of mwm into a separate file with name filePath.sectionName.");
+
+// Service functions.
+DEFINE_bool(generate_classif, false, "Generate classificator.");
 DEFINE_bool(generate_packed_borders, false, "Generate packed file with country polygons.");
 DEFINE_string(unpack_borders, "", "Convert packed_polygons to a directory of polygon files (specify folder).");
+DEFINE_bool(unpack_mwm, false, "Unpack each section of mwm into a separate file with name filePath.sectionName.");
 DEFINE_bool(check_mwm, false, "Check map file to be correct.");
 DEFINE_string(delete_section, "", "Delete specified section (defines.hpp) from container.");
-DEFINE_bool(fail_on_coasts, false, "Stop and exit with '255' code if some coastlines are not merged.");
 DEFINE_bool(generate_addresses_file, false, "Generate .addr file (for '--output' option) with full addresses list.");
-DEFINE_string(osrm_file_name, "", "Input osrm file to generate routing info.");
-DEFINE_bool(make_routing, false, "Make routing info based on osrm file.");
-DEFINE_bool(make_cross_section, false, "Make cross section in routing file for cross mwm routing.");
-DEFINE_string(osm_file_name, "", "Input osm area file.");
-DEFINE_string(osm_file_type, "xml", "Input osm area file type [xml, o5m].");
-DEFINE_string(user_resource_path, "", "User defined resource path for classificator.txt and etc.");
-DEFINE_string(booking_data, "", "Path to booking data in .tsv format.");
-DEFINE_string(booking_reference_path, "", "Path to mwm dataset for booking addresses matching.");
-DEFINE_string(opentable_data, "", "Path to opentable data in .tsv format.");
-DEFINE_string(opentable_reference_path, "", "Path to mwm dataset for opentable addresses matching.");
-DEFINE_uint64(planet_version, my::SecondsSinceEpoch(),
-              "Version as seconds since epoch, by default - now.");
-DEFINE_string(srtm_path, "",
-              "Path to srtm directory. If it is set, generates section with altitude information "
-              "about roads.");
-DEFINE_bool(make_routing_index, false, "Make sections with the routing information.");
 
 int main(int argc, char ** argv)
 {