Update to GEOS 3.9.1

Fixes r-spatial/sf#1781 (comment)

Author: jeroen

README.md

@@ -3,7 +3,7 @@
 Windows build of GDAL 3 stack:
  - [gdal 3.2.1](https://github.com/r-windows/rtools-packages/tree/master/mingw-w64-gdal)
  - [proj 7.2.1](https://github.com/r-windows/rtools-packages/tree/master/mingw-w64-proj)
- - [geos 3.9.0](https://github.com/r-windows/rtools-packages/tree/master/mingw-w64-geos)
+ - [geos 3.9.1](https://github.com/r-windows/rtools-packages/tree/master/mingw-w64-geos)
  - Dependencies were built with rtools40 GCC 8.3.0 [rtools-packages](https://github.com/r-windows/rtools-packages)
 
 The binaires in [lib-4.9.3](lib-4.9.3) are needed to build on R 3.3-3.6 and were built with [rtools-backports](https://github.com/r-windows/rtools-backports).

include/geos-3.9.0/geos/algorithm/Orientation.h

@@ -89,6 +89,32 @@ class GEOS_DLL Orientation {
     */
     static bool isCCW(const geom::CoordinateSequence* ring);
 
+    /**
+    * Tests if a ring defined by a CoordinateSequence is
+    * oriented counter-clockwise, using the signed area of the ring.
+    *
+    *  * The list of points is assumed to have the first and last points equal.
+    *  * This handles coordinate lists which contain repeated points.
+    *  * This handles rings which contain collapsed segments
+    *    (in particular, along the top of the ring).
+    *  * This handles rings which are invalid due to self-intersection
+    *
+    * This algorithm is guaranteed to work with valid rings.
+    * For invalid rings (containing self-intersections),
+    * the algorithm determines the orientation of
+    * the largest enclosed area (including overlaps).
+    * This provides a more useful result in some situations, such as buffering.
+    *
+    * However, this approach may be less accurate in the case of
+    * rings with almost zero area.
+    * (Note that the orientation of rings with zero area is essentially
+    * undefined, and hence non-deterministic.)
+    *
+    * @param ring a CoordinateSequence forming a ring (with first and last point identical)
+    * @return true if the ring is oriented counter-clockwise.
+    */
+    static bool isCCWArea(const geom::CoordinateSequence* ring);
+
 };
 
 

include/geos-3.9.0/geos/operation/overlayng/EdgeMerger.h

@@ -59,32 +59,23 @@ namespace overlayng { // geos.operation.overlayng
  * This ensures that the overlay output line direction will be as consistent
  * as possible with input lines.
  *
+ * The merger also preserves the order of the edges in the input.
+ * This means that for polygon-line overlay
+ * the result lines will be in the same order as in the input
+ * (possibly with multiple result lines for a single input line).
+ *
  * @author mdavis
  *
  */
 class GEOS_DLL EdgeMerger {
 
-private:
-
-
-    // Members
-    std::vector<Edge*>& edges;
-    std::map<EdgeKey, Edge*> edgeMap;
-
 public:
 
-    // Methods
-    EdgeMerger(std::vector<Edge*>& p_edges);
-
     static std::vector<Edge*> merge(std::vector<Edge*>& edges);
 
-    std::vector<Edge*> merge();
-
-
 };
 
 
 } // namespace geos.operation.overlayng
 } // namespace geos.operation
 } // namespace geos
-

include/geos-3.9.0/geos/version.h

@@ -23,11 +23,11 @@
 #endif
 
 #ifndef GEOS_VERSION_PATCH
-#define GEOS_VERSION_PATCH 0
+#define GEOS_VERSION_PATCH 1
 #endif
 
 #ifndef GEOS_VERSION
-#define GEOS_VERSION "3.9.0"
+#define GEOS_VERSION "3.9.1"
 #endif
 
 #ifndef GEOS_JTS_PORT

include/geos-3.9.0/geos_c.h

@@ -58,19 +58,19 @@ extern "C" {
 #define GEOS_VERSION_MINOR 9
 #endif
 #ifndef GEOS_VERSION_PATCH
-#define GEOS_VERSION_PATCH 0
+#define GEOS_VERSION_PATCH 1
 #endif
 #ifndef GEOS_VERSION
-#define GEOS_VERSION "3.9.0"
+#define GEOS_VERSION "3.9.1"
 #endif
 #ifndef GEOS_JTS_PORT
 #define GEOS_JTS_PORT "1.17.0"
 #endif
 
 #define GEOS_CAPI_VERSION_MAJOR 1
-#define GEOS_CAPI_VERSION_MINOR 16
+#define GEOS_CAPI_VERSION_MINOR 14
 #define GEOS_CAPI_VERSION_PATCH 2
-#define GEOS_CAPI_VERSION "3.9.0-CAPI-1.16.2"
+#define GEOS_CAPI_VERSION "3.9.1-CAPI-1.14.2"
 
 #define GEOS_CAPI_FIRST_INTERFACE GEOS_CAPI_VERSION_MAJOR
 #define GEOS_CAPI_LAST_INTERFACE (GEOS_CAPI_VERSION_MAJOR+GEOS_CAPI_VERSION_MINOR)

include/geos-3.9.1

@@ -0,0 +1 @@
+geos-3.9.0