Fix regressions from grid_map_geo in terrain_planner_benchmark (#65)

* Fix regressions from grid_map_geo in terrain_planner_benchmark * Fix format
ethz-asl · Jun 14, 2024 · 29eff75 · 29eff75
1 parent 18cd37e
commit 29eff75
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/mav_planning_rviz/src/planning_panel.cpp b/mav_planning_rviz/src/planning_panel.cpp
@@ -621,7 +621,7 @@ void PlanningPanel::plannerstateCallback(const planner_msgs::NavigationStatus& m
       set_planner_state_buttons_[0]->setDisabled(true);   // NAVIGATE
       set_planner_state_buttons_[1]->setDisabled(true);   // ROLLOUT
       set_planner_state_buttons_[2]->setDisabled(false);  // ABORT
-      set_planner_state_buttons_[3]->setDisabled(true);  // RETURN
+      set_planner_state_buttons_[3]->setDisabled(true);   // RETURN
       break;
     }
     case PLANNER_STATE::ROLLOUT: {

diff --git a/terrain_planner_benchmark/src/ompl_benchmark_node.cpp b/terrain_planner_benchmark/src/ompl_benchmark_node.cpp
@@ -109,7 +109,7 @@ int main(int argc, char **argv) {
   nh_private.param<std::string>("output_file_path", output_file_path, "");
 
   auto terrain_map = std::make_shared<TerrainMap>();
-  terrain_map->initializeFromGeotiff(map_path, false);
+  terrain_map->initializeFromGeotiff(map_path);
   if (!color_file_path.empty()) {  // Load color layer if the color path is nonempty
     terrain_map->addColorFromGeotiff(color_file_path);
   }

diff --git a/terrain_planner_benchmark/src/terrain_planner_benchmark_node.cpp b/terrain_planner_benchmark/src/terrain_planner_benchmark_node.cpp
@@ -76,7 +76,7 @@ int main(int argc, char** argv) {
 
   // Load terrain map from defined tif paths
   auto terrain_map = std::make_shared<TerrainMap>();
-  terrain_map->initializeFromGeotiff(map_path, false);
+  terrain_map->initializeFromGeotiff(map_path);
   if (!color_file_path.empty()) {  // Load color layer if the color path is nonempty
     terrain_map->addColorFromGeotiff(color_file_path);
   }

diff --git a/terrain_planner_benchmark/src/test_ics.cpp b/terrain_planner_benchmark/src/test_ics.cpp
@@ -234,7 +234,7 @@ int main(int argc, char** argv) {
   nh_private.param<bool>("visualize", visualize, true);
 
   std::shared_ptr<TerrainMap> reference_map = std::make_shared<TerrainMap>();
-  reference_map->Load(map_path, false, map_color_path);
+  reference_map->Load(map_path, map_color_path);
   reference_map->AddLayerDistanceTransform(50.0, "distance_surface");
   reference_map->AddLayerDistanceTransform(120.0, "max_elevation");
   double width = reference_map->getGridMap().getLength().y();
@@ -261,7 +261,7 @@ int main(int argc, char** argv) {
   std::cout << "Valid circlular terminal state coverage" << std::endl;
 
   std::shared_ptr<TerrainMap> terrain_map = std::make_shared<TerrainMap>();
-  terrain_map->Load(map_path, false, map_color_path);
+  terrain_map->Load(map_path, map_color_path);
   terrain_map->AddLayerDistanceTransform(50.0, "distance_surface");
   terrain_map->AddLayerDistanceTransform(120.0, "max_elevation");
 

diff --git a/terrain_planner_benchmark/src/test_rrt_circle_goal.cpp b/terrain_planner_benchmark/src/test_rrt_circle_goal.cpp
@@ -225,7 +225,7 @@ int main(int argc, char** argv) {
 
   // Load terrain map from defined tif paths
   auto terrain_map = std::make_shared<TerrainMap>();
-  terrain_map->initializeFromGeotiff(map_path, false);
+  terrain_map->initializeFromGeotiff(map_path);
   if (!color_file_path.empty()) {  // Load color layer if the color path is nonempty
     terrain_map->addColorFromGeotiff(color_file_path);
   }

diff --git a/terrain_planner_benchmark/src/test_rrt_node.cpp b/terrain_planner_benchmark/src/test_rrt_node.cpp
@@ -101,7 +101,7 @@ int main(int argc, char** argv) {
 
   // Load terrain map from defined tif paths
   auto terrain_map = std::make_shared<TerrainMap>();
-  terrain_map->initializeFromGeotiff(map_path, false);
+  terrain_map->initializeFromGeotiff(map_path);
   if (!color_file_path.empty()) {  // Load color layer if the color path is nonempty
     terrain_map->addColorFromGeotiff(color_file_path);
   }

diff --git a/terrain_planner_benchmark/src/test_rrt_replanning_node.cpp b/terrain_planner_benchmark/src/test_rrt_replanning_node.cpp
@@ -100,7 +100,7 @@ int main(int argc, char** argv) {
 
   // Load terrain map from defined tif paths
   auto terrain_map = std::make_shared<TerrainMap>();
-  terrain_map->initializeFromGeotiff(map_path, false);
+  terrain_map->initializeFromGeotiff(map_path);
   if (!color_file_path.empty()) {  // Load color layer if the color path is nonempty
     terrain_map->addColorFromGeotiff(color_file_path);
   }