From 76584aaa527d7435ab360a0b3860fecf22691286 Mon Sep 17 00:00:00 2001 From: vng Date: Sun, 28 Feb 2021 12:56:56 +0300 Subject: [PATCH] [generator] Updated doc and removed obsolete Signed-off-by: vng --- generator/generator_tool/generator_tool.cpp | 1 - tools/python/maps_generator/__main__.py | 1 + tools/python/maps_generator/generator/stages_declaration.py | 1 + tools/python/maps_generator/generator/steps.py | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp index 52e1add391..d292aaa406 100644 --- a/generator/generator_tool/generator_tool.cpp +++ b/generator/generator_tool/generator_tool.cpp @@ -95,7 +95,6 @@ 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(dump_cities_boundaries, false, "Dump cities boundaries to a file"); DEFINE_bool(generate_cities_boundaries, false, "Generate the cities boundaries section"); DEFINE_string(cities_boundaries_data, "", "File with cities boundaries"); diff --git a/tools/python/maps_generator/__main__.py b/tools/python/maps_generator/__main__.py index 4cb2c74c58..bfab26a1c6 100644 --- a/tools/python/maps_generator/__main__.py +++ b/tools/python/maps_generator/__main__.py @@ -226,6 +226,7 @@ def main(): skipped_stages.add(sd.StageUpdatePlanet) if not settings.NEED_BUILD_WORLD_ROADS: + skipped_stages.add(sd.StagePrepareRoutingWorld) skipped_stages.add(sd.StageRoutingWorld) # Make env and run maps generation. diff --git a/tools/python/maps_generator/generator/stages_declaration.py b/tools/python/maps_generator/generator/stages_declaration.py index a455b87352..a2ed95be13 100644 --- a/tools/python/maps_generator/generator/stages_declaration.py +++ b/tools/python/maps_generator/generator/stages_declaration.py @@ -248,6 +248,7 @@ class StageCitiesIdsWorld(Stage): @country_stage @helper_stage_for("StageRoutingWorld") +# ToDo: Are we sure that this stage will be skipped if StageRoutingWorld is skipped? class StagePrepareRoutingWorld(Stage): def apply(self, env: Env, country, **kwargs): steps.step_prepare_routing_world(env, country, **kwargs) diff --git a/tools/python/maps_generator/generator/steps.py b/tools/python/maps_generator/generator/steps.py index 825dbdd826..77dafd8e0d 100644 --- a/tools/python/maps_generator/generator/steps.py +++ b/tools/python/maps_generator/generator/steps.py @@ -127,7 +127,6 @@ def step_features(env: Env, **kwargs): osm_file_name=env.paths.planet_o5m, node_storage=env.node_storage, user_resource_path=env.paths.user_resource_path, - dump_cities_boundaries=True, cities_boundaries_data=env.paths.cities_boundaries_path, generate_features=True, threads_count=settings.THREADS_COUNT_FEATURES_STAGE,