From 31f8fec1ea6f4362c49f55ba57f334321b3e932e Mon Sep 17 00:00:00 2001 From: Luca Della Vedova Date: Tue, 31 Dec 2024 14:34:30 +0800 Subject: [PATCH] Revert to just ignore namespace Signed-off-by: Luca Della Vedova --- .../building_map_model_downloader.py | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/rmf_building_map_tools/building_map_model_downloader/building_map_model_downloader.py b/rmf_building_map_tools/building_map_model_downloader/building_map_model_downloader.py index a1f721f7..5c7fe4f5 100644 --- a/rmf_building_map_tools/building_map_model_downloader/building_map_model_downloader.py +++ b/rmf_building_map_tools/building_map_model_downloader/building_map_model_downloader.py @@ -108,23 +108,17 @@ def download_models( actors = get_crowdsim_models(input_yaml) model_set.update(actors) - def add_model(full_model_name): - if "/" in full_model_name: - model_name = "".join(full_model_name.split("/")[1:]) - author_name = full_model_name.split("/")[0] - - model_set.add((model_name, author_name)) - stringent_dict[model_name.lower()] = \ - author_name.lower() - else: - model_set.add(full_model_name) - for _, level in building.levels.items(): for model in level.models: - add_model(model.model_name) - for vertex in level.vertices: - if 'spawn_robot_type' in vertex.params: - add_model(vertex.params['spawn_robot_type'].value) + if "/" in model.model_name: + model_name = "".join(model.model_name.split("/")[1:]) + author_name = model.model_name.split("/")[0] + + model_set.add((model_name, author_name)) + stringent_dict[model_name.lower()] = \ + author_name.lower() + else: + model_set.add(model.model_name) if fuel_tools: missing_models = pit_crew.get_missing_models(