From 2a88c6ca5f90a14fdc6fb6ed47ec8dc86548187d Mon Sep 17 00:00:00 2001 From: Maksim Andrianov Date: Mon, 3 Jun 2019 16:47:07 +0300 Subject: [PATCH] [python] Added packed_polygons generation. --- tools/python/maps_generator/generator/env.py | 4 ++++ tools/python/maps_generator/generator/gen_tool.py | 1 + tools/python/maps_generator/maps_generator.py | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/tools/python/maps_generator/generator/env.py b/tools/python/maps_generator/generator/env.py index 4c64d75d7d..0710579267 100644 --- a/tools/python/maps_generator/generator/env.py +++ b/tools/python/maps_generator/generator/env.py @@ -155,6 +155,10 @@ class Env: self._create_if_not_exist(path) return path + @property + def packed_polygons_path(self): + return os.path.join(self.intermediate_path, "packed_polygons.bin") + @property def localads_path(self): path = os.path.join(self.out_path, f"localads_{self.mwm_version}") diff --git a/tools/python/maps_generator/generator/gen_tool.py b/tools/python/maps_generator/generator/gen_tool.py index 9418ff3e54..becf2a62fc 100644 --- a/tools/python/maps_generator/generator/gen_tool.py +++ b/tools/python/maps_generator/generator/gen_tool.py @@ -22,6 +22,7 @@ class GenTool: "generate_geo_objects_index": bool, "generate_index": bool, "generate_maxspeed": bool, + "generate_packed_borders": bool, "generate_popular_places": bool, "generate_region_features": bool, "generate_regions": bool, diff --git a/tools/python/maps_generator/maps_generator.py b/tools/python/maps_generator/maps_generator.py index eff4bb5c71..15fde3c696 100644 --- a/tools/python/maps_generator/maps_generator.py +++ b/tools/python/maps_generator/maps_generator.py @@ -86,6 +86,7 @@ def stage_features(env): extra["no_ads"] = True if any(x not in WORLDS_NAMES for x in env.countries): extra["split_by_polygons"] = True + extra["generate_packed_borders"] = True if any(x == WORLD_NAME for x in env.countries): extra["generate_world"] = True @@ -106,6 +107,9 @@ def stage_features(env): **extra ) + if os.path.exists(env.packed_polygons_path): + shutil.copy2(env.packed_polygons_path, env.mwm_path) + @stage def stage_coastline(env):