Skip unnecessary, error-introducing longitude normalization on antimeridian-crossing box.

Author: tinko92

include/boost/geometry/util/normalize_spheroidal_box_coordinates.hpp

@@ -49,7 +49,11 @@ class normalize_spheroidal_box_coordinates
                              bool band)
     {
         normalize::apply(longitude1, latitude1, false);
-        normalize::apply(longitude2, latitude2, false);
+        const bool crosses_antimeridian =
+               longitude2 > longitude1
+            && longitude2 > constants::half_period()
+            && longitude2 <= constants::period();
+        normalize::apply(longitude2, latitude2, false, true, crosses_antimeridian);
 
         latitude_convert_if_polar<Units, IsEquatorial>::apply(latitude1);
         latitude_convert_if_polar<Units, IsEquatorial>::apply(latitude2);

include/boost/geometry/util/normalize_spheroidal_coordinates.hpp

@@ -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
         CoordinateType const epsilon = std::numeric_limits<float>::epsilon();
@@ -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())
@@ -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);
 
@@ -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)
@@ -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_antimeridan_crossing);
     }
 };
 

test/algorithms/envelope_expand/expand_on_spheroid.cpp

@@ -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 )

test/algorithms/envelope_expand/test_envelope_expand_on_spheroid.hpp

@@ -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));