Skip to content

Commit

Permalink
ClockWise -> Clockwise
Browse files Browse the repository at this point in the history
Signed-off-by: Takayuki Murooka <[email protected]>
  • Loading branch information
takayuki5168 committed Jul 20, 2022
1 parent 0804cb7 commit b7d669d
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ namespace tier4_autoware_utils
{
namespace bg = boost::geometry;

bool isClockWise(const Polygon2d & polygon);
Polygon2d inverseClockWise(const Polygon2d & polygon);
bool isClockwise(const Polygon2d & polygon);
Polygon2d inverseClockwise(const Polygon2d & polygon);
geometry_msgs::msg::Polygon rotatePolygon(
const geometry_msgs::msg::Polygon & polygon, const double & angle);
Polygon2d toPolygon2d(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ double getCircleArea(const geometry_msgs::msg::Vector3 & dimensions)

namespace tier4_autoware_utils
{
bool isClockWise(const Polygon2d & polygon)
bool isClockwise(const Polygon2d & polygon)
{
const int n = polygon.outer().size();
const double x_offset = polygon.outer().at(0).x();
Expand All @@ -83,7 +83,7 @@ bool isClockWise(const Polygon2d & polygon)
return sum < 0.0;
}

Polygon2d inverseClockWise(const Polygon2d & polygon)
Polygon2d inverseClockwise(const Polygon2d & polygon)
{
auto output_polygon = polygon;
boost::geometry::reverse(output_polygon);
Expand Down Expand Up @@ -164,7 +164,7 @@ Polygon2d toPolygon2d(
appendPointToPolygon(polygon, polygon.outer().front());
}

return isClockWise(polygon) ? polygon : inverseClockWise(polygon);
return isClockwise(polygon) ? polygon : inverseClockwise(polygon);
}

double getArea(const autoware_auto_perception_msgs::msg::Shape & shape)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,56 +47,56 @@ geometry_msgs::msg::Pose createPose(const double x, const double y, const double
}
} // namespace

TEST(boost_geometry, boost_isClockWise)
TEST(boost_geometry, boost_isClockwise)
{
using tier4_autoware_utils::isClockWise;
using tier4_autoware_utils::isClockwise;

// empty
Polygon2d empty_polygon;
EXPECT_THROW(isClockWise(empty_polygon), std::out_of_range);
EXPECT_THROW(isClockwise(empty_polygon), std::out_of_range);

// normal case
Polygon2d clock_wise_polygon{{{0.0, 0.0}, {0.0, 1.0}, {1.0, 1.0}, {1.0, 0.0}, {0.0, 0.0}}};
EXPECT_TRUE(isClockWise(clock_wise_polygon));
EXPECT_TRUE(isClockwise(clock_wise_polygon));

Polygon2d anti_clock_wise_polygon{{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}, {0.0, 0.0}}};
EXPECT_FALSE(isClockWise(anti_clock_wise_polygon));
EXPECT_FALSE(isClockwise(anti_clock_wise_polygon));

// duplicated
Polygon2d duplicated_clock_wise_polygon{
{{0.0, 0.0}, {0.0, 1.0}, {0.0, 1.0}, {1.0, 1.0}, {1.0, 0.0}, {0.0, 0.0}}};
EXPECT_TRUE(isClockWise(duplicated_clock_wise_polygon));
EXPECT_TRUE(isClockwise(duplicated_clock_wise_polygon));

Polygon2d duplicated_anti_clock_wise_polygon{
{{0.0, 0.0}, {1.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}, {0.0, 0.0}}};
EXPECT_FALSE(isClockWise(duplicated_anti_clock_wise_polygon));
EXPECT_FALSE(isClockwise(duplicated_anti_clock_wise_polygon));
}

TEST(boost_geometry, boost_inverseClockWise)
TEST(boost_geometry, boost_inverseClockwise)
{
using tier4_autoware_utils::inverseClockWise;
using tier4_autoware_utils::isClockWise;
using tier4_autoware_utils::inverseClockwise;
using tier4_autoware_utils::isClockwise;

// empty
Polygon2d empty_polygon;
const auto reversed_empty_polygon = inverseClockWise(empty_polygon);
const auto reversed_empty_polygon = inverseClockwise(empty_polygon);
EXPECT_EQ(static_cast<int>(reversed_empty_polygon.outer().size()), 0);

// normal case
Polygon2d clock_wise_polygon{{{0.0, 0.0}, {0.0, 1.0}, {1.0, 1.0}, {1.0, 0.0}, {0.0, 0.0}}};
EXPECT_FALSE(isClockWise(inverseClockWise(clock_wise_polygon)));
EXPECT_FALSE(isClockwise(inverseClockwise(clock_wise_polygon)));

Polygon2d anti_clock_wise_polygon{{{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}, {0.0, 0.0}}};
EXPECT_TRUE(isClockWise(inverseClockWise(anti_clock_wise_polygon)));
EXPECT_TRUE(isClockwise(inverseClockwise(anti_clock_wise_polygon)));

// duplicated
Polygon2d duplicated_clock_wise_polygon{
{{0.0, 0.0}, {0.0, 1.0}, {0.0, 1.0}, {1.0, 1.0}, {1.0, 0.0}, {0.0, 0.0}}};
EXPECT_FALSE(isClockWise(inverseClockWise(duplicated_clock_wise_polygon)));
EXPECT_FALSE(isClockwise(inverseClockwise(duplicated_clock_wise_polygon)));

Polygon2d duplicated_anti_clock_wise_polygon{
{{0.0, 0.0}, {1.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}, {0.0, 0.0}}};
EXPECT_TRUE(isClockWise(inverseClockWise(duplicated_anti_clock_wise_polygon)));
EXPECT_TRUE(isClockwise(inverseClockwise(duplicated_anti_clock_wise_polygon)));
}

TEST(boost_geometry, boost_rotatePolygon)
Expand Down

0 comments on commit b7d669d

Please sign in to comment.