boost_mirror/geometry
1
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2025-05-10 07:34:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1271 from awulkiew/fix/closest_points

Browse Source 
[strategies] Fix spherical closest_points strategy for PointOfSegment different than model::point
This commit is contained in:
Vissarion Fisikopoulos 2024-07-24 16:45:33 +03:00 committed by GitHub
commit 373d5182f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/boost/geometry/strategies/spherical/closest_points_pt_seg.hpp
View File

@ -1,5 +1,7 @@
// Boost.Geometry // Boost.Geometry
// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
// Copyright (c) 2021, Oracle and/or its affiliates. // Copyright (c) 2021, Oracle and/or its affiliates.
// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle // Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
@ -16,6 +18,8 @@
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/concept_check.hpp> #include <boost/concept_check.hpp>
#include <boost/geometry/algorithms/detail/convert_point_to_point.hpp>
#include <boost/geometry/core/cs.hpp> #include <boost/geometry/core/cs.hpp>
#include <boost/geometry/core/access.hpp> #include <boost/geometry/core/access.hpp>
#include <boost/geometry/core/coordinate_promotion.hpp> #include <boost/geometry/core/coordinate_promotion.hpp>
@ -85,13 +89,21 @@ public:
{ {
using CT = typename calculation_type<Point, PointOfSegment>::type; using CT = typename calculation_type<Point, PointOfSegment>::type;
model::point
<
CT,
dimension<PointOfSegment>::value,
typename coordinate_system<PointOfSegment>::type
> result;
// http://williams.best.vwh.net/avform.htm#XTE // http://williams.best.vwh.net/avform.htm#XTE
CT d3 = m_strategy.apply(sp1, sp2); CT d3 = m_strategy.apply(sp1, sp2);
if (geometry::math::equals(d3, 0.0)) if (geometry::math::equals(d3, 0.0))
{ {
// "Degenerate" segment, return either d1 or d2 // "Degenerate" segment, return either d1 or d2
return sp1; geometry::detail::conversion::convert_point_to_point(sp1, result);
return result;
} }
CT d1 = m_strategy.apply(sp1, p); CT d1 = m_strategy.apply(sp1, p);
@ -159,24 +171,18 @@ public:
false false
>(lon1, lat1, s14_sph, a12, srs::sphere<CT>(earth_radius)); >(lon1, lat1, s14_sph, a12, srs::sphere<CT>(earth_radius));
model::point geometry::set_from_radian<0>(result, res_direct.lon2);
< geometry::set_from_radian<1>(result, res_direct.lat2);
CT,
dimension<PointOfSegment>::value,
typename coordinate_system<PointOfSegment>::type
> cp;
geometry::set_from_radian<0>(cp, res_direct.lon2); return result;
geometry::set_from_radian<1>(cp, res_direct.lat2);
return cp;
} }
else else
{ {
#ifdef BOOST_GEOMETRY_DEBUG_CROSS_TRACK #ifdef BOOST_GEOMETRY_DEBUG_CROSS_TRACK
std::cout << "Projection OUTSIDE the segment" << std::endl; std::cout << "Projection OUTSIDE the segment" << std::endl;
#endif #endif
return d1 < d2 ? sp1 : sp2; geometry::detail::conversion::convert_point_to_point(d1 < d2 ? sp1 : sp2, result);
return result;
} }
} }