Merge branch 'develop' into feature/read_shapefile

Author: awulkiew

doc/doxy/doxygen_input/groups/groups.hpp

@@ -4,6 +4,7 @@
 
 // This file was modified by Oracle on 2018.
 // Modifications copyright (c) 2018, Oracle and/or its affiliates.
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 
@@ -54,6 +55,7 @@
 \defgroup is_valid is_valid: detect if a geometry is valid
 \defgroup iterators iterators: iterators
 \defgroup length length: calculate length of a linear geometry
+\defgroup line_interpolate line_interpolate: interpolates points on a linestring
 \defgroup make make: construct geometries
 \defgroup num_geometries number of geometries: calculate the number of geometries in a multi-geometry
 \defgroup num_interior_rings number of interior rings: calculate the number of interior rings

doc/html/index.html

@@ -3,7 +3,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Chapter&#160;1.&#160;Geometry</title>
 <link rel="stylesheet" href="../../../../doc/src/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.77.1">
+<meta name="generator" content="DocBook XSL Stylesheets V1.79.1">
 <link rel="home" href="index.html" title="Chapter&#160;1.&#160;Geometry">
 <link rel="next" href="geometry/introduction.html" title="Introduction">
 </head>
@@ -40,8 +40,8 @@
 <div><div class="author"><h3 class="author">
 <span class="firstname">Vissarion</span> <span class="surname">Fisikopoulos</span>
 </h3></div></div>
-<div><p class="copyright">Copyright &#169; 2009-2018 Barend Gehrels, Bruno Lalande, Mateusz Loskot, Adam Wulkiewicz, Oracle
-      and/or its affiliates</p></div>
+<div><p class="copyright">Copyright &#169; 2009-2019 Barend Gehrels, Bruno Lalande, Mateusz Loskot, Adam
+      Wulkiewicz, Oracle and/or its affiliates</p></div>
 <div><div class="legalnotice">
 <a name="geometry.legal"></a><p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -51,7 +51,7 @@
 </div></div>
 <div class="toc">
 <p><b>Table of Contents</b></p>
-<dl>
+<dl class="toc">
 <dt><span class="section"><a href="geometry/introduction.html">Introduction</a></span></dt>
 <dt><span class="section"><a href="geometry/compilation.html">Compilation</a></span></dt>
 <dt><span class="section"><a href="geometry/design.html">Design Rationale</a></span></dt>
@@ -143,7 +143,7 @@ <h3>
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: November 29, 2018 at 00:39:14 GMT</small></p></td>
+<td align="left"><p><small>Last revised: February 19, 2019 at 14:49:50 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>

doc/imports.qbk

@@ -6,6 +6,7 @@
   Copyright (c) 2009-2012 Bruno Lalande, Paris, France.
 
   Copyright (c) 2018, Oracle and/or its affiliates.
+  Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
   Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
   Use, modification and distribution is subject to the Boost Software License,
@@ -46,6 +47,8 @@
 [import src/examples/algorithms/for_each_segment_const.cpp]
 [import src/examples/algorithms/length.cpp]
 [import src/examples/algorithms/length_with_strategy.cpp]
+[import src/examples/algorithms/line_interpolate.cpp]
+[import src/examples/algorithms/line_interpolate_strategy.cpp]
 [import src/examples/algorithms/make_2d_point.cpp]
 [import src/examples/algorithms/make_3d_point.cpp]
 [import src/examples/algorithms/make_inverse.cpp]
@@ -148,6 +151,7 @@
 [import src/examples/strategies/buffer_distance_asymmetric.cpp]
 [import src/examples/strategies/buffer_point_circle.cpp]
 [import src/examples/strategies/buffer_point_square.cpp]
+[import src/examples/strategies/buffer_geographic_point_circle.cpp]
 
 [import src/examples/views/box_view.cpp]
 [import src/examples/views/segment_view.cpp]

doc/make_qbk.py

