fix: relax half period checks in normalization of longitudes

vissarion · vissarion · commit fd147f69b1d0 · 2025-01-30T09:38:36.000+02:00
diff --git a/include/boost/geometry/strategies/normalize.hpp b/include/boost/geometry/strategies/normalize.hpp
@@ -123,7 +123,7 @@ struct assign_loop<1, DimensionCount>
 template <typename PointIn, typename PointOut, bool IsEquatorial = true>
 struct normalize_point
 {
-    static inline void apply(PointIn const& point_in, PointOut& point_out)
+    static inline void apply(PointIn const& point_in, PointOut& point_out, bool exact = true)
     {
         using in_coordinate_type = coordinate_type_t<PointIn>;
 
@@ -135,7 +135,7 @@ struct normalize_point
                 typename geometry::detail::cs_angular_units<PointIn>::type,
                 IsEquatorial,
                 in_coordinate_type
-            >(longitude, latitude);
+            >(longitude, latitude, exact);
 
         assign_loop
             <
@@ -221,13 +221,13 @@ struct cartesian_box
 struct spherical_point
 {
     template <typename PointIn, typename PointOut>
-    static inline void apply(PointIn const& point_in, PointOut& point_out)
+    static inline void apply(PointIn const& point_in, PointOut& point_out, bool exact = true)
     {
         detail::normalize_point
             <
                 PointIn, PointOut,
                 (! std::is_same<cs_tag_t<PointIn>, spherical_polar_tag>::value)
-            >::apply(point_in, point_out);
+            >::apply(point_in, point_out, exact);
     }
 };
 
diff --git a/include/boost/geometry/strategies/spherical/point_in_point.hpp b/include/boost/geometry/strategies/spherical/point_in_point.hpp
@@ -71,9 +71,9 @@ class point_point_on_spheroid
             typedef typename helper_geometry<Point2>::type helper_point_type2;
 
             helper_point_type1 point1_normalized;
-            strategy::normalize::spherical_point::apply(point1, point1_normalized);
+            strategy::normalize::spherical_point::apply(point1, point1_normalized, false);
             helper_point_type2 point2_normalized;
-            strategy::normalize::spherical_point::apply(point2, point2_normalized);
+            strategy::normalize::spherical_point::apply(point2, point2_normalized, false);
 
             return point_point_generic
                 <
diff --git a/include/boost/geometry/util/normalize_spheroidal_coordinates.hpp b/include/boost/geometry/util/normalize_spheroidal_coordinates.hpp
@@ -236,17 +236,22 @@ class normalize_spheroidal_coordinates
     }
 
 public:
-    static inline void apply(CoordinateType& longitude)
+    static inline void apply(CoordinateType& longitude, bool exact = true)
     {
         // normalize longitude
-        if (math::equals(math::abs(longitude), constants::half_period()))
+        CoordinateType const epsilon = CoordinateType(1e-07);
+        bool const is_integer = std::numeric_limits<CoordinateType>::is_integer;
+
+        if (exact || is_integer ? math::equals(math::abs(longitude), constants::half_period())
+            : math::abs(math::abs(longitude) - constants::half_period()) <= epsilon)
         {
             longitude = constants::half_period();
         }
         else if (longitude > constants::half_period())
         {
             longitude = normalize_up(longitude);
-            if (math::equals(longitude, -constants::half_period()))
+            if (exact || is_integer ? math::equals(longitude, -constants::half_period())
+                : math::abs(longitude + constants::half_period()) <= epsilon)
             {
                 longitude = constants::half_period();
             }
@@ -259,7 +264,8 @@ class normalize_spheroidal_coordinates
 
     static inline void apply(CoordinateType& longitude,
                              CoordinateType& latitude,
-                             bool normalize_poles = true)
+                             bool normalize_poles = true,
+                             bool exact = true)
     {
         latitude_convert_if_polar<Units, IsEquatorial>::apply(latitude);
 
@@ -288,7 +294,7 @@ class normalize_spheroidal_coordinates
 #endif // BOOST_GEOMETRY_NORMALIZE_LATITUDE
 
         // normalize longitude
-        apply(longitude);
+        apply(longitude, exact);
 
         // finally normalize poles
         if (normalize_poles)
@@ -353,22 +359,24 @@ inline void normalize_angle_cond(CoordinateType& angle)
 */
 template <typename Units, typename CoordinateType>
 inline void normalize_spheroidal_coordinates(CoordinateType& longitude,
-                                             CoordinateType& latitude)
+                                             CoordinateType& latitude,
+                                             bool exact = true)
 {
     detail::normalize_spheroidal_coordinates
         <
             Units, CoordinateType
-        >::apply(longitude, latitude);
+        >::apply(longitude, latitude, true, exact);
 }
 
 template <typename Units, bool IsEquatorial, typename CoordinateType>
 inline void normalize_spheroidal_coordinates(CoordinateType& longitude,
-                                             CoordinateType& latitude)
+                                             CoordinateType& latitude,
+                                             bool exact = true)
 {
     detail::normalize_spheroidal_coordinates
         <
             Units, CoordinateType, IsEquatorial
-        >::apply(longitude, latitude);
+        >::apply(longitude, latitude, true, exact);
 }
 
 /*!
@@ -381,12 +389,12 @@ inline void normalize_spheroidal_coordinates(CoordinateType& longitude,
 \ingroup utility
 */
 template <typename Units, typename CoordinateType>
-inline void normalize_longitude(CoordinateType& longitude)
+inline void normalize_longitude(CoordinateType& longitude, bool exact = true)
 {
     detail::normalize_spheroidal_coordinates
         <
             Units, CoordinateType
-        >::apply(longitude);
+        >::apply(longitude, exact);
 }
 
 /*!
@@ -400,7 +408,7 @@ inline void normalize_longitude(CoordinateType& longitude)
 template <typename Units, typename CoordinateType>
 inline void normalize_azimuth(CoordinateType& angle)
 {
-    normalize_longitude<Units, CoordinateType>(angle);
+    math::normalize_longitude<Units, CoordinateType>(angle, true);
 }
 
 /*!
@@ -435,7 +443,7 @@ inline CoordinateType longitude_distance_signed(CoordinateType const& longitude1
                                                 CoordinateType const& longitude2)
 {
     CoordinateType diff = longitude2 - longitude1;
-    math::normalize_longitude<Units, CoordinateType>(diff);
+    math::normalize_longitude<Units, CoordinateType>(diff, true);
     return diff;
 }
 
diff --git a/test/algorithms/overlay/get_turns_linear_linear_geo.cpp b/test/algorithms/overlay/get_turns_linear_linear_geo.cpp
@@ -24,7 +24,7 @@ void test_radian()
     boost::geometry::strategies::relate::geographic<> wgs84(sph_wgs84);
 
     test_geometry<ls, mls>(
-        "LINESTRING(0 0, -3.14159265358979 0)",
+        "LINESTRING(0 0,-3.14159265358979 0)",
         "MULTILINESTRING((-2.1467549799530232 -0.12217304763960295,"
                          "-2.5481807079117185 -0.90757121103705041,"
                          "-2.6529004630313784 0.85521133347722067,"
diff --git a/test/algorithms/set_operations/difference/difference_linear_linear.cpp b/test/algorithms/set_operations/difference/difference_linear_linear.cpp
@@ -1160,7 +1160,7 @@ BOOST_AUTO_TEST_CASE( test_difference_ml_ml_degenerate )
 {
 #ifdef BOOST_GEOMETRY_TEST_DEBUG
     std::cout << std::endl << std::endl << std::endl;
-    std::cout << "*** MULTILINESTRING / MULTILINESTRING DIFFERENCE" 
+    std::cout << "*** MULTILINESTRING / MULTILINESTRING DIFFERENCE"
               << " (DEGENERATE) ***"
               << std::endl;
     std::cout << std::endl;
@@ -1247,7 +1247,7 @@ BOOST_AUTO_TEST_CASE( test_difference_ml_ml_spikes )
 {
 #ifdef BOOST_GEOMETRY_TEST_DEBUG
     std::cout << std::endl << std::endl << std::endl;
-    std::cout << "*** MULTILINESTRING / MULTILINESTRING DIFFERENCE" 
+    std::cout << "*** MULTILINESTRING / MULTILINESTRING DIFFERENCE"
               << " (WITH SPIKES) ***"
               << std::endl;
     std::cout << std::endl;
@@ -1452,7 +1452,7 @@ BOOST_AUTO_TEST_CASE( test_difference_ls_mls_geo_rad )
     bg::srs::spheroid<double> sph_wgs84(6378137.0, 6356752.3142451793);
     boost::geometry::strategy::intersection::geographic_segments<> wgs84(sph_wgs84);
 
-    ls g1 = from_wkt<ls>("LINESTRING(0 0, -3.14159265358979 0)");
+    ls g1 = from_wkt<ls>("LINESTRING(0 0,-3.14159265358979 0)");
     mls g2 = from_wkt<mls>("MULTILINESTRING((-2.1467549799530232 -0.12217304763960295,"
                                             "-2.5481807079117185 -0.90757121103705041,"
                                             "-2.6529004630313784 0.85521133347722067,"

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ struct assign_loop<1, DimensionCount>`
`123`	`123`	`template <typename PointIn, typename PointOut, bool IsEquatorial = true>`
`124`	`124`	`struct normalize_point`
`125`	`125`	`{`
`126`		`- static inline void apply(PointIn const& point_in, PointOut& point_out)`
	`126`	`+ static inline void apply(PointIn const& point_in, PointOut& point_out, bool exact = true)`
`127`	`127`	`{`
`128`	`128`	`using in_coordinate_type = coordinate_type_t<PointIn>;`
`129`	`129`
`@@ -135,7 +135,7 @@ struct normalize_point`
`135`	`135`	`typename geometry::detail::cs_angular_units<PointIn>::type,`
`136`	`136`	`IsEquatorial,`
`137`	`137`	`in_coordinate_type`
`138`		`- >(longitude, latitude);`
	`138`	`+ >(longitude, latitude, exact);`
`139`	`139`
`140`	`140`	`assign_loop`
`141`	`141`	`<`
`@@ -221,13 +221,13 @@ struct cartesian_box`
`221`	`221`	`struct spherical_point`
`222`	`222`	`{`
`223`	`223`	`template <typename PointIn, typename PointOut>`
`224`		`- static inline void apply(PointIn const& point_in, PointOut& point_out)`
	`224`	`+ static inline void apply(PointIn const& point_in, PointOut& point_out, bool exact = true)`
`225`	`225`	`{`
`226`	`226`	`detail::normalize_point`
`227`	`227`	`<`
`228`	`228`	`PointIn, PointOut,`
`229`	`229`	`(! std::is_same<cs_tag_t<PointIn>, spherical_polar_tag>::value)`
`230`		`- >::apply(point_in, point_out);`
	`230`	`+ >::apply(point_in, point_out, exact);`
`231`	`231`	`}`
`232`	`232`	`};`
`233`	`233`
Original file line number	Diff line number	Diff line change
`@@ -236,17 +236,22 @@ class normalize_spheroidal_coordinates`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`public:`
`239`		`- static inline void apply(CoordinateType& longitude)`
	`239`	`+ static inline void apply(CoordinateType& longitude, bool exact = true)`
`240`	`240`	`{`
`241`	`241`	`// normalize longitude`
`242`		`- if (math::equals(math::abs(longitude), constants::half_period()))`
	`242`	`+ CoordinateType const epsilon = CoordinateType(1e-07);`
	`243`	`+ bool const is_integer = std::numeric_limits<CoordinateType>::is_integer;`
	`244`	`+`
	`245`	`+ if (exact \|\| is_integer ? math::equals(math::abs(longitude), constants::half_period())`
	`246`	`+ : math::abs(math::abs(longitude) - constants::half_period()) <= epsilon)`
`243`	`247`	`{`
`244`	`248`	`longitude = constants::half_period();`
`245`	`249`	`}`
`246`	`250`	`else if (longitude > constants::half_period())`
`247`	`251`	`{`
`248`	`252`	`longitude = normalize_up(longitude);`
`249`		`- if (math::equals(longitude, -constants::half_period()))`
	`253`	`+ if (exact \|\| is_integer ? math::equals(longitude, -constants::half_period())`
	`254`	`+ : math::abs(longitude + constants::half_period()) <= epsilon)`
`250`	`255`	`{`
`251`	`256`	`longitude = constants::half_period();`
`252`	`257`	`}`
`@@ -259,7 +264,8 @@ class normalize_spheroidal_coordinates`
`259`	`264`
`260`	`265`	`static inline void apply(CoordinateType& longitude,`
`261`	`266`	`CoordinateType& latitude,`
`262`		`- bool normalize_poles = true)`
	`267`	`+ bool normalize_poles = true,`
	`268`	`+ bool exact = true)`
`263`	`269`	`{`
`264`	`270`	`latitude_convert_if_polar<Units, IsEquatorial>::apply(latitude);`
`265`	`271`
`@@ -288,7 +294,7 @@ class normalize_spheroidal_coordinates`
`288`	`294`	`#endif // BOOST_GEOMETRY_NORMALIZE_LATITUDE`
`289`	`295`
`290`	`296`	`// normalize longitude`
`291`		`- apply(longitude);`
	`297`	`+ apply(longitude, exact);`
`292`	`298`
`293`	`299`	`// finally normalize poles`
`294`	`300`	`if (normalize_poles)`
`@@ -353,22 +359,24 @@ inline void normalize_angle_cond(CoordinateType& angle)`
`353`	`359`	`*/`
`354`	`360`	`template <typename Units, typename CoordinateType>`
`355`	`361`	`inline void normalize_spheroidal_coordinates(CoordinateType& longitude,`
`356`		`- CoordinateType& latitude)`
	`362`	`+ CoordinateType& latitude,`
	`363`	`+ bool exact = true)`
`357`	`364`	`{`
`358`	`365`	`detail::normalize_spheroidal_coordinates`
`359`	`366`	`<`
`360`	`367`	`Units, CoordinateType`
`361`		`- >::apply(longitude, latitude);`
	`368`	`+ >::apply(longitude, latitude, true, exact);`
`362`	`369`	`}`
`363`	`370`
`364`	`371`	`template <typename Units, bool IsEquatorial, typename CoordinateType>`
`365`	`372`	`inline void normalize_spheroidal_coordinates(CoordinateType& longitude,`
`366`		`- CoordinateType& latitude)`
	`373`	`+ CoordinateType& latitude,`
	`374`	`+ bool exact = true)`
`367`	`375`	`{`
`368`	`376`	`detail::normalize_spheroidal_coordinates`
`369`	`377`	`<`
`370`	`378`	`Units, CoordinateType, IsEquatorial`
`371`		`- >::apply(longitude, latitude);`
	`379`	`+ >::apply(longitude, latitude, true, exact);`
`372`	`380`	`}`
`373`	`381`
`374`	`382`	`/*!`
`@@ -381,12 +389,12 @@ inline void normalize_spheroidal_coordinates(CoordinateType& longitude,`
`381`	`389`	`\ingroup utility`
`382`	`390`	`*/`
`383`	`391`	`template <typename Units, typename CoordinateType>`
`384`		`-inline void normalize_longitude(CoordinateType& longitude)`
	`392`	`+inline void normalize_longitude(CoordinateType& longitude, bool exact = true)`
`385`	`393`	`{`
`386`	`394`	`detail::normalize_spheroidal_coordinates`
`387`	`395`	`<`
`388`	`396`	`Units, CoordinateType`
`389`		`- >::apply(longitude);`
	`397`	`+ >::apply(longitude, exact);`
`390`	`398`	`}`
`391`	`399`
`392`	`400`	`/*!`
`@@ -400,7 +408,7 @@ inline void normalize_longitude(CoordinateType& longitude)`
`400`	`408`	`template <typename Units, typename CoordinateType>`
`401`	`409`	`inline void normalize_azimuth(CoordinateType& angle)`
`402`	`410`	`{`
`403`		`- normalize_longitude<Units, CoordinateType>(angle);`
	`411`	`+ math::normalize_longitude<Units, CoordinateType>(angle, true);`
`404`	`412`	`}`
`405`	`413`
`406`	`414`	`/*!`
`@@ -435,7 +443,7 @@ inline CoordinateType longitude_distance_signed(CoordinateType const& longitude1`
`435`	`443`	`CoordinateType const& longitude2)`
`436`	`444`	`{`
`437`	`445`	`CoordinateType diff = longitude2 - longitude1;`
`438`		`- math::normalize_longitude<Units, CoordinateType>(diff);`
	`446`	`+ math::normalize_longitude<Units, CoordinateType>(diff, true);`
`439`	`447`	`return diff;`
`440`	`448`	`}`
`441`	`449`