From 195d9109a849fdc41ffec5f0d783cdd719405b41 Mon Sep 17 00:00:00 2001 From: Maksim Andrianov Date: Thu, 20 Jun 2019 03:29:26 +0300 Subject: [PATCH] [python][generator] Added order in get_mwm_names(). --- tools/python/maps_generator/generator/env.py | 6 +++--- tools/python/maps_generator/maps_generator.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/python/maps_generator/generator/env.py b/tools/python/maps_generator/generator/env.py index 6d450a2747..22311eea25 100644 --- a/tools/python/maps_generator/generator/env.py +++ b/tools/python/maps_generator/generator/env.py @@ -140,14 +140,14 @@ class Env: def get_mwm_names(self): tmp_ext = ".mwm.tmp" - mwm_names = [] + existed_names = set() for f in os.listdir(self.intermediate_tmp_path): path = os.path.join(self.intermediate_tmp_path, f) if f.endswith(tmp_ext) and os.path.isfile(path): name = f.replace(tmp_ext, "") if name in self.countries: - mwm_names.append(name) - return mwm_names + existed_names.add(name) + return [c for c in self.countries if c in existed_names] def is_accepted_stage(self, stage_name): return stage_name not in self._skipped_stages diff --git a/tools/python/maps_generator/maps_generator.py b/tools/python/maps_generator/maps_generator.py index 9fad27712f..2fdc3b877f 100644 --- a/tools/python/maps_generator/maps_generator.py +++ b/tools/python/maps_generator/maps_generator.py @@ -194,7 +194,8 @@ def stage_mwm(env): mwms = env.get_mwm_names() with ThreadPool() as pool: - pool.map(lambda c: specific[c](c) if c in specific else build(c), mwms) + pool.map(lambda c: specific[c](c) if c in specific else build(c), mwms, + chunksize=1) @stage