[geos-commits] [SCM] GEOS branch main updated. cf1e312f0f6707ec74facbaababf00424006456b

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, main has been updated
       via  cf1e312f0f6707ec74facbaababf00424006456b (commit)
       via  a911163d5f4d065695be733d46fd078901928c86 (commit)
       via  c7c4495543bb91ed902ca068da3ac7d512e6a66c (commit)
      from  2f9e7531804e3a4f09823d8f1b9536cb04d313bf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cf1e312f0f6707ec74facbaababf00424006456b
Author: Martin Davis <mtnclimb at gmail.com>
Date:   Tue Jul 18 12:00:52 2023 -0700

    Improve C API doc for LineMerge

diff --git a/capi/geos_c.h.in b/capi/geos_c.h.in
index a45685cf4..271624334 100644
--- a/capi/geos_c.h.in
+++ b/capi/geos_c.h.in
@@ -4449,10 +4449,12 @@ extern GEOSGeometry GEOS_DLL *GEOSDensify(
     double tolerance);
 
 /**
-* Sews together a set of fully noded LineStrings
-* removing any cardinality 2 nodes in the linework.
+* Merges a set of LineStrings,
+* joining them at nodes which have cardinality 2.
+* Lines may have their direction reversed.
+
 * \param g The input linework
-* \return The merged linework
+* \return The merged linework.
 * Caller is responsible for freeing with GEOSGeom_destroy().
 * \see geos::operation::linemerge::LineMerger
 * \since 2.2
@@ -4460,11 +4462,13 @@ extern GEOSGeometry GEOS_DLL *GEOSDensify(
 extern GEOSGeometry GEOS_DLL *GEOSLineMerge(const GEOSGeometry* g);
 
 /**
-* Sews together a set of fully noded LineStrings
-* removing any cardinality 2 nodes in the linework
-* only if possible without changing order of points.
+* Merges a set of LineStrings,
+* joining them at nodes which have cardinality 2.
+* and where the lines have the same direction.
+* This means that lines do not have their direction reversed.
+
 * \param g The input linework
-* \return The merged linework
+* \return The merged linework.
 * Caller is responsible for freeing with GEOSGeom_destroy().
 * \see geos::operation::linemerge::LineMerger
 *

commit a911163d5f4d065695be733d46fd078901928c86
Author: Martin Davis <mtnclimb at gmail.com>
Date:   Tue Jul 18 11:53:39 2023 -0700

    Add doxygen formatting

diff --git a/capi/geos_c.h.in b/capi/geos_c.h.in
index 7ff9f9de0..a45685cf4 100644
--- a/capi/geos_c.h.in
+++ b/capi/geos_c.h.in
@@ -4140,14 +4140,14 @@ extern GEOSGeometry GEOS_DLL *GEOSMaximumInscribedCircle(
 * the obstacles (up to the given distance tolerance).
 * The LEC is determined by the center point and a point indicating the circle radius
 * (which will lie on an obstacle).
-*
+* \n
 * To compute an LEC which lies **wholly** within a polygonal boundary, 
 * include the boundary of the polygon(s) as a linear obstacle.
-*
+* \n
 * The implementation uses a successive-approximation technique over a grid of square cells covering the obstacles and boundary.
 * The grid is refined using a branch-and-bound algorithm.  Point containment and distance are computed in a performant
 * way by using spatial indexes.
-*
+* \n
 * Returns the LEC radius as a two-point linestring, with the start point at the center of the inscribed circle and the end
 * on the boundary of the circle.
 *

commit c7c4495543bb91ed902ca068da3ac7d512e6a66c
Author: Martin Davis <mtnclimb at gmail.com>
Date:   Tue Jul 18 11:50:14 2023 -0700

    Improve comment for GEOSFree

diff --git a/capi/geos_c.h.in b/capi/geos_c.h.in
index 3466cef60..7ff9f9de0 100644
--- a/capi/geos_c.h.in
+++ b/capi/geos_c.h.in
@@ -2098,7 +2098,9 @@ extern void GEOS_DLL finishGEOS(void);
 * Free strings and byte buffers returned by functions such
 * as GEOSWKBWriter_write(),
 * GEOSWKBWriter_writeHEX() and GEOSWKTWriter_write(), etc.
-* \param buffer The memory to free
+* If passed a null pointer the function does nothing.
+
+* \param buffer The memory to free (may be null)
 * \since 3.1
 */
 extern void GEOS_DLL GEOSFree(void *buffer);

-----------------------------------------------------------------------

Summary of changes:
 capi/geos_c.h.in | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GEOS