From cfd19b77721fb4f9c15e3e90604b4c05b5b57112 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Wed, 20 Jul 2022 08:34:00 +0200 Subject: [PATCH] [generator] Fixed toolchain after renaming an option. Signed-off-by: Viktor Govako --- tools/python/maps_generator/generator/gen_tool.py | 2 +- tools/python/maps_generator/generator/steps.py | 2 +- tools/python/maps_generator/tests/test_logs_reader.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/python/maps_generator/generator/gen_tool.py b/tools/python/maps_generator/generator/gen_tool.py index b11216e3b1..6e1435b97a 100644 --- a/tools/python/maps_generator/generator/gen_tool.py +++ b/tools/python/maps_generator/generator/gen_tool.py @@ -44,7 +44,7 @@ class GenTool: "make_transit_cross_mwm_experimental": bool, "preprocess": bool, "split_by_polygons": bool, - "type_statistics": bool, + "stats_types": bool, "version": bool, "threads_count": int, "booking_data": str, diff --git a/tools/python/maps_generator/generator/steps.py b/tools/python/maps_generator/generator/steps.py index e58cccc25f..4427262a62 100644 --- a/tools/python/maps_generator/generator/steps.py +++ b/tools/python/maps_generator/generator/steps.py @@ -417,7 +417,7 @@ def step_statistics(env: Env, country: AnyStr, **kwargs): intermediate_data_path=env.paths.intermediate_data_path, cache_path=env.paths.cache_path, user_resource_path=env.paths.user_resource_path, - type_statistics=True, + stats_types=True, output=country, **kwargs, ) diff --git a/tools/python/maps_generator/tests/test_logs_reader.py b/tools/python/maps_generator/tests/test_logs_reader.py index 2ecb513220..9ec2580e50 100644 --- a/tools/python/maps_generator/tests/test_logs_reader.py +++ b/tools/python/maps_generator/tests/test_logs_reader.py @@ -121,11 +121,11 @@ LOG TID(1) INFO 5.47322 generator/routing_index_generator.cpp:411 CalcCross LOG TID(1) INFO 5.47325 generator/routing_index_generator.cpp:588 SerializeCrossMwm() Cross mwm section generated, size: 31 bytes [2020-05-24 05:30:25,144] INFO stages Stage RoutingTransit: finished in 0:00:05.824967 [2020-05-24 05:30:25,144] INFO stages Stage MwmStatistics: start ... -[2020-05-24 05:30:25,212] INFO gen_tool Run generator tool [generator_tool version 1590177464 f52c6496c4d90440f2e0d8088acdb3350dcf7c69]: /home/Projects/build-omim-Desktop_Qt_5_10_1_GCC_64bit-Release/generator_tool --threads_count=1 --data_path=/home/maps_build/2020_05_23__16_58_17/draft --intermediate_data_path=/home/maps_build/2020_05_23__16_58_17/intermediate_data --user_resource_path=/home/Projects/omim/data --type_statistics=true --output=Czech_Jihovychod_Jihomoravsky kraj +[2020-05-24 05:30:25,212] INFO gen_tool Run generator tool [generator_tool version 1590177464 f52c6496c4d90440f2e0d8088acdb3350dcf7c69]: /home/Projects/build-omim-Desktop_Qt_5_10_1_GCC_64bit-Release/generator_tool --threads_count=1 --data_path=/home/maps_build/2020_05_23__16_58_17/draft --intermediate_data_path=/home/maps_build/2020_05_23__16_58_17/intermediate_data --user_resource_path=/home/Projects/omim/data --stats_types=true --output=Czech_Jihovychod_Jihomoravsky kraj LOG TID(1) INFO 1.5806e-05 generator_tool/generator_tool.cpp:621 operator()() Calculating type statistics for /home/maps_build/2020_05_23__16_58_17/draft/Czech_Jihovychod_Jihomoravsky kraj.mwm [2020-05-24 05:30:28,773] INFO stages Stage MwmStatistics: finished in 0:00:03.628742 [2020-05-24 06:30:25,144] INFO stages Stage MwmStatistics: start ... -[2020-05-24 06:30:25,212] INFO gen_tool Run generator tool [generator_tool version 1590177464 f52c6496c4d90440f2e0d8088acdb3350dcf7c69]: /home/Projects/build-omim-Desktop_Qt_5_10_1_GCC_64bit-Release/generator_tool --threads_count=1 --data_path=/home/maps_build/2020_05_23__16_58_17/draft --intermediate_data_path=/home/maps_build/2020_05_23__16_58_17/intermediate_data --user_resource_path=/home/Projects/omim/data --type_statistics=true --output=Czech_Jihovychod_Jihomoravsky kraj +[2020-05-24 06:30:25,212] INFO gen_tool Run generator tool [generator_tool version 1590177464 f52c6496c4d90440f2e0d8088acdb3350dcf7c69]: /home/Projects/build-omim-Desktop_Qt_5_10_1_GCC_64bit-Release/generator_tool --threads_count=1 --data_path=/home/maps_build/2020_05_23__16_58_17/draft --intermediate_data_path=/home/maps_build/2020_05_23__16_58_17/intermediate_data --user_resource_path=/home/Projects/omim/data --stats_types=true --output=Czech_Jihovychod_Jihomoravsky kraj LOG TID(1) INFO 1.5806e-05 generator_tool/generator_tool.cpp:621 operator()() Calculating type statistics for /home/maps_build/2020_05_23__16_58_17/draft/Czech_Jihovychod_Jihomoravsky kraj.mwm [2020-05-24 06:30:28,773] INFO stages Stage MwmStatistics: finished in 0:00:01.628742 """