From afce4d7ab0e3e958dd19a845a4cb0d68dd171982 Mon Sep 17 00:00:00 2001
From: Maksim Andrianov <maksimandrianov1@gmail.com>
Date: Tue, 13 Aug 2019 18:39:56 +0300
Subject: [PATCH] [generator][python] Fixed for python maps_generator.

---
 tools/python/maps_generator/__main__.py            | 3 +++
 tools/python/maps_generator/generator/coastline.py | 1 +
 tools/python/maps_generator/generator/gen_tool.py  | 1 +
 tools/python/maps_generator/generator/stages.py    | 4 +++-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/python/maps_generator/__main__.py b/tools/python/maps_generator/__main__.py
index 4e8fdcd73e..8f4a1aa83f 100644
--- a/tools/python/maps_generator/__main__.py
+++ b/tools/python/maps_generator/__main__.py
@@ -141,7 +141,10 @@ def main():
     if "COUNTRIES" in os.environ:
         countries_line = os.environ["COUNTRIES"]
     if options["countries"]:
+        options["build_all_countries"] = False
         countries_line = options["countries"]
+    else:
+        options["build_all_countries"] = True
     raw_countries = []
     if os.path.isfile(countries_line):
         with open(countries_line) as f:
diff --git a/tools/python/maps_generator/generator/coastline.py b/tools/python/maps_generator/generator/coastline.py
index e7cda84258..eb5f8f6b1d 100644
--- a/tools/python/maps_generator/generator/coastline.py
+++ b/tools/python/maps_generator/generator/coastline.py
@@ -26,6 +26,7 @@ def make_coastline(env):
                  osm_file_type="o5m",
                  osm_file_name=coastline_o5m,
                  node_storage=env.node_storage,
+                 user_resource_path=env.user_resource_path,
                  preprocess=True)
 
     run_gen_tool(env.gen_tool,
diff --git a/tools/python/maps_generator/generator/gen_tool.py b/tools/python/maps_generator/generator/gen_tool.py
index 585c88fc20..b05a3bb603 100644
--- a/tools/python/maps_generator/generator/gen_tool.py
+++ b/tools/python/maps_generator/generator/gen_tool.py
@@ -32,6 +32,7 @@ class GenTool:
         "generate_search_index": bool,
         "generate_traffic_keys": bool,
         "generate_world": bool,
+        "have_borders_for_whole_world": bool,
         "make_city_roads": bool,
         "make_coasts": bool,
         "make_cross_mwm": bool,
diff --git a/tools/python/maps_generator/generator/stages.py b/tools/python/maps_generator/generator/stages.py
index 18ad04b09a..46077a261f 100644
--- a/tools/python/maps_generator/generator/stages.py
+++ b/tools/python/maps_generator/generator/stages.py
@@ -56,6 +56,7 @@ def stage_preprocess(env, **kwargs):
                  osm_file_type="o5m",
                  osm_file_name=settings.PLANET_O5M,
                  node_storage=env.node_storage,
+                 user_resource_path=env.user_resource_path,
                  preprocess=True,
                  **kwargs)
 
@@ -65,10 +66,11 @@ def stage_features(env, **kwargs):
     if not env.production:
         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
+    if env.build_all_countries:
+        extra["have_borders_for_whole_world"] = True
 
     run_gen_tool(
         env.gen_tool,