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

[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  ded33834934a547ecfd3a885f096bfcb2e2b8e3f (commit)
      from  790f14e27d734b8ed253c1238de5f3155299afcc (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 ded33834934a547ecfd3a885f096bfcb2e2b8e3f
Author: Daniel Baston <dbaston at gmail.com>
Date:   Sun Jul 13 21:12:39 2025 -0400

    C API: Move def of GEOSOverlapMerge to be accessible with GEOS_USE_ONLY_R_API (#1285)

diff --git a/capi/geos_c.h.in b/capi/geos_c.h.in
index 5e4a72b3c..35389fd93 100644
--- a/capi/geos_c.h.in
+++ b/capi/geos_c.h.in
@@ -261,6 +261,21 @@ enum GEOSWKBFlavors {
     GEOS_WKB_ISO = 2
 };
 
+/**
+* Overlap repair strategies.
+* \see GEOSCoverageCleanParams_setOverlapMergeStrategy
+*/
+enum GEOSOverlapMerge {
+    /** Merge strategy that chooses polygon with longest common border */
+    GEOS_MERGE_LONGEST_BORDER = 0,
+    /** Merge strategy that chooses polygon with maximum area */
+    GEOS_MERGE_MAX_AREA       = 1,
+    /** Merge strategy that chooses polygon with minimum area */
+    GEOS_MERGE_MIN_AREA       = 2,
+    /** Merge strategy that chooses polygon with smallest input index */
+    GEOS_MERGE_MIN_INDEX      = 3
+};
+
 /**
 * Callback function for use in spatial index search calls. Pass into
 * the query function and handle query results as the index
@@ -4427,21 +4442,6 @@ GEOSCoverageCleanParams_setGapMaximumWidth(
     GEOSCoverageCleanParams* params,
     double gapMaximumWidth);
 
-/**
-* Overlap repair strategies.
-* \see GEOSCoverageCleanParams_setOverlapMergeStrategy
-*/
-enum GEOSOverlapMerge {
-    /** Merge strategy that chooses polygon with longest common border */
-    GEOS_MERGE_LONGEST_BORDER = 0,
-    /** Merge strategy that chooses polygon with maximum area */
-    GEOS_MERGE_MAX_AREA       = 1,
-    /** Merge strategy that chooses polygon with minimum area */
-    GEOS_MERGE_MIN_AREA       = 2,
-    /** Merge strategy that chooses polygon with smallest input index */
-    GEOS_MERGE_MIN_INDEX      = 3
-};
-
 /*
 * Sets the overlap merge strategy to use, using one from \ref GEOSOverlapMerge.
 * Overlaps are merged with an adjacent polygon chosen according to a specified merge strategy.

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

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


hooks/post-receive
-- 
GEOS