boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-10 23:42:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into prepare

Browse Source
This commit is contained in:
Barend Gehrels
2014-06-30 21:08:59 +02:00
parent 000979883d 9fc3b36d25
commit bc2edc4eea
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/make_qbk.py
View File

@@ -109,7 +109,8 @@ models = ["point", "linestring", "box"
, "multi_linestring", "multi_point", "multi_polygon", "referring_segment"]
strategies = ["distance::pythagoras", "distance::haversine"
strategies = ["distance::pythagoras", "distance::pythagoras_box_box"
, "distance::pythagoras_point_box", "distance::haversine"
, "distance::cross_track", "distance::projected_point"
, "within::winding", "within::franklin", "within::crossings_multiply"
, "area::surveyor", "area::huiller"

2
doc/quickref.xml
View File

@@ -519,6 +519,8 @@
<simplelist type="vert" columns="1">
<member><link linkend="geometry.reference.strategies.strategy_distance_projected_point">strategy::distance::projected_point</link></member>
<member><link linkend="geometry.reference.strategies.strategy_distance_pythagoras">strategy::distance::pythagoras</link></member>
<member><link linkend="geometry.reference.strategies.strategy_distance_pythagoras_box_box">strategy::distance::pythagoras_box_box</link></member>
<member><link linkend="geometry.reference.strategies.strategy_distance_pythagoras_point_box">strategy::distance::pythagoras_point_box</link></member>
<member><link linkend="geometry.reference.strategies.strategy_distance_cross_track">strategy::distance::cross_track</link></member>
<member><link linkend="geometry.reference.strategies.strategy_distance_haversine">strategy::distance::haversine</link></member>
</simplelist>

2
doc/reference.qbk
View File

@@ -289,6 +289,8 @@
[section:strategies Strategies]
[include generated/distance_pythagoras.qbk]
[include generated/distance_pythagoras_box_box.qbk]
[include generated/distance_pythagoras_point_box.qbk]
[include generated/distance_haversine.qbk]
[include generated/distance_projected_point.qbk]
[include generated/distance_cross_track.qbk]

2
include/boost/geometry/strategies/cartesian/distance_pythagoras_box_box.hpp
View File

@@ -139,7 +139,7 @@ public :
/*!
\brief Strategy to calculate the distance between two points or boxes
\brief Strategy to calculate the distance between two boxes
\ingroup strategies
\tparam CalculationType \tparam_calculation

13
include/boost/geometry/strategies/cartesian/distance_pythagoras_point_box.hpp
View File

@@ -84,11 +84,12 @@ namespace comparable
{
/*!
\brief Strategy to calculate comparable distance between two points
\ingroup strategies
\tparam Point \tparam_first_point
\tparam Box \tparam_second_box
\tparam CalculationType \tparam_calculation
\brief Strategy to calculate comparable distance between a point
and a box
\ingroup strategies
\tparam Point \tparam_first_point
\tparam Box \tparam_second_box
\tparam CalculationType \tparam_calculation
*/
template <typename CalculationType = void>
class pythagoras_point_box
@@ -132,7 +133,7 @@ public :
/*!
\brief Strategy to calculate the distance between two points or boxes
\brief Strategy to calculate the distance between a point and a box
\ingroup strategies
\tparam CalculationType \tparam_calculation