AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[generator][fix] Add isolines features.

Browse source
This commit is contained in:
Maksim Andrianov 2020-02-11 16:42:51 +03:00 • committed by Daria Volvenkova
parent 1035f5b3db
commit 7dbb352395
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/python/maps_generator/generator/settings.py
View file

@ -131,7 +131,6 @@ OSM_TOOLS_CC_FLAGS = [
CPU_COUNT = multiprocessing.cpu_count()
# Planet and coasts:
ISOLINES_PATH = _get_opt_path(config, "External", "ISOLINES_PATH", ISOLINES_PATH)
PLANET_O5M = os.path.join(MAIN_OUT_PATH, PLANET + ".o5m")
PLANET_PBF = os.path.join(MAIN_OUT_PATH, PLANET + ".osm.pbf")
PLANET_COASTS_GEOM_URL = os.path.join(PLANET_COASTS_URL, "latest_coasts.geom")
@ -229,6 +228,7 @@ def init(default_settings_path: AnyStr):
global US_POSTCODES_URL
global FOOD_TRANSLATIONS_URL
global SRTM_PATH
global ISOLINES_PATH
PLANET_URL = cfg.get_opt_path("External", "PLANET_URL", PLANET_URL)
PLANET_MD5_URL = cfg.get_opt_path("External", "PLANET_MD5_URL", PLANET_MD5_URL)
@ -253,6 +253,7 @@ def init(default_settings_path: AnyStr):
"External", "FOOD_TRANSLATIONS_URL", FOOD_TRANSLATIONS_URL
)
SRTM_PATH = cfg.get_opt_path("External", "SRTM_PATH", SRTM_PATH)
ISOLINES_PATH = cfg.get_opt_path("External", "ISOLINES_PATH", ISOLINES_PATH)
# Stats section:
global STATS_TYPES_CONFIG

3
tools/python/maps_generator/generator/stages_declaration.py
View file

@ -147,9 +147,10 @@ class StageFeatures(Stage):
extra["popular_places_data"] = env.paths.popularity_path
extra["brands_data"] = env.paths.food_paths
extra["brands_translations_data"] = env.paths.food_translations_path
extra["isolines_path"] = env.paths.isolines_path()
if is_skipped(env, StageCoastline):
extra["emit_coasts"] = True
steps.step_features(env, **extra)
if os.path.exists(env.paths.packed_polygons_path):
shutil.copy2(env.paths.packed_polygons_path, env.paths.mwm_path)