boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-01-31 08:12:13 +00:00
Code Issues Projects Releases Wiki Activity

[formulas] Use new distance function with meridian formula optimization everywhere in point-segment distance formula

Browse Source
This commit is contained in:
Vissarion Fysikopoulos
2017-11-01 20:02:49 +02:00
parent e099a819e7
commit b1fe2ad934
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/boost/geometry/formulas/distance_point_segment.hpp
View File

@@ -45,7 +45,6 @@ class distance_point_segment{
public:
typedef typename FormulaPolicy::template inverse<CT, true, false, false, true, true> inverse_distance_quantities_type;
typedef typename FormulaPolicy::template inverse<CT, true, false, false, false, false> inverse_distance_type;
typedef typename FormulaPolicy::template inverse<CT, false, true, false, false, false> inverse_azimuth_type;
typedef typename FormulaPolicy::template inverse<CT, false, true, true, false, false> inverse_azimuth_reverse_type;
typedef typename FormulaPolicy::template direct<CT, true, false, false, false> direct_distance_type;
@@ -83,7 +82,8 @@ public:
CT lon2, CT lat2, //p2
Spheroid const& spheroid)
{
CT distance = geometry::strategy::distance::geographic<FormulaPolicy, Spheroid, CT>::apply(lon1, lat1, lon2, lat2, spheroid);
CT distance = geometry::strategy::distance::geographic<FormulaPolicy, Spheroid, CT>
::apply(lon1, lat1, lon2, lat2, spheroid);
return non_iterative_case(lon1, lat1, distance);
}
@@ -139,7 +139,6 @@ public:
}
//segment on equator
//TODO: use the meridian distance when it'll be available
if (math::equals(lat1, c0) && math::equals(lat2, c0))
{
#ifdef BOOST_GEOMETRY_DISTANCE_POINT_SEGMENT_DEBUG
@@ -171,8 +170,8 @@ public:
return non_iterative_case(lon1, lat2, d1);
}
CT d2 = inverse_distance_type::apply(lon2, lat2,
lon3, lat3, spheroid).distance;
CT d2 = geometry::strategy::distance::geographic<FormulaPolicy, Spheroid, CT>
::apply(lon2, lat2, lon3, lat3, spheroid);
// Compute a12 (GEO)
geometry::formula::result_inverse<CT> res12 =

2
include/boost/geometry/strategies/geographic/distance_cross_track.hpp
View File

@@ -211,7 +211,7 @@ struct get_comparable<geographic_cross_track<FormulaPolicy, Spheroid, Calculatio
>::type comparable_type;
public :
static inline comparable_type
apply(geographic_cross_track<FormulaPolicy, Spheroid, CalculationType> const& strategy)
apply(geographic_cross_track<FormulaPolicy, Spheroid, CalculationType> const& )
{
return comparable_type();
}