Skip to content

Skip unnecessary longitude normalization on antimeridian-crossing box #1456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tinko92 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Skip unnecessary longitude normalization on antimeridian-crossing box #1456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion include/boost/geometry/util/normalize_spheroidal_box_coordinates.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,13 @@ class normalize_spheroidal_box_coordinates
CoordinateType& latitude2,
bool band)
{
bool const allow_antimeridian_crossing =
longitude1 >= constants::min_longitude()
&& longitude1 <= constants::max_longitude()
&& longitude2 > constants::max_longitude()
&& longitude2 - constants::period() < longitude1;
normalize::apply(longitude1, latitude1, false);
normalize::apply(longitude2, latitude2, false);
normalize::apply(longitude2, latitude2, false, true, allow_antimeridian_crossing);

latitude_convert_if_polar<Units, IsEquatorial>::apply(latitude1);
latitude_convert_if_polar<Units, IsEquatorial>::apply(latitude2);
Expand Down
13 changes: 8 additions & 5 deletions include/boost/geometry/util/normalize_spheroidal_coordinates.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,8 @@ class normalize_spheroidal_coordinates
}

public:
static inline void apply(CoordinateType& longitude, bool exact = true)
static inline void apply(CoordinateType& longitude, bool exact = true,
bool allow_antimeridian_crossing = false)
{
// normalize longitude
Comment thread
tinko92 marked this conversation as resolved.
CoordinateType const epsilon = std::numeric_limits<float>::epsilon();
Expand All @@ -234,7 +235,7 @@ class normalize_spheroidal_coordinates
{
longitude = constants::half_period();
}
else if (longitude > constants::half_period())
else if ( ! allow_antimeridian_crossing && longitude > constants::half_period())
{
longitude = normalize_up(longitude);
if (exact || is_integer ? math::equals(longitude, -constants::half_period())
Expand All @@ -252,7 +253,8 @@ class normalize_spheroidal_coordinates
static inline void apply(CoordinateType& longitude,
CoordinateType& latitude,
bool normalize_poles = true,
bool exact = true)
bool exact = true,
bool allow_antimeridian_crossing = false)
{
latitude_convert_if_polar<Units, IsEquatorial>::apply(latitude);

Expand Down Expand Up @@ -281,7 +283,7 @@ class normalize_spheroidal_coordinates
#endif // BOOST_GEOMETRY_NORMALIZE_LATITUDE

// normalize longitude
apply(longitude, exact);
apply(longitude, exact, allow_antimeridian_crossing);

// finally normalize poles
if (normalize_poles)
Expand All @@ -302,7 +304,8 @@ class normalize_spheroidal_coordinates
#endif // BOOST_GEOMETRY_NORMALIZE_LATITUDE

BOOST_GEOMETRY_ASSERT(! math::larger_or_equals(constants::min_longitude(), longitude));
BOOST_GEOMETRY_ASSERT(! math::larger(longitude, constants::max_longitude()));
BOOST_GEOMETRY_ASSERT(! math::larger(longitude, constants::max_longitude())
|| allow_antimeridian_crossing);
}
};

Expand Down
7 changes: 7 additions & 0 deletions test/algorithms/envelope_expand/expand_on_spheroid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,13 @@ void test_expand_point()
from_wkt<B>("BOX(10 -90,100 90)"),
from_wkt<G>("POINT(-95 -90)"),
10, -90, 100, 90);

// box crosses anti-meridian and contains point so it should not be changed
tester::apply("p21",
from_wkt<B>("BOX(170 0,190.4 2)"),
from_wkt<G>("POINT(175 1)"),
170, 0, 190.4, 2,
0.0);
}

BOOST_AUTO_TEST_CASE( expand_point )
Expand Down
2 changes: 1 addition & 1 deletion test/algorithms/envelope_expand/test_envelope_expand_on_spheroid.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ struct box_check_equals
&& (bg::get<0, 1>(box) < 0
? equals(bg::get<0, 1>(box), lat_min)
: equals_with_eps(bg::get<0, 1>(box), lat_min))
&& equals_with_eps(bg::get<1, 0>(box), lon_max)
&& equals(bg::get<1, 0>(box), lon_max)
&& (bg::get<1, 1>(box) > 0
? equals(bg::get<1, 1>(box), lat_max)
: equals_with_eps(bg::get<1, 1>(box), lat_max));
Expand Down
Loading