@@ -97,12 +97,13 @@ def cs_to_quickbook(section):
 
 algorithms = ["append", "assign", "make", "clear"
     , "area", "buffer", "centroid", "convert", "correct", "covered_by"
-    , "convex_hull", "crosses", "densify", "difference", "discrete_frechet_distance","discrete_hausdorff_distance","disjoint", "distance" 
-    , "envelope", "equals", "expand", "for_each", "is_empty"
+    , "convex_hull", "crosses", "densify", "difference"
+    , "discrete_frechet_distance", "discrete_hausdorff_distance", "disjoint"
+    , "distance", "envelope", "equals", "expand", "for_each", "is_empty"
     , "is_simple", "is_valid", "intersection", "intersects", "length"
-    , "num_geometries", "num_interior_rings", "num_points"
-    , "num_segments", "overlaps", "perimeter", "relate", "relation"
-    , "reverse","simplify", "sym_difference", "touches"
+    , "line_interpolate", "num_geometries", "num_interior_rings"
+    , "num_points", "num_segments", "overlaps", "perimeter", "relate"
+    , "relation", "reverse","simplify", "sym_difference", "touches"
     , "transform", "union", "unique", "within"]
 
 access_functions = ["get", "set", "exterior_ring", "interior_rings"
@@ -112,8 +113,7 @@ def cs_to_quickbook(section):
 
 core = ["closure", "coordinate_system", "coordinate_type", "cs_tag"
     , "dimension", "exception", "interior_type"
-    , "degree", "radian"
-    , "is_radian", "point_order"
+    , "degree", "radian", "point_order"
     , "point_type", "ring_type", "tag", "tag_cast" ]
 
 exceptions = ["exception", "centroid_exception"];
@@ -133,13 +133,17 @@ def cs_to_quickbook(section):
     , "buffer::end_round", "buffer::end_flat"
     , "buffer::distance_symmetric", "buffer::distance_asymmetric"
     , "buffer::side_straight"
+    , "buffer::geographic_point_circle"
     , "centroid::bashein_detmer", "centroid::average"
     , "convex_hull::graham_andrew"
     , "densify::cartesian", "densify::geographic", "densify::spherical"
     , "distance::pythagoras", "distance::pythagoras_box_box"
     , "distance::pythagoras_point_box", "distance::haversine"
     , "distance::cross_track", "distance::cross_track_point_box"
     , "distance::projected_point"
+    , "line_interpolate::cartesian"
+    , "line_interpolate::spherical"
+    , "line_interpolate::geographic"
     , "simplify::douglas_peucker"
     , "side::side_by_triangle", "side::side_by_cross_track"
     , "side::spherical_side_formula", "side::geographic"

doc/quickref.xml

@@ -12,6 +12,7 @@
 
   This file was modified by Oracle on 2014, 2015, 2017, 2018.
   Modifications copyright (c) 2014-2018, Oracle and/or its affiliates.
+  Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
   Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
   Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -195,7 +196,6 @@
      <member><link linkend="geometry.reference.core.coordinate_system">coordinate_system</link></member>
      <member><link linkend="geometry.reference.core.dimension">dimension</link></member>
      <member><link linkend="geometry.reference.core.interior_type">interior_type</link></member>
-     <member><link linkend="geometry.reference.core.is_radian">is_radian</link></member>
      <member><link linkend="geometry.reference.core.point_order">point_order</link></member>
      <member><link linkend="geometry.reference.core.point_type">point_type</link></member>
      <member><link linkend="geometry.reference.core.ring_type">ring_type</link></member>
@@ -427,7 +427,11 @@
     <bridgehead renderas="sect3">Length</bridgehead>
     <simplelist type="vert" columns="1">
      <member><link linkend="geometry.reference.algorithms.length">length</link></member>
-    </simplelist>    
+    </simplelist>
+    <bridgehead renderas="sect3">line_interpolate</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="geometry.reference.algorithms.line_interpolate">line_interpolate</link></member>
+    </simplelist>
     <bridgehead renderas="sect3">Num_ (counting)</bridgehead>
     <simplelist type="vert" columns="1">
      <member><link linkend="geometry.reference.algorithms.num_interior_rings">num_interior_rings</link></member>
@@ -546,6 +550,7 @@
      <member><link linkend="geometry.reference.strategies.strategy_buffer_join_round">strategy::buffer::join_round</link></member>
      <member><link linkend="geometry.reference.strategies.strategy_buffer_point_circle">strategy::buffer::point_circle</link></member>
      <member><link linkend="geometry.reference.strategies.strategy_buffer_point_square">strategy::buffer::point_square</link></member>
+     <member><link linkend="geometry.reference.strategies.strategy_buffer_geographic_point_circle">strategy::buffer::geographic_point_circle</link></member>
      <member><link linkend="geometry.reference.strategies.strategy_buffer_side_straight">strategy::buffer::side_straight</link></member>
     </simplelist>
    </entry>
@@ -586,6 +591,14 @@
    </entry>
   </row>
   <row>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Line interpolate point</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="geometry.reference.strategies.strategy_line_interpolate_cartesian">strategy::line_interpolate::cartesian</link></member>
+     <member><link linkend="geometry.reference.strategies.strategy_line_interpolate_geographic">strategy::line_interpolate::geographic</link></member>
+     <member><link linkend="geometry.reference.strategies.strategy_line_interpolate_spherical">strategy::line_interpolate::spherical</link></member>
+    </simplelist>
+   </entry>
    <entry valign="top">
     <bridgehead renderas="sect3">Side</bridgehead>
     <simplelist type="vert" columns="1">

doc/reference.qbk

@@ -9,6 +9,7 @@
   This file was modified by Oracle on 2014, 2017, 2018.
   Modifications copyright (c) 2014-2018, Oracle and/or its affiliates.
 
+  Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
   Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
   Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -165,6 +166,10 @@
 [include generated/length.qbk]
 [endsect]
 
+[section:line_interpolate line_interpolate]
+[include generated/line_interpolate.qbk]
+[endsect]
+
 [section:make make]
 [include generated/make.qbk]
 [endsect]
@@ -257,7 +262,6 @@
 [include generated/degree.qbk]
 [include generated/dimension.qbk]
 [include generated/interior_type.qbk]
-[include generated/is_radian.qbk]
 [include generated/point_order.qbk]
 [include generated/point_type.qbk]
 [include generated/radian.qbk]
@@ -363,6 +367,7 @@
 [include generated/buffer_distance_asymmetric.qbk]
 [include generated/buffer_point_circle.qbk]
 [include generated/buffer_point_square.qbk]
+[include generated/buffer_geographic_point_circle.qbk]
 [include generated/buffer_side_straight.qbk]
 [include generated/centroid_average.qbk]
 [include generated/centroid_bashein_detmer.qbk]
@@ -377,6 +382,9 @@
 [include generated/distance_projected_point.qbk]
 [include generated/distance_cross_track.qbk]
 [include generated/distance_cross_track_point_box.qbk]
+[include generated/line_interpolate_cartesian.qbk]
+[include generated/line_interpolate_geographic.qbk]
+[include generated/line_interpolate_spherical.qbk]
 [include generated/side_side_by_triangle.qbk]
 [include generated/side_side_by_cross_track.qbk]
 [include generated/side_spherical_side_formula.qbk]

doc/reference/algorithms/buffer.qbk

@@ -1,9 +1,9 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2012 Barend Gehrels, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-  Copyright (c) 2009-2012 Bruno Lalande, Paris, France.
+  Copyright (c) 2009-2019 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2019 Mateusz Loskot, London, UK.
+  Copyright (c) 2009-2019 Bruno Lalande, Paris, France.
 
   Use, modification and distribution is subject to the Boost Software License,
   Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -12,9 +12,7 @@
 
 [def __this_function__ buffer]
 
-[heading_conformance_ogc __this_function__..Buffer]
-[note The current implemetation only enlarges a box, which is not defined by OGC.
-  A next version of the library will contain a more complete implementation
+[note This version without strategies enlarges a box. To buffer any geometry, use [link geometry.reference.algorithms.buffer.buffer_7_with_strategies buffer (with strategies)]
 ]
 
 [heading Behavior]

doc/reference/algorithms/buffer_with_strategies.qbk

@@ -35,16 +35,16 @@ side_straight
 
 [heading Supported geometries]
 [table
-[[ ][2D Cartesian]]
-[[Point][[$img/ok.png]]]
-[[Segment][[$img/nyi.png]]]
-[[Box][[$img/nyi.png]]]
-[[Linestring][[$img/ok.png]]]
-[[Ring][[$img/ok.png]]]
-[[Polygon][[$img/ok.png]]]
-[[MultiPoint][[$img/ok.png]]]
-[[MultiLinestring][[$img/ok.png]]]
-[[MultiPolygon][[$img/ok.png]]]
+[[ ][2D Cartesian][Geographic]]
+[[Point][[$img/ok.png]][[$img/ok.png]]]
+[[Segment][[$img/nyi.png]][[$img/nyi.png]]]
+[[Box][[$img/nyi.png]][[$img/nyi.png]]]
+[[Linestring][[$img/ok.png]][[$img/nyi.png]]]
+[[Ring][[$img/ok.png]][[$img/nyi.png]]]
+[[Polygon][[$img/ok.png]][[$img/nyi.png]]]
+[[MultiPoint][[$img/ok.png]][[$img/nyi.png]]]
+[[MultiLinestring][[$img/ok.png]][[$img/nyi.png]]]
+[[MultiPolygon][[$img/ok.png]][[$img/nyi.png]]]
 ]
 
 
@@ -69,4 +69,5 @@ side_straight
 * DistanceStrategy: [link geometry.reference.strategies.strategy_buffer_distance_asymmetric distance_asymmetric]
 * PointStrategy: [link geometry.reference.strategies.strategy_buffer_point_circle point_circle (cartesian)]
 * PointStrategy: [link geometry.reference.strategies.strategy_buffer_point_square point_square (cartesian)]
+* PointStrategy: [link geometry.reference.strategies.strategy_buffer_geographic_point_circle geographic_point_circle (geographic)]
 * SideStrategy: [link geometry.reference.strategies.strategy_buffer_side_straight side_straight (cartesian)]

doc/reference/algorithms/line_interpolate.qbk

@@ -0,0 +1,21 @@
+[/============================================================================
+  Boost.Geometry
+
+  Copyright (c) 2018, Oracle and/or its affiliates.
+  Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+
+  Use, modification and distribution is subject to the Boost Software License,
+  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+  http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================/]
+
+[def __this_function__ line_interpolate_point]
+
+[heading_conformance_no_ogc __this_function__]
+[note PostGIS contains an algorithm ST_LineInterpolatePoints with similar functionality.
+  See the [@https://postgis.net/docs/ST_LineInterpolatePoints.html PostGIS documentation].
+]
+
+[heading Behavior]
+The algorithm iterates among segments of the linestring and computes interpolation
+points if needed.

doc/release_notes.qbk

@@ -7,7 +7,7 @@
   Copyright (c) 2011-2017 Adam Wulkiewicz, Lodz, Poland.
 
   This file was modified by Oracle on 2015, 2017, 2018.
-  Modifications copyright (c) 2015-2018, Oracle and/or its affiliates.
+  Modifications copyright (c) 2015-2019, Oracle and/or its affiliates.
   Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
   Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
   Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@@ -19,6 +19,18 @@
 
 [section:release_notes Release Notes]
 
+[/=================]
+[heading Boost 1.70]
+[/=================]
+
+[*Improvements]
+
+* [@https://github.com/boostorg/geometry/pull/526 526] New line interpolate algorithm.
+
+[*Bugfixes]
+
+* [@https://github.com/boostorg/geometry/pull/553 553] Pass spheroid correctly in geographic comparable strategies.
+
 [/=================]
 [heading Boost 1.69]
 [/=================]
@@ -51,7 +63,7 @@
 * [@https://github.com/boostorg/geometry/pull/469 469] Horizontal grid shift (nadgrids) in SRS transformations (undocumented for now due to potential interface changes).
 * [@https://github.com/boostorg/geometry/pull/478 478] Box-Segment distance for spherical and geographic coordinate systems.
 * [@https://github.com/boostorg/geometry/pull/487 487] Missing combinations of geometries in distance for spherical and geographic cs
-* [@https://github.com/boostorg/geometry/pull/489 489] Additional direct geodesic problem formulas for internal use 
+* [@https://github.com/boostorg/geometry/pull/489 489] Additional direct geodesic problem formulas for internal use
 
 [*Solved issues]
 
@@ -355,7 +367,7 @@
 [*Bugfixes]
 
 * Bug in multipoint/polygon multipoint/multipolygon distance computation (wrong detection of points inside the areal geometry)
-* Bug in flatten_iterator's assignment operator causing an access violation 
+* Bug in flatten_iterator's assignment operator causing an access violation
 * Bug in Cartesian segment-segment intersection strategy when one segment degenerates to a point and is collinear to the other non-degenerate segment
 * Bug in centroid(), non-deterministic result if calculated for e.g. a Polygon with zero-area.
 * Bug in buffers for joins with a limited number of points
@@ -676,9 +688,9 @@
 [*Additional coordinate types]
 
 * Basic (limited) support for Boost.Rational
-         
+
 [heading Boost 1.47]
 
-Original release         
+Original release
 
 [endsect]