[generator][python] Changed init of stages place; changed logger in step_prepare_routing_world

This commit is contained in:
Maksim Andrianov 2021-03-05 12:59:56 +03:00 committed by Tatiana Yan
parent 9d13ad7725
commit e2aee58abf
3 changed files with 9 additions and 5 deletions

View file

@ -10,3 +10,8 @@ CONFIG_PATH = os.path.join(
)
settings.init(CONFIG_PATH)
from maps_generator.generator import stages_declaration
from maps_generator.generator.stages import stages
stages.init()

View file

@ -39,7 +39,6 @@ from maps_generator.generator.stages import helper_stage_for
from maps_generator.generator.stages import mwm_stage
from maps_generator.generator.stages import outer_stage
from maps_generator.generator.stages import production_only
from maps_generator.generator.stages import stages
from maps_generator.generator.stages import test_stage
from maps_generator.generator.statistics import get_stages_info
from maps_generator.utils.file import download_files
@ -435,5 +434,3 @@ class StageCleanup(Stage):
logger.info(f"{env.paths.draft_path} will be removed.")
shutil.rmtree(env.paths.draft_path)
stages.init()

View file

@ -225,6 +225,7 @@ def make_world_road_graph(
path_roads_file,
path_resources,
path_res_file,
logger,
output=subprocess.DEVNULL,
error=subprocess.DEVNULL,
):
@ -242,7 +243,7 @@ def make_world_road_graph(
wait_and_raise_if_fail(world_roads_builder_tool)
def step_prepare_routing_world(env: Env, country: AnyStr, **kwargs):
def step_prepare_routing_world(env: Env, country: AnyStr, logger, **kwargs):
filter_roads(
env[settings.OSM_TOOL_FILTER],
env.paths.planet_o5m,
@ -255,8 +256,9 @@ def step_prepare_routing_world(env: Env, country: AnyStr, **kwargs):
env.paths.world_roads_o5m,
env.paths.user_resource_path,
env.paths.world_roads_path,
logger,
env.get_subprocess_out(country),
env.get_subprocess_out(country),
env.get_subprocess_out(country)
)