From 6add0b136d523659a3d4608367e00740f3d9d33e Mon Sep 17 00:00:00 2001 From: Olga Khlopkova Date: Tue, 29 Dec 2020 12:06:00 +0300 Subject: [PATCH] [generator] setup_world_roads_builder_tool. --- tools/python/maps_generator/generator/env.py | 21 +++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/tools/python/maps_generator/generator/env.py b/tools/python/maps_generator/generator/env.py index 52808d7024..775cf4aef7 100644 --- a/tools/python/maps_generator/generator/env.py +++ b/tools/python/maps_generator/generator/env.py @@ -231,13 +231,17 @@ class PathProvider: ) @property - def worldroads_path(self) -> AnyStr: + def world_roads_path(self) -> AnyStr: return ( - os.path.join(self.intermediate_data_path, "worldroads.txt") - if settings.WORLDROADS_URL + os.path.join(self.intermediate_data_path, "world_roads.txt") + if settings.BUILD_WORLD_ROADS else "" ) + @property + def need_to_build_world_roads(self) -> bool: + return settings.BUILD_WORLD_ROADS + @property def planet_osm_pbf(self) -> AnyStr: return os.path.join(self.build_path, f"{settings.PLANET}.osm.pbf") @@ -434,6 +438,9 @@ class Env: if item.endswith(".download"): os.remove(os.path.join(self.paths.status_path, item)) + if self.paths.need_to_build_world_roads: + self.world_roads_builder_tool = self.setup_world_roads_builder_tool() + self.main_status = status.Status() # self.countries_meta stores log files and statuses for each country. self.countries_meta = collections.defaultdict(dict) @@ -523,6 +530,14 @@ class Env: raise Exception(exceptions) + @staticmethod + def setup_world_roads_builder_tool() -> AnyStr: + logger.info(f"Check world_roads_builder_tool. Looking for it in {settings.BUILD_PATH} ...") + world_roads_builder_tool_path = find_executable(settings.BUILD_PATH, "world_roads_builder_tool") + logger.info(f"world_roads_builder_tool found - {world_roads_builder_tool_path}") + return world_roads_builder_tool_path + + @staticmethod def setup_osm_tools() -> Dict[AnyStr, AnyStr]: path = settings.OSM_TOOLS_PATH