fix(autoware_scenario_selector): fix bugprone-branch-clone (#9699)

kobayu858 · web-flow · commit 203587335202 · 2024-12-27T19:24:46.000+09:00
fix: bugprone-error

Signed-off-by: kobayu858 &lt;yutaro.kobayashi@tier4.jp&gt;
diff --git a/planning/autoware_scenario_selector/src/node.cpp b/planning/autoware_scenario_selector/src/node.cpp
@@ -156,9 +156,8 @@ std::string ScenarioSelectorNode::selectScenarioByPosition()
       return tier4_planning_msgs::msg::Scenario::LANEDRIVING;
     } else if (is_in_parking_lot) {
       return tier4_planning_msgs::msg::Scenario::PARKING;
-    } else {
-      return tier4_planning_msgs::msg::Scenario::LANEDRIVING;
     }
+    return tier4_planning_msgs::msg::Scenario::LANEDRIVING;
   }
 
   if (current_scenario_ == tier4_planning_msgs::msg::Scenario::LANEDRIVING) {

Original file line number	Diff line number	Diff line change
`@@ -156,9 +156,8 @@ std::string ScenarioSelectorNode::selectScenarioByPosition()`
`156`	`156`	`return tier4_planning_msgs::msg::Scenario::LANEDRIVING;`
`157`	`157`	`} else if (is_in_parking_lot) {`
`158`	`158`	`return tier4_planning_msgs::msg::Scenario::PARKING;`
`159`		`- } else {`
`160`		`- return tier4_planning_msgs::msg::Scenario::LANEDRIVING;`
`161`	`159`	`}`
	`160`	`+ return tier4_planning_msgs::msg::Scenario::LANEDRIVING;`
`162`	`161`	`}`
`163`	`162`
`164`	`163`	`if (current_scenario_ == tier4_planning_msgs::msg::Scenario::LANEDRIVING) {`