[Git][debian-gis-team/geos][experimental] 7 commits: New upstream version 3.11.0~beta2

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch experimental at Debian GIS Project / geos


Commits:
aa268a59 by Bas Couwenberg at 2022-06-20T19:38:05+02:00
New upstream version 3.11.0~beta2
- - - - -
9f8f3a75 by Bas Couwenberg at 2022-06-20T19:38:14+02:00
Update upstream source from tag 'upstream/3.11.0_beta2'

Update to upstream version '3.11.0~beta2'
with Debian dir fac38f61c61c8715581bafc66db2c93308c6b684
- - - - -
69017578 by Bas Couwenberg at 2022-06-20T19:38:59+02:00
New upstream beta release.

- - - - -
6bdace08 by Bas Couwenberg at 2022-06-20T19:41:10+02:00
Revert web directory exclusion, fixed upstream.

Revert "Exclude web directory from upstream tree."

This reverts commit 813e7ff435a72620226d8e87640284289f88c762.

- - - - -
979352c4 by Bas Couwenberg at 2022-06-20T19:43:35+02:00
Update symbols for other architectures.

- - - - -
055ff76f by Bas Couwenberg at 2022-06-20T20:03:10+02:00
Update symbols for amd64.

- - - - -
12c57d8f by Bas Couwenberg at 2022-06-20T20:03:10+02:00
Set distribution to experimental.

- - - - -


24 changed files:

- CMakeLists.txt
- NEWS.md
- Version.txt
- capi/geos_c.cpp
- capi/geos_c.h.in
- capi/geos_ts_c.cpp
- debian/changelog
- debian/copyright
- debian/libgeos-c1v5.symbols
- debian/libgeos3.11.0.symbols
- − debian/patches/no-web.patch
- − debian/patches/series
- debian/watch
- include/geos/geom/CoordinateSequence.h
- include/geos/io/WKBReader.h
- include/geos/io/WKTReader.h
- release.md
- src/geom/CoordinateSequence.cpp
- src/io/WKBReader.cpp
- src/io/WKTReader.cpp
- src/operation/buffer/BufferCurveSetBuilder.cpp
- tests/unit/capi/GEOSGeomFromWKBTest.cpp
- tests/unit/capi/GEOSPolygonHullSimplifyTest.cpp
- tests/unit/io/WKTReaderTest.cpp


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -200,19 +200,6 @@ target_compile_options(geos_cxx_flags INTERFACE
 # works with multi-configuration generators.
 target_compile_definitions(geos_cxx_flags INTERFACE $<$<NOT:$<CONFIG:Debug>>:NDEBUG>)
 
-#-----------------------------------------------------------------------------
-# Target geos_cxx_flags: overlayng code
-#-----------------------------------------------------------------------------
-#option(DISABLE_OVERLAYNG "Disable overlayng algorithms" OFF)
-#if(DISABLE_OVERLAYNG)
-#  target_compile_definitions(geos_cxx_flags INTERFACE DISABLE_OVERLAYNG)
-#  message(STATUS
-#    "GEOS: OverlayNG DISABLED")
-#else()
-#  message(STATUS
-#    "GEOS: OverlayNG ENABLED")
-#endif()
-
 #-----------------------------------------------------------------------------
 # Target geos_developer_cxx_flags: developer mode compilation flags
 #-----------------------------------------------------------------------------
@@ -275,15 +262,20 @@ target_link_libraries(geos PUBLIC geos_cxx_flags PRIVATE $<BUILD_INTERFACE:ryu>)
 add_subdirectory(include)
 add_subdirectory(src)
 
+# Some packagers would like the DLL files generated by MinGW to
+# include version numbers in the file name. Others would rather
+# they not (which is the cmake default).
+option(VERSION_MINGW_SHARED_LIBS "Add version suffix to MinGW shared libraries" OFF)
+
 if(BUILD_SHARED_LIBS)
   target_compile_definitions(geos
     PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,GEOS_DLL_EXPORT,DLL_EXPORT>)
 
   set_target_properties(geos PROPERTIES VERSION ${GEOS_VERSION_NOPATCH})
   set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION_NOPATCH})
- if(MINGW)
-   set_target_properties(geos PROPERTIES SUFFIX "-${GEOS_VERSION_NOPATCH}${CMAKE_SHARED_LIBRARY_SUFFIX}")
- endif(MINGW)
+  if(MINGW AND VERSION_MINGW_SHARED_LIBS)
+    set_target_properties(geos PROPERTIES SUFFIX "-${GEOS_VERSION_NOPATCH}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+  endif()
 endif()
 
 #-----------------------------------------------------------------------------
@@ -301,9 +293,9 @@ if(BUILD_SHARED_LIBS)
   if(NOT WIN32 OR MINGW)
     set_target_properties(geos_c PROPERTIES SOVERSION ${CAPI_VERSION_MAJOR})
   endif()
-  if(MINGW)
+  if(MINGW AND VERSION_MINGW_SHARED_LIBS)
     set_target_properties(geos_c PROPERTIES SUFFIX "-${CAPI_VERSION_MAJOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
-  endif(MINGW)
+  endif()
 endif()
 
 add_subdirectory(capi)
@@ -342,7 +334,9 @@ endif()
 #-----------------------------------------------------------------------------
 # Web Site
 #-----------------------------------------------------------------------------
-if(PROJECT_IS_TOP_LEVEL)
+option(BUILD_WEBSITE "Build website" OFF)
+
+if(PROJECT_IS_TOP_LEVEL AND BUILD_WEBSITE)
   add_subdirectory(web)
 endif()
 
@@ -444,6 +438,7 @@ if(PROJECT_IS_TOP_LEVEL)
       "/tools/geos-config\$"
       "/tools/geos\\\\.pc\$"
       "/bin/"
+      "/web/"
       ${CMAKE_CURRENT_BINARY_DIR}
       )
 


=====================================
NEWS.md
=====================================
@@ -1,5 +1,5 @@
-## Changes in 3.11.0beta1
-2022-06-12
+## Changes in 3.11.0beta2
+2022-06-20
 
 - New things:
   - OffsetCurve (GH-530, Paul Ramsey/Martin Davis)


=====================================
Version.txt
=====================================
@@ -5,7 +5,7 @@ GEOS_VERSION_MINOR=11
 GEOS_VERSION_PATCH=0
 
 # OPTIONS: "", "dev", "rc1" etc.
-GEOS_PATCH_WORD=beta1
+GEOS_PATCH_WORD=beta2
 
 # GEOS CAPI Versions
 #


=====================================
capi/geos_c.cpp
=====================================
@@ -486,11 +486,12 @@ extern "C" {
     }
 
     Geometry*
-    GEOSPolygonHullSimplifyByArea(const Geometry* g,
+    GEOSPolygonHullSimplifyMode(const Geometry* g,
                             unsigned int isOuter,
-                            double areaDeltaRatio)
+                            unsigned int parameterMode,
+                            double parameter)
     {
-        return GEOSPolygonHullSimplifyByArea_r(handle, g, isOuter, areaDeltaRatio);
+        return GEOSPolygonHullSimplifyMode_r(handle, g, isOuter, parameterMode, parameter);
     }
 
     Geometry*
@@ -1219,6 +1220,11 @@ extern "C" {
         GEOSWKTReader_destroy_r(handle, reader);
     }
 
+    void
+    GEOSWKTReader_setFixStructure(WKTReader* reader, char doFix)
+    {
+        GEOSWKTReader_setFixStructure_r(handle, reader, doFix);
+    }
 
     Geometry*
     GEOSWKTReader_read(WKTReader* reader, const char* wkt)
@@ -1288,6 +1294,11 @@ extern "C" {
         GEOSWKBReader_destroy_r(handle, reader);
     }
 
+    void
+    GEOSWKBReader_setFixStructure(WKBReader* reader, char doFix)
+    {
+        GEOSWKBReader_setFixStructure_r(handle, reader, doFix);
+    }
 
     Geometry*
     GEOSWKBReader_read(WKBReader* reader, const unsigned char* wkb, std::size_t size)


=====================================
capi/geos_c.h.in
=====================================
@@ -782,11 +782,12 @@ extern GEOSGeometry GEOS_DLL *GEOSPolygonHullSimplify_r(
     double vertexNumFraction);
 
 /** \see GEOSPolygonHullSimplifyByArea */
-extern GEOSGeometry GEOS_DLL *GEOSPolygonHullSimplifyByArea_r(
+extern GEOSGeometry GEOS_DLL *GEOSPolygonHullSimplifyMode_r(
     GEOSContextHandle_t handle,
     const GEOSGeometry* g,
     unsigned int isOuter,
-    double areaDeltaRatio);
+    unsigned int parameterMode,
+    double parameter);
 
 /** \see GEOSConcaveHullOfPolygons */
 extern GEOSGeometry GEOS_DLL *GEOSConcaveHullOfPolygons_r(
@@ -1743,6 +1744,12 @@ extern GEOSGeometry GEOS_DLL *GEOSWKTReader_read_r(
     GEOSWKTReader* reader,
     const char *wkt);
 
+/** \see GEOSWKTReader_setFixStructure */
+extern void GEOS_DLL GEOSWKTReader_setFixStructure_r(
+    GEOSContextHandle_t handle,
+    GEOSWKTReader *reader,
+    char doFix);
+
 /* ========== WKT Writer ========== */
 
 /** \see GEOSWKTReader_create */
@@ -1800,6 +1807,12 @@ extern void GEOS_DLL GEOSWKBReader_destroy_r(
     GEOSContextHandle_t handle,
     GEOSWKBReader* reader);
 
+/** \see GEOSWKBReader_setFixStructure */
+extern void GEOS_DLL GEOSWKBReader_setFixStructure_r(
+    GEOSContextHandle_t handle,
+    GEOSWKBReader *reader,
+    char doFix);
+
 /** \see GEOSWKBReader_read */
 extern GEOSGeometry GEOS_DLL *GEOSWKBReader_read_r(
     GEOSContextHandle_t handle,
@@ -1814,6 +1827,7 @@ extern GEOSGeometry GEOS_DLL *GEOSWKBReader_readHEX_r(
     const unsigned char *hex,
     size_t size);
 
+
 /* ========== WKB Writer ========== */
 
 /** \see GEOSWKBWriter_create */
@@ -1891,7 +1905,7 @@ extern GEOSGeoJSONReader GEOS_DLL *GEOSGeoJSONReader_create_r(
 extern void GEOS_DLL GEOSGeoJSONReader_destroy_r(GEOSContextHandle_t handle,
     GEOSGeoJSONReader* reader);
 
-/** \see GEOSWKTReader_read */
+/** \see GEOSGeoJSONReader_read */
 extern GEOSGeometry GEOS_DLL *GEOSGeoJSONReader_readGeometry_r(
     GEOSContextHandle_t handle,
     GEOSGeoJSONReader* reader,
@@ -3483,6 +3497,7 @@ extern GEOSGeometry GEOS_DLL *GEOSConcaveHull(
     double ratio,
     unsigned int allowHoles);
 
+
 /**
 * Computes a boundary-respecting hull of a polygonal geometry,
 * with hull shape determined by a target parameter
@@ -3505,26 +3520,39 @@ extern GEOSGeometry GEOS_DLL *GEOSPolygonHullSimplify(
     unsigned int isOuter,
     double vertexNumFraction);
 
+
+/**
+* Controls the behavior of the GEOSPolygonHullSimplify parameter.
+*/
+enum GEOSPolygonHullParameterModes {
+    /** See geos::simplify::PolygonHullSimplifier::hull() */
+    GEOSHULL_PARAM_VERTEX_RATIO = 1,
+    /** See geos::simplify::PolygonHullSimplifier::hullByAreaDelta() */
+    GEOSHULL_PARAM_AREA_RATIO = 2
+};
+
 /**
 * Computes a topology-preserving simplified hull of a polygonal geometry,
-* with hull shape determined by the areaDeltaRatio,
-* specifying the ratio of maximum difference in area to original area.
-* Larger values compute less concave results.
-* A value of 0 produces the original geometry.
-* Either outer or inner hulls can be computed..
+* with hull shape determined by the parameter, controlled by a parameter
+* mode, which is one defined in GEOSPolygonHullParameterModes. In general,
+* larger values compute less concave results and value of 0
+* produces the original geometry.
+* Either outer or inner hulls can be computed.
 *
 * \param g the polygonal geometry to process
 * \param isOuter indicates whether to compute an outer or inner hull (1 for outer hull, 0 for inner)
-* \param areaDeltaRatio the target ratio of area difference to original area
+* \param parameterMode the interpretation to apply to the parameter argument
+* \param parameter the target ratio of area difference to original area
 * \return A newly allocated geometry of the concave hull. NULL on exception.
 *
 * Caller is responsible for freeing with GEOSGeom_destroy().
 * \see geos::simplify::PolygonHullSimplifier
 */
-extern GEOSGeometry GEOS_DLL *GEOSPolygonHullSimplifyByArea(
+extern GEOSGeometry GEOS_DLL *GEOSPolygonHullSimplifyMode(
     const GEOSGeometry* g,
     unsigned int isOuter,
-    double areaDeltaRatio);
+    unsigned int parameterMode,
+    double parameter);
 
 /**
 * Constructs a concave hull of a set of polygons, respecting
@@ -4614,6 +4642,16 @@ extern GEOSGeometry GEOS_DLL *GEOSWKTReader_read(
     GEOSWKTReader* reader,
     const char *wkt);
 
+/**
+* Set the reader to automatically repair structural errors
+* in the input (currently just unclosed rings) while reading.
+* \param reader A WKT reader object, caller retains ownership
+* \param doFix Set to 1 to repair, 0 for no repair (default).
+*/
+extern void GEOS_DLL GEOSWKTReader_setFixStructure(
+    GEOSWKTReader *reader,
+    char doFix);
+
 /* ========= WKT Writer ========= */
 
 /**
@@ -4712,6 +4750,16 @@ extern GEOSWKBReader GEOS_DLL *GEOSWKBReader_create(void);
 extern void GEOS_DLL GEOSWKBReader_destroy(
     GEOSWKBReader* reader);
 
+/**
+* Set the reader to automatically repair structural errors
+* in the input (currently just unclosed rings) while reading.
+* \param reader A WKB reader object, caller retains ownership
+* \param doFix Set to 1 to repair, 0 for no repair (default).
+*/
+extern void GEOS_DLL GEOSWKBReader_setFixStructure(
+    GEOSWKBReader *reader,
+    char doFix);
+
 /**
 * Read a geometry from a well-known binary buffer.
 * \param reader A \ref GEOSWKBReader


=====================================
capi/geos_ts_c.cpp
=====================================
@@ -1251,15 +1251,26 @@ extern "C" {
     }
 
     Geometry*
-    GEOSPolygonHullSimplifyByArea_r(GEOSContextHandle_t extHandle,
+    GEOSPolygonHullSimplifyMode_r(GEOSContextHandle_t extHandle,
         const Geometry* g1,
         unsigned int isOuter,
-        double areaDeltaRatio)
+        unsigned int parameterMode,
+        double parameter)
     {
         return execute(extHandle, [&]() {
-            std::unique_ptr<Geometry> g3 = PolygonHullSimplifier::hullByAreaDelta(g1, isOuter, areaDeltaRatio);
-            g3->setSRID(g1->getSRID());
-            return g3.release();
+            if (parameterMode == GEOSHULL_PARAM_AREA_RATIO) {
+                std::unique_ptr<Geometry> g3 = PolygonHullSimplifier::hullByAreaDelta(g1, isOuter, parameter);
+                g3->setSRID(g1->getSRID());
+                return g3.release();
+            }
+            else if (parameterMode == GEOSHULL_PARAM_VERTEX_RATIO) {
+                std::unique_ptr<Geometry> g3 = PolygonHullSimplifier::hull(g1, isOuter, parameter);
+                g3->setSRID(g1->getSRID());
+                return g3.release();
+            }
+            else {
+                throw IllegalArgumentException("GEOSPolygonHullSimplifyMode_r: Unknown parameterMode");
+            }
         });
     }
 
@@ -3029,6 +3040,14 @@ extern "C" {
         });
     }
 
+    void
+    GEOSWKTReader_setFixStructure_r(GEOSContextHandle_t extHandle, WKTReader* reader, char doFix)
+    {
+        return execute(extHandle, [&]() {
+            return reader->setFixStructure(doFix);
+        });
+    }
+
     Geometry*
     GEOSWKTReader_read_r(GEOSContextHandle_t extHandle, WKTReader* reader, const char* wkt)
     {
@@ -3128,6 +3147,14 @@ extern "C" {
         });
     }
 
+    void
+    GEOSWKBReader_setFixStructure_r(GEOSContextHandle_t extHandle, WKBReader* reader, char doFix)
+    {
+        return execute(extHandle, [&]() {
+            return reader->setFixStructure(doFix);
+        });
+    }
+
     struct membuf : public std::streambuf {
         membuf(char* s, std::size_t n)
         {


=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+geos (3.11.0~beta2-1~exp1) experimental; urgency=medium
+
+  * New upstream beta release.
+  * Revert web directory exclusion, fixed upstream.
+  * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 20 Jun 2022 19:45:02 +0200
+
 geos (3.11.0~beta1-1~exp1) experimental; urgency=medium
 
   * New upstream beta release.


=====================================
debian/copyright
=====================================
@@ -2,8 +2,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: GEOS
 Upstream-Contact: GEOS Developers <geos-devel at lists.osgeo.org>
 Source: https://download.osgeo.org/geos/
-Comment: The upstream tarball is repacked to exclude the upstream website sources.
-Files-Excluded: web/*
 
 Files: *
 Copyright:        1995, INRIA Prisme Project


=====================================
debian/libgeos-c1v5.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 3.11.0~beta1 amd64
+# SymbolsHelper-Confirmed: 3.11.0~beta2 amd64
 libgeos_c.so.1 #PACKAGE# #MINVER#
 * Build-Depends-Package: libgeos-dev
  GEOSArea at Base 3.4.2
@@ -302,8 +302,8 @@ libgeos_c.so.1 #PACKAGE# #MINVER#
  GEOSPointOnSurface at Base 3.4.2
  GEOSPointOnSurface_r at Base 3.4.2
  GEOSPolygonHullSimplify at Base 3.11.0~beta1
- GEOSPolygonHullSimplifyByArea at Base 3.11.0~beta1
- GEOSPolygonHullSimplifyByArea_r at Base 3.11.0~beta1
+ GEOSPolygonHullSimplifyMode at Base 3.11.0~beta2
+ GEOSPolygonHullSimplifyMode_r at Base 3.11.0~beta2
  GEOSPolygonHullSimplify_r at Base 3.11.0~beta1
  GEOSPolygonize at Base 3.4.2
  GEOSPolygonize_full at Base 3.4.2
@@ -415,6 +415,8 @@ libgeos_c.so.1 #PACKAGE# #MINVER#
  GEOSWKBReader_readHEX at Base 3.4.2
  GEOSWKBReader_readHEX_r at Base 3.4.2
  GEOSWKBReader_read_r at Base 3.4.2
+ GEOSWKBReader_setFixStructure at Base 3.11.0~beta2
+ GEOSWKBReader_setFixStructure_r at Base 3.11.0~beta2
  GEOSWKBWriter_create at Base 3.4.2
  GEOSWKBWriter_create_r at Base 3.4.2
  GEOSWKBWriter_destroy at Base 3.4.2
@@ -445,6 +447,8 @@ libgeos_c.so.1 #PACKAGE# #MINVER#
  GEOSWKTReader_destroy_r at Base 3.4.2
  GEOSWKTReader_read at Base 3.4.2
  GEOSWKTReader_read_r at Base 3.4.2
+ GEOSWKTReader_setFixStructure at Base 3.11.0~beta2
+ GEOSWKTReader_setFixStructure_r at Base 3.11.0~beta2
  GEOSWKTWriter_create at Base 3.4.2
  GEOSWKTWriter_create_r at Base 3.4.2
  GEOSWKTWriter_destroy at Base 3.4.2


=====================================
debian/libgeos3.11.0.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 3.11.0~beta1 amd64
+# SymbolsHelper-Confirmed: 3.11.0~beta2 amd64
 libgeos.so.3.11.0 #PACKAGE# #MINVER#
 * Build-Depends-Package: libgeos++-dev
  (optional=templinst|subst)_ZN13geos_nlohmann10basic_jsonINS_11ordered_mapESt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb{int64_t}{uint64_t}dSaNS_14adl_serializerES2_IhSaIhEEE10json_value7destroyENS_6detail7value_tE at Base 3.10.0
@@ -445,6 +445,7 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  _ZN4geos2io9WKBReader14readLineStringEv at Base 3.4.2
  _ZN4geos2io9WKBReader14readLinearRingEv at Base 3.4.2
  _ZN4geos2io9WKBReader14readMultiPointEv at Base 3.4.2
+ _ZN4geos2io9WKBReader15setFixStructureEb at Base 3.11.0~beta2
  _ZN4geos2io9WKBReader16readMultiPolygonEv at Base 3.4.2
  _ZN4geos2io9WKBReader19readMultiLineStringEv at Base 3.4.2
  _ZN4geos2io9WKBReader22readCoordinateSequenceEj at Base 3.10.0
@@ -622,7 +623,6 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  (arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos4geom18CoordinateSequence28atLeastNCoordinatesOrNothingEjPS1_ at Base 3.4.2
  (arch=alpha amd64 arm64 ia64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZN4geos4geom18CoordinateSequence28atLeastNCoordinatesOrNothingEmPS1_ at Base 3.7.0
  _ZN4geos4geom18CoordinateSequence6equalsEPKS1_S3_ at Base 3.4.2
- _ZN4geos4geom18CoordinateSequence6isRingEPKS1_ at Base 3.9.0
  _ZN4geos4geom18CoordinateSequence6scrollEPS1_PKNS0_10CoordinateE at Base 3.4.2
  _ZN4geos4geom18CoordinateSequence7indexOfEPKNS0_10CoordinateEPKS1_ at Base 3.4.2
  _ZN4geos4geom18CoordinateSequence7reverseEPS1_ at Base 3.4.2
@@ -1137,18 +1137,27 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  _ZN4geos5index13intervalrtree25SortedPackedIntervalRTree4initEv at Base 3.4.2
  _ZN4geos5index13intervalrtree25SortedPackedIntervalRTree5queryEddPNS0_11ItemVisitorE at Base 3.4.2
  _ZN4geos5index13intervalrtree25SortedPackedIntervalRTree9buildTreeEv at Base 3.4.2
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos5index25VertexSequencePackedRtree11ceilDivisorEjj at Base 3.11.0~beta1
  _ZN4geos5index25VertexSequencePackedRtree11ceilDivisorEmm at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos5index25VertexSequencePackedRtree11isNodeEmptyEjj at Base 3.11.0~beta1
  _ZN4geos5index25VertexSequencePackedRtree11isNodeEmptyEmm at Base 3.11.0~beta1
  _ZN4geos5index25VertexSequencePackedRtree12createBoundsEv at Base 3.11.0~beta1
  _ZN4geos5index25VertexSequencePackedRtree14fillItemBoundsERSt6vectorINS_4geom8EnvelopeESaIS4_EE at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos5index25VertexSequencePackedRtree14levelNodeCountEj at Base 3.11.0~beta1
  _ZN4geos5index25VertexSequencePackedRtree14levelNodeCountEm at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos5index25VertexSequencePackedRtree15fillLevelBoundsEjRSt6vectorINS_4geom8EnvelopeESaIS4_EE at Base 3.11.0~beta1
  _ZN4geos5index25VertexSequencePackedRtree15fillLevelBoundsEmRSt6vectorINS_4geom8EnvelopeESaIS4_EE at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos5index25VertexSequencePackedRtree16isItemsNodeEmptyEj at Base 3.11.0~beta1
  _ZN4geos5index25VertexSequencePackedRtree16isItemsNodeEmptyEm at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos5index25VertexSequencePackedRtree19computeItemEnvelopeERKSt6vectorINS_4geom10CoordinateESaIS4_EEjj at Base 3.11.0~beta1
  _ZN4geos5index25VertexSequencePackedRtree19computeItemEnvelopeERKSt6vectorINS_4geom10CoordinateESaIS4_EEmm at Base 3.11.0~beta1
  _ZN4geos5index25VertexSequencePackedRtree19computeLevelOffsetsEv at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos5index25VertexSequencePackedRtree19computeNodeEnvelopeERKSt6vectorINS_4geom8EnvelopeESaIS4_EEjj at Base 3.11.0~beta1
  _ZN4geos5index25VertexSequencePackedRtree19computeNodeEnvelopeERKSt6vectorINS_4geom8EnvelopeESaIS4_EEmm at Base 3.11.0~beta1
  _ZN4geos5index25VertexSequencePackedRtree5buildEv at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos5index25VertexSequencePackedRtree6removeEj at Base 3.11.0~beta1
  _ZN4geos5index25VertexSequencePackedRtree6removeEm at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos5index25VertexSequencePackedRtree8clampMaxEjj at Base 3.11.0~beta1
  _ZN4geos5index25VertexSequencePackedRtree8clampMaxEmm at Base 3.11.0~beta1
  _ZN4geos5index25VertexSequencePackedRtree9getBoundsEv at Base 3.11.0~beta1
  _ZN4geos5index25VertexSequencePackedRtreeC1ERKSt6vectorINS_4geom10CoordinateESaIS4_EE at Base 3.11.0~beta1
@@ -1731,8 +1740,11 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  _ZN4geos6nodinglsERSoRKNS0_11SegmentNodeE at Base 3.4.2
  _ZN4geos6nodinglsERSoRKNS0_13SegmentStringE at Base 3.4.2
  _ZN4geos6nodinglsERSoRKNS0_15SegmentNodeListE at Base 3.4.2
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos8simplify10LinkedRing15createNextLinksEj at Base 3.11.0~beta1
  _ZN4geos8simplify10LinkedRing15createNextLinksEm at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos8simplify10LinkedRing15createPrevLinksEj at Base 3.11.0~beta1
  _ZN4geos8simplify10LinkedRing15createPrevLinksEm at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos8simplify10LinkedRing6removeEj at Base 3.11.0~beta1
  _ZN4geos8simplify10LinkedRing6removeEm at Base 3.11.0~beta1
  _ZN4geos8simplify13DPTransformer15createValidAreaEPKNS_4geom8GeometryE at Base 3.4.2
  _ZN4geos8simplify13DPTransformer16transformPolygonEPKNS_4geom7PolygonEPKNS2_8GeometryE at Base 3.4.2
@@ -1820,13 +1832,17 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  _ZN4geos8simplify8RingHull10isAtTargetERKNS1_6CornerE at Base 3.11.0~beta1
  _ZN4geos8simplify8RingHull12removeCornerERKNS1_6CornerERSt14priority_queueIS2_St6vectorIS2_SaIS2_EESt4lessIS2_EE at Base 3.11.0~beta1
  _ZN4geos8simplify8RingHull15setMaxAreaDeltaEd at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos8simplify8RingHull15setMinVertexNumEj at Base 3.11.0~beta1
  _ZN4geos8simplify8RingHull15setMinVertexNumEm at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos8simplify8RingHull4areaERKNS0_10LinkedRingEj at Base 3.11.0~beta1
  _ZN4geos8simplify8RingHull4areaERKNS0_10LinkedRingEm at Base 3.11.0~beta1
  _ZN4geos8simplify8RingHull4initERSt6vectorINS_4geom10CoordinateESaIS4_EEb at Base 3.11.0~beta1
  _ZN4geos8simplify8RingHull6Corner12toLineStringERKNS0_10LinkedRingE at Base 3.11.0~beta1
  _ZN4geos8simplify8RingHull7computeERNS0_13RingHullIndexE at Base 3.11.0~beta1
  _ZN4geos8simplify8RingHull7getHullERNS0_13RingHullIndexE at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos8simplify8RingHull8isConvexERKNS0_10LinkedRingEj at Base 3.11.0~beta1
  _ZN4geos8simplify8RingHull8isConvexERKNS0_10LinkedRingEm at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos8simplify8RingHull9addCornerEjRSt14priority_queueINS1_6CornerESt6vectorIS3_SaIS3_EESt4lessIS3_EE at Base 3.11.0~beta1
  _ZN4geos8simplify8RingHull9addCornerEmRSt14priority_queueINS1_6CornerESt6vectorIS3_SaIS3_EESt4lessIS3_EE at Base 3.11.0~beta1
  _ZN4geos8simplify8RingHull9queryHullERKNS_4geom8EnvelopeERSt6vectorINS2_10CoordinateESaIS7_EE at Base 3.11.0~beta1
  _ZN4geos8simplify8RingHullC1EPKNS_4geom10LinearRingEb at Base 3.11.0~beta1
@@ -1994,6 +2010,7 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  _ZN4geos9algorithm4hull17HullTriangulation13findBorderTriERNS_11triangulate3tri7TriListINS1_7HullTriEEE at Base 3.11.0~beta1
  _ZN4geos9algorithm4hull17HullTriangulation13nextBorderTriEPNS1_7HullTriE at Base 3.11.0~beta1
  _ZN4geos9algorithm4hull17HullTriangulation13traceBoundaryERNS_11triangulate3tri7TriListINS1_7HullTriEEE at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos9algorithm4hull17HullTriangulation14HullTriVisitor5visitERSt5arrayIPNS_11triangulate8quadedge8QuadEdgeELj3EE at Base 3.11.0~beta1
  _ZN4geos9algorithm4hull17HullTriangulation14HullTriVisitor5visitERSt5arrayIPNS_11triangulate8quadedge8QuadEdgeELm3EE at Base 3.11.0~beta1
  _ZN4geos9algorithm4hull17HullTriangulation14HullTriVisitorD0Ev at Base 3.11.0~beta1
  _ZN4geos9algorithm4hull17HullTriangulation14HullTriVisitorD1Ev at Base 3.11.0~beta1
@@ -2725,7 +2742,7 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  _ZN4geos9operation5valid23IndexedNestedHoleTester9loadIndexEv at Base 3.10.0
  _ZN4geos9operation5valid23PolygonTopologyAnalyzer12isRingNestedEPKNS_4geom10LinearRingES6_ at Base 3.10.3
  (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos9operation5valid23PolygonTopologyAnalyzer13ringIndexNextEPKNS_4geom18CoordinateSequenceEj at Base 3.10.3
- _ZN4geos9operation5valid23PolygonTopologyAnalyzer13ringIndexNextEPKNS_4geom18CoordinateSequenceEm at Base 3.10.3
+ (arch=amd64 arm64 ia64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZN4geos9operation5valid23PolygonTopologyAnalyzer13ringIndexNextEPKNS_4geom18CoordinateSequenceEm at Base 3.11.0~beta1
  (subst)_ZN4geos9operation5valid23PolygonTopologyAnalyzer13ringIndexPrevEPKNS_4geom18CoordinateSequenceE{size_t}@Base 3.10.0
  _ZN4geos9operation5valid23PolygonTopologyAnalyzer15createSegStringEPKNS_4geom10LinearRingEPKNS1_11PolygonRingE at Base 3.10.0
  _ZN4geos9operation5valid23PolygonTopologyAnalyzer15getPolygonRingsERKSt6vectorIPNS_6noding13SegmentStringESaIS6_EE at Base 3.10.0
@@ -2733,9 +2750,9 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  _ZN4geos9operation5valid23PolygonTopologyAnalyzer17createPolygonRingEPKNS_4geom10LinearRingEiPNS1_11PolygonRingE at Base 3.10.0
  _ZN4geos9operation5valid23PolygonTopologyAnalyzer18findNonEqualVertexEPKNS_4geom10LinearRingERKNS3_10CoordinateE at Base 3.10.3
  (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos9operation5valid23PolygonTopologyAnalyzer18findRingVertexNextEPKNS_4geom18CoordinateSequenceEjRKNS3_10CoordinateE at Base 3.10.3
- _ZN4geos9operation5valid23PolygonTopologyAnalyzer18findRingVertexNextEPKNS_4geom18CoordinateSequenceEmRKNS3_10CoordinateE at Base 3.10.3
+ (arch=amd64 arm64 ia64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZN4geos9operation5valid23PolygonTopologyAnalyzer18findRingVertexNextEPKNS_4geom18CoordinateSequenceEmRKNS3_10CoordinateE at Base 3.11.0~beta1
  (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos9operation5valid23PolygonTopologyAnalyzer18findRingVertexPrevEPKNS_4geom18CoordinateSequenceEjRKNS3_10CoordinateE at Base 3.10.3
- _ZN4geos9operation5valid23PolygonTopologyAnalyzer18findRingVertexPrevEPKNS_4geom18CoordinateSequenceEmRKNS3_10CoordinateE at Base 3.10.3
+ (arch=amd64 arm64 ia64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZN4geos9operation5valid23PolygonTopologyAnalyzer18findRingVertexPrevEPKNS_4geom18CoordinateSequenceEmRKNS3_10CoordinateE at Base 3.11.0~beta1
  _ZN4geos9operation5valid23PolygonTopologyAnalyzer20createSegmentStringsEPKNS_4geom8GeometryEb at Base 3.10.0
  _ZN4geos9operation5valid23PolygonTopologyAnalyzer20findSelfIntersectionEPKNS_4geom10LinearRingE at Base 3.10.0
  _ZN4geos9operation5valid23PolygonTopologyAnalyzer20intersectingSegIndexEPKNS_4geom18CoordinateSequenceEPKNS3_10CoordinateE at Base 3.10.0
@@ -2812,10 +2829,12 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  _ZN4geos9operation6buffer11OffsetCurve20markMatchingSegmentsERKNS_4geom10CoordinateES6_RNS1_14SegmentMCIndexEPKNS3_18CoordinateSequenceERSt6vectorIbSaIbEE at Base 3.11.0~beta1
  _ZN4geos9operation6buffer11OffsetCurve21extractMaxAreaPolygonERKNS_4geom8GeometryE at Base 3.11.0~beta1
  _ZN4geos9operation6buffer11OffsetCurve23MatchCurveSegmentAction6selectERKNS_4geom11LineSegmentE at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos9operation6buffer11OffsetCurve23MatchCurveSegmentAction6selectERKNS_5index5chain13MonotoneChainEj at Base 3.11.0~beta1
  _ZN4geos9operation6buffer11OffsetCurve23MatchCurveSegmentAction6selectERKNS_5index5chain13MonotoneChainEm at Base 3.11.0~beta1
  _ZN4geos9operation6buffer11OffsetCurve23MatchCurveSegmentActionD0Ev at Base 3.11.0~beta1
  _ZN4geos9operation6buffer11OffsetCurve23MatchCurveSegmentActionD1Ev at Base 3.11.0~beta1
  _ZN4geos9operation6buffer11OffsetCurve23MatchCurveSegmentActionD2Ev at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN4geos9operation6buffer11OffsetCurve4nextEjj at Base 3.11.0~beta1
  _ZN4geos9operation6buffer11OffsetCurve4nextEmm at Base 3.11.0~beta1
  _ZN4geos9operation6buffer11OffsetCurve8getCurveERKNS_4geom8GeometryEd at Base 3.11.0~beta1
  _ZN4geos9operation6buffer11OffsetCurve8getCurveERKNS_4geom8GeometryEdiNS1_16BufferParameters9JoinStyleEd at Base 3.11.0~beta1
@@ -3507,8 +3526,8 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  _ZN4geos9operation9overlayng17EdgeNodingBuilder7addLineEPKNS_4geom10LineStringEh at Base 3.10.0
  _ZN4geos9operation9overlayng17EdgeNodingBuilder7addLineERSt10unique_ptrINS_4geom23CoordinateArraySequenceESt14default_deleteIS5_EEh at Base 3.10.0
  _ZN4geos9operation9overlayng17EdgeNodingBuilder8getNoderEv at Base 3.9.0
- (arch=amd64 armel armhf hurd-i386 i386 m68k mipsel powerpc)_ZN4geos9operation9overlayng17EdgeNodingBuilderC1EPKNS_4geom14PrecisionModelEPNS_6noding5NoderE at Base 3.11.0~beta1
- (arch=amd64 armel armhf hurd-i386 i386 m68k mipsel powerpc)_ZN4geos9operation9overlayng17EdgeNodingBuilderC2EPKNS_4geom14PrecisionModelEPNS_6noding5NoderE at Base 3.11.0~beta1
+ _ZN4geos9operation9overlayng17EdgeNodingBuilderC1EPKNS_4geom14PrecisionModelEPNS_6noding5NoderE at Base 3.11.0~beta1
+ _ZN4geos9operation9overlayng17EdgeNodingBuilderC2EPKNS_4geom14PrecisionModelEPNS_6noding5NoderE at Base 3.11.0~beta1
  _ZN4geos9operation9overlayng17EdgeNodingBuilderD1Ev at Base 3.9.0
  _ZN4geos9operation9overlayng17EdgeNodingBuilderD2Ev at Base 3.9.0
  _ZN4geos9operation9overlayng18OverlayMixedPoints12computeUnionEPKNS_4geom23CoordinateArraySequenceE at Base 3.9.0
@@ -3949,6 +3968,7 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  (arch=alpha amd64 arm64 ia64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNK4geos4geom18CoordinateSequence4getXEm at Base 3.7.0
  (arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK4geos4geom18CoordinateSequence4getYEj at Base 3.4.2
  (arch=alpha amd64 arm64 ia64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNK4geos4geom18CoordinateSequence4getYEm at Base 3.7.0
+ _ZNK4geos4geom18CoordinateSequence6isRingEv at Base 3.11.0~beta2
  _ZNK4geos4geom18CoordinateSequence8toStringB5cxx11Ev at Base 3.8.0
  _ZNK4geos4geom18GeometryCollection11equalsExactEPKNS0_8GeometryEd at Base 3.4.2
  _ZNK4geos4geom18GeometryCollection11getBoundaryEv at Base 3.4.2
@@ -4264,10 +4284,15 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  _ZNK4geos4util7Profile6getTotEv at Base 3.4.2
  _ZNK4geos5index13intervalrtree21IntervalRTreeLeafNode5queryEddPNS0_11ItemVisitorE at Base 3.4.2
  _ZNK4geos5index13intervalrtree23IntervalRTreeBranchNode5queryEddPNS0_11ItemVisitorE at Base 3.4.2
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK4geos5index25VertexSequencePackedRtree14queryItemRangeERKNS_4geom8EnvelopeEjRSt6vectorIjSaIjEE at Base 3.11.0~beta1
  _ZNK4geos5index25VertexSequencePackedRtree14queryItemRangeERKNS_4geom8EnvelopeEmRSt6vectorImSaImEE at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK4geos5index25VertexSequencePackedRtree14queryNodeRangeERKNS_4geom8EnvelopeEjjRSt6vectorIjSaIjEE at Base 3.11.0~beta1
  _ZNK4geos5index25VertexSequencePackedRtree14queryNodeRangeERKNS_4geom8EnvelopeEmmRSt6vectorImSaImEE at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK4geos5index25VertexSequencePackedRtree5queryERKNS_4geom8EnvelopeERSt6vectorIjSaIjEE at Base 3.11.0~beta1
  _ZNK4geos5index25VertexSequencePackedRtree5queryERKNS_4geom8EnvelopeERSt6vectorImSaImEE at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK4geos5index25VertexSequencePackedRtree9levelSizeEj at Base 3.11.0~beta1
  _ZNK4geos5index25VertexSequencePackedRtree9levelSizeEm at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK4geos5index25VertexSequencePackedRtree9queryNodeERKNS_4geom8EnvelopeEjjRSt6vectorIjSaIjEE at Base 3.11.0~beta1
  _ZNK4geos5index25VertexSequencePackedRtree9queryNodeERKNS_4geom8EnvelopeEmmRSt6vectorImSaImEE at Base 3.11.0~beta1
  _ZNK4geos5index5chain13MonotoneChain11getEnvelopeEd at Base 3.10.0
  _ZNK4geos5index5chain13MonotoneChain11getEnvelopeEv at Base 3.10.0
@@ -4376,12 +4401,18 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  _ZNK4geos6noding9snapround8HotPixel13getCoordinateEv at Base 3.9.0
  _ZNK4geos6noding9snapround8HotPixel16intersectsScaledEdddd at Base 3.9.0
  _ZNK4geos6noding9snapround8HotPixel22intersectsPixelClosureERKNS_4geom10CoordinateES6_ at Base 3.9.0
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK4geos8simplify10LinkedRing13getCoordinateEj at Base 3.11.0~beta1
  _ZNK4geos8simplify10LinkedRing13getCoordinateEm at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK4geos8simplify10LinkedRing13hasCoordinateEj at Base 3.11.0~beta1
  _ZNK4geos8simplify10LinkedRing13hasCoordinateEm at Base 3.11.0~beta1
  _ZNK4geos8simplify10LinkedRing14getCoordinatesEv at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK4geos8simplify10LinkedRing14nextCoordinateEj at Base 3.11.0~beta1
  _ZNK4geos8simplify10LinkedRing14nextCoordinateEm at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK4geos8simplify10LinkedRing14prevCoordinateEj at Base 3.11.0~beta1
  _ZNK4geos8simplify10LinkedRing14prevCoordinateEm at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK4geos8simplify10LinkedRing4nextEj at Base 3.11.0~beta1
  _ZNK4geos8simplify10LinkedRing4nextEm at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK4geos8simplify10LinkedRing4prevEj at Base 3.11.0~beta1
  _ZNK4geos8simplify10LinkedRing4prevEm at Base 3.11.0~beta1
  _ZNK4geos8simplify10LinkedRing4sizeEv at Base 3.11.0~beta1
  _ZNK4geos8simplify13RingHullIndex4sizeEv at Base 3.11.0~beta1
@@ -4404,13 +4435,16 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  _ZNK4geos8simplify8RingHull10toGeometryEv at Base 3.11.0~beta1
  _ZNK4geos8simplify8RingHull11getEnvelopeEv at Base 3.11.0~beta1
  _ZNK4geos8simplify8RingHull11isRemovableERKNS1_6CornerERKNS0_13RingHullIndexE at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK4geos8simplify8RingHull13getCoordinateEj at Base 3.11.0~beta1
  _ZNK4geos8simplify8RingHull13getCoordinateEm at Base 3.11.0~beta1
  _ZNK4geos8simplify8RingHull21hasIntersectingVertexERKNS1_6CornerERKNS_4geom8EnvelopeEPKS1_ at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK4geos8simplify8RingHull5queryERKNS_4geom8EnvelopeERSt6vectorIjSaIjEE at Base 3.11.0~beta1
  _ZNK4geos8simplify8RingHull5queryERKNS_4geom8EnvelopeERSt6vectorImSaImEE at Base 3.11.0~beta1
  _ZNK4geos8simplify8RingHull6Corner10intersectsERKNS_4geom10CoordinateERKNS0_10LinkedRingE at Base 3.11.0~beta1
  _ZNK4geos8simplify8RingHull6Corner7getAreaEv at Base 3.11.0~beta1
  _ZNK4geos8simplify8RingHull6Corner8envelopeERKNS0_10LinkedRingERNS_4geom8EnvelopeE at Base 3.11.0~beta1
  _ZNK4geos8simplify8RingHull6Corner8getIndexEv at Base 3.11.0~beta1
+ (arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNK4geos8simplify8RingHull6Corner8isVertexEj at Base 3.11.0~beta1
  _ZNK4geos8simplify8RingHull6Corner8isVertexEm at Base 3.11.0~beta1
  _ZNK4geos8simplify8RingHull6Corner9isRemovedERKNS0_10LinkedRingE at Base 3.11.0~beta1
  _ZNK4geos9algorithm11HCoordinate13getCoordinateERNS_4geom10CoordinateE at Base 3.4.2
@@ -5015,9 +5049,9 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  (optional=templinst)_ZNSt6vectorIS_IdSaIdEESaIS1_EED1Ev at Base 3.10.0
  (optional=templinst)_ZNSt6vectorIS_IdSaIdEESaIS1_EED2Ev at Base 3.10.0
  (optional=templinst)_ZNSt6vectorISt10unique_ptrIKN4geos4geom18CoordinateSequenceESt14default_deleteIS4_EESaIS7_EE17_M_realloc_insertIJPS3_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_ at Base 3.9.0
- (optional=templinst|arch=ia64)_ZNSt6vectorISt10unique_ptrIN4geos11triangulate3tri7TriListESt14default_deleteIS4_EESaIS7_EED1Ev at Base 3.10.0
- (optional=templinst|arch=ia64)_ZNSt6vectorISt10unique_ptrIN4geos11triangulate3tri7TriListESt14default_deleteIS4_EESaIS7_EED2Ev at Base 3.10.0
  (optional=templinst)_ZNSt6vectorISt10unique_ptrIN4geos11triangulate3tri7TriListINS3_3TriEEESt14default_deleteIS6_EESaIS9_EE17_M_realloc_insertIJPS6_EEEvN9__gnu_cxx17__normal_iteratorIPS9_SB_EEDpOT_ at Base 3.11.0~beta1
+ (optional=templinst|arch=ia64)_ZNSt6vectorISt10unique_ptrIN4geos11triangulate3tri7TriListINS3_3TriEEESt14default_deleteIS6_EESaIS9_EED1Ev at Base 3.11.0~beta1
+ (optional=templinst|arch=ia64)_ZNSt6vectorISt10unique_ptrIN4geos11triangulate3tri7TriListINS3_3TriEEESt14default_deleteIS6_EESaIS9_EED2Ev at Base 3.11.0~beta1
  (optional=templinst)_ZNSt6vectorISt10unique_ptrIN4geos4geom10LineStringESt14default_deleteIS3_EESaIS6_EE17_M_realloc_insertIJPS3_EEEvN9__gnu_cxx17__normal_iteratorIPS6_S8_EEDpOT_ at Base 3.9.0
  (optional=templinst)_ZNSt6vectorISt10unique_ptrIN4geos4geom10LineStringESt14default_deleteIS3_EESaIS6_EE17_M_realloc_insertIJS6_EEEvN9__gnu_cxx17__normal_iteratorIPS6_S8_EEDpOT_ at Base 3.8.0
  (optional=templinst)_ZNSt6vectorISt10unique_ptrIN4geos4geom10LineStringESt14default_deleteIS3_EESaIS6_EED1Ev at Base 3.9.0
@@ -5079,6 +5113,7 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  (optional=templinst|subst)_ZNSt6vectorISt4pairIKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEN13geos_nlohmann10basic_jsonINS8_11ordered_mapES_S6_b{int64_t}{uint64_t}dSaNS8_14adl_serializerES_IhSaIhEEEEESaISF_EE17_M_realloc_insertIJRS7_RSE_EEEvN9__gnu_cxx17__normal_iteratorIPSF_SH_EEDpOT_ at Base 3.10.0
  (optional=templinst)_ZNSt6vectorISt4pairIddESaIS1_EE17_M_realloc_insertIJS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_ at Base 3.10.0
  (optional=templinst|arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIbSaIbEE13_M_insert_auxESt13_Bit_iteratorb at Base 3.10.0
+ (optional=templinst|arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIbSaIbEE14_M_fill_insertESt13_Bit_iteratorjb at Base 3.11.0~beta1
  (optional=templinst)_ZNSt6vectorIbSaIbEE14_M_fill_insertESt13_Bit_iteratormb at Base 3.11.0~beta1
  (optional=templinst)_ZNSt6vectorIbSaIbEE9push_backEb at Base 3.10.0
  (optional=templinst|arch=arm64)_ZNSt6vectorIcSaIcEE12emplace_backIJcEEEvDpOT_ at Base 3.10.0
@@ -5144,10 +5179,11 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  (optional=templinst|arch=alpha amd64 arm64 ia64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPPN4geos11planargraph12DirectedEdgeESt6vectorIS5_SaIS5_EEEElS5_NS0_5__ops15_Iter_comp_iterIPFbS5_S5_EEEEvT_T0_SH_T1_T2_ at Base 3.4.2
  (optional=templinst|subst)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPPN4geos5index7strtree13BoundablePairESt6vectorIS6_SaIS6_EEEE{ssize_t}S6_NS0_5__ops15_Iter_comp_iterINS5_25BoundablePairQueueCompareEEEEvT_T0_SH_T1_T2_ at Base 3.6.0
  (optional=templinst|subst)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPPN4geos5index7strtree13SimpleSTRpairESt6vectorIS6_SaIS6_EEEE{ssize_t}S6_NS0_5__ops15_Iter_comp_iterINS4_17SimpleSTRdistance19STRpairQueueCompareEEEEvT_T0_SI_T1_T2_ at Base 3.9.0
- (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPPN4geos5index7strtree9BoundableESt6vectorIS6_SaIS6_EEEEiS6_NS0_5__ops15_Iter_comp_iterIPFbS6_S6_EEEEvT_T0_SI_T1_T2_ at Base 3.4.2
+ (optional=templinst|arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPPN4geos5index7strtree9BoundableESt6vectorIS6_SaIS6_EEEEiS6_NS0_5__ops15_Iter_comp_iterIPFbPKS5_SF_EEEEvT_T0_SK_T1_T2_ at Base 3.11.0~beta1
  (optional=templinst)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPPN4geos5index7strtree9BoundableESt6vectorIS6_SaIS6_EEEElS6_NS0_5__ops15_Iter_comp_iterIPFbPKS5_SF_EEEEvT_T0_SK_T1_T2_ at Base 3.11.0~beta1
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPPN4geos5index9sweepline14SweepLineEventESt6vectorIS6_SaIS6_EEEEiS6_NS0_5__ops15_Iter_comp_iterINS4_22SweepLineEventLessThenEEEEvT_T0_SH_T1_T2_ at Base 3.4.2
  (optional=templinst|arch=alpha amd64 arm64 ia64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPPN4geos5index9sweepline14SweepLineEventESt6vectorIS6_SaIS6_EEEElS6_NS0_5__ops15_Iter_comp_iterINS4_22SweepLineEventLessThenEEEEvT_T0_SH_T1_T2_ at Base 3.4.2
+ (optional=templinst|arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPPN4geos9algorithm4hull7HullTriESt6vectorIS6_SaIS6_EEEEiS6_NS0_5__ops15_Iter_comp_iterINS5_14HullTriCompareEEEEvT_T0_SH_T1_T2_ at Base 3.11.0~beta1
  (optional=templinst)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPPN4geos9algorithm4hull7HullTriESt6vectorIS6_SaIS6_EEEElS6_NS0_5__ops15_Iter_comp_iterINS5_14HullTriCompareEEEEvT_T0_SH_T1_T2_ at Base 3.11.0~beta1
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPPN4geos9geomgraph5index14SweepLineEventESt6vectorIS6_SaIS6_EEEEiS6_NS0_5__ops15_Iter_comp_iterINS4_22SweepLineEventLessThenEEEEvT_T0_SH_T1_T2_ at Base 3.4.2
  (optional=templinst|arch=alpha amd64 arm64 ia64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPPN4geos9geomgraph5index14SweepLineEventESt6vectorIS6_SaIS6_EEEElS6_NS0_5__ops15_Iter_comp_iterINS4_22SweepLineEventLessThenEEEEvT_T0_SH_T1_T2_ at Base 3.4.2
@@ -5170,6 +5206,7 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mipsel powerpc)_ZSt13__heap_selectIN9__gnu_cxx17__normal_iteratorIPN4geos5index7strtree15TemplateSTRNodeIPNS2_9operation10polygonize8EdgeRingENS4_14EnvelopeTraitsEEESt6vectorISB_SaISB_EEEENS0_5__ops15_Iter_comp_iterIZNS4_19TemplateSTRtreeImplIS9_SA_E10sortNodesXERKSG_SM_EUlRKSB_SO_E_EEEvT_SR_SR_T0_ at Base 3.10.0
  (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mipsel powerpc)_ZSt13__heap_selectIN9__gnu_cxx17__normal_iteratorIPN4geos5index7strtree15TemplateSTRNodeIPNS2_9operation10polygonize8EdgeRingENS4_14EnvelopeTraitsEEESt6vectorISB_SaISB_EEEENS0_5__ops15_Iter_comp_iterIZNS4_19TemplateSTRtreeImplIS9_SA_E10sortNodesYERKSG_SM_EUlRKSB_SO_E_EEEvT_SR_SR_T0_ at Base 3.10.0
  (optional=templinst|arch=amd64 arm64 armel armhf hppa hurd-i386 i386 mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32)_ZSt13__heap_selectIN9__gnu_cxx17__normal_iteratorIPSt10unique_ptrIN4geos9operation10polygonize4FaceESt14default_deleteIS6_EESt6vectorIS9_SaIS9_EEEENS0_5__ops15_Iter_comp_iterINS5_16CompareByEnvareaEEEEvT_SJ_SJ_T0_ at Base 3.9.0
+ (optional=templinst|arch=m68k)_ZSt13copy_backwardISt13_Bit_iteratorS0_ET0_T_S2_S1_ at Base 3.11.0~beta1
  (optional=templinst|arch=amd64 arm64 hppa sh4 x32)_ZSt13move_backwardISt15_Deque_iteratorIPN4geos9operation9overlayng11OverlayEdgeERS5_PS5_ES8_ET0_T_SA_S9_ at Base 3.10.0
  (optional=templinst)_ZSt14__copy_move_a1ILb1EPN4geos5index6kdtree6KdNodeES3_EN9__gnu_cxx11__enable_ifIXsrSt23__is_random_access_iterIT0_NSt15iterator_traitsIS8_E17iterator_categoryEE7__valueESt15_Deque_iteratorIT1_RSE_PSE_EE6__typeES8_S8_SH_ at Base 3.9.0
  (optional=templinst)_ZSt14__copy_move_a1ILb1EPPN4geos9operation9overlayng11OverlayEdgeES4_EN9__gnu_cxx11__enable_ifIXsrSt23__is_random_access_iterIT0_NSt15iterator_traitsIS9_E17iterator_categoryEE7__valueESt15_Deque_iteratorIT1_RSF_PSF_EE6__typeES9_S9_SI_ at Base 3.9.0
@@ -5200,10 +5237,11 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  (optional=templinst|subst)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPN4geos5index7strtree15TemplateSTRNodeIPNS2_9operation10polygonize8EdgeRingENS4_14EnvelopeTraitsEEESt6vectorISB_SaISB_EEEE{ssize_t}NS0_5__ops15_Iter_comp_iterIZNS4_19TemplateSTRtreeImplIS9_SA_E10sortNodesYERKSG_SM_EUlRKSB_SO_E_EEEvT_SR_T0_T1_ at Base 3.10.0
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPPN4geos11planargraph12DirectedEdgeESt6vectorIS5_SaIS5_EEEEiNS0_5__ops15_Iter_comp_iterIPFbS5_S5_EEEEvT_SG_T0_T1_ at Base 3.4.2
  (optional=templinst|arch=alpha amd64 arm64 ia64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPPN4geos11planargraph12DirectedEdgeESt6vectorIS5_SaIS5_EEEElNS0_5__ops15_Iter_comp_iterIPFbS5_S5_EEEEvT_SG_T0_T1_ at Base 3.4.2
- (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPPN4geos5index7strtree9BoundableESt6vectorIS6_SaIS6_EEEEiNS0_5__ops15_Iter_comp_iterIPFbS6_S6_EEEEvT_SH_T0_T1_ at Base 3.4.2
+ (optional=templinst|arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPPN4geos5index7strtree9BoundableESt6vectorIS6_SaIS6_EEEEiNS0_5__ops15_Iter_comp_iterIPFbPKS5_SF_EEEEvT_SJ_T0_T1_ at Base 3.11.0~beta1
  (optional=templinst)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPPN4geos5index7strtree9BoundableESt6vectorIS6_SaIS6_EEEElNS0_5__ops15_Iter_comp_iterIPFbPKS5_SF_EEEEvT_SJ_T0_T1_ at Base 3.11.0~beta1
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPPN4geos5index9sweepline14SweepLineEventESt6vectorIS6_SaIS6_EEEEiNS0_5__ops15_Iter_comp_iterINS4_22SweepLineEventLessThenEEEEvT_SG_T0_T1_ at Base 3.4.2
  (optional=templinst|arch=alpha amd64 arm64 ia64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPPN4geos5index9sweepline14SweepLineEventESt6vectorIS6_SaIS6_EEEElNS0_5__ops15_Iter_comp_iterINS4_22SweepLineEventLessThenEEEEvT_SG_T0_T1_ at Base 3.4.2
+ (optional=templinst|arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPPN4geos9algorithm4hull7HullTriESt6vectorIS6_SaIS6_EEEEiNS0_5__ops15_Iter_comp_iterINS5_14HullTriCompareEEEEvT_SG_T0_T1_ at Base 3.11.0~beta1
  (optional=templinst)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPPN4geos9algorithm4hull7HullTriESt6vectorIS6_SaIS6_EEEElNS0_5__ops15_Iter_comp_iterINS5_14HullTriCompareEEEEvT_SG_T0_T1_ at Base 3.11.0~beta1
  (optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPPN4geos9geomgraph5index14SweepLineEventESt6vectorIS6_SaIS6_EEEEiNS0_5__ops15_Iter_comp_iterINS4_22SweepLineEventLessThenEEEEvT_SG_T0_T1_ at Base 3.4.2
  (optional=templinst|arch=alpha amd64 arm64 ia64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPPN4geos9geomgraph5index14SweepLineEventESt6vectorIS6_SaIS6_EEEElNS0_5__ops15_Iter_comp_iterINS4_22SweepLineEventLessThenEEEEvT_SG_T0_T1_ at Base 3.4.2
@@ -5215,6 +5253,7 @@ libgeos.so.3.11.0 #PACKAGE# #MINVER#
  (optional=templinst)_ZSt23__copy_move_backward_a1ILb1EPPN4geos9operation9overlayng11OverlayEdgeES4_EN9__gnu_cxx11__enable_ifIXsrSt23__is_random_access_iterIT0_NSt15iterator_traitsIS9_E17iterator_categoryEE7__valueESt15_Deque_iteratorIT1_RSF_PSF_EE6__typeES9_S9_SI_ at Base 3.9.0
  (optional=templinst)_ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPN4geos4geom11LineSegmentESt6vectorIS4_SaIS4_EEEENS0_5__ops14_Val_comp_iterIPFbRKS4_SD_EEEEvT_T0_ at Base 3.8.1
  (optional=templinst|arch=amd64 arm64 hppa sh4 x32)_ZSt4copyIN9__gnu_cxx17__normal_iteratorIPPN4geos9operation9overlayng11OverlayEdgeESt6vectorIS6_SaIS6_EEEESt15_Deque_iteratorIS6_RS6_S7_EET0_T_SG_SF_ at Base 3.9.0
+ (optional=templinst|arch=m68k)_ZSt4copyISt13_Bit_iteratorS0_ET0_T_S2_S1_ at Base 3.11.0~beta1
  (optional=templinst|arch=armel armhf hurd-i386 i386 m68k mipsel powerpc)_ZSt4swapIN13geos_nlohmann10basic_jsonISt3mapSt6vectorNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEbxydSaNS0_14adl_serializerES3_IhSaIhEEE10json_valueEENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt15__is_tuple_likeIT_EESt21is_move_constructibleISJ_ESt18is_move_assignableISJ_EEE5valueEvE4typeERSJ_ST_ at Base 3.10.0
  (optional=templinst|subst)_ZSt7shuffleIN9__gnu_cxx17__normal_iteratorIP{size_t}St6vectorI{size_t}SaI{size_t}EEEERSt23mersenne_twister_engineI{size_t}L{size_t}32EL{size_t}624EL{size_t}397EL{size_t}31EL{size_t}2567483615EL{size_t}11EL{size_t}4294967295EL{size_t}7EL{size_t}2636928640EL{size_t}15EL{size_t}4022730752EL{size_t}18EL{size_t}1812433253EEEvT_SA_OT0_ at Base 3.9.0
  (optional=templinst|arch=amd64 arm64 x32)_ZStplIcSt11char_traitsIcESaIcEENSt7__cxx1112basic_stringIT_T0_T1_EEOS8_PKS5_ at Base 3.8.0


=====================================
debian/patches/no-web.patch deleted
=====================================
@@ -1,21 +0,0 @@
-Description: Don't include web subdirectory.
- Remove from repacked upstream tarball.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/libgeos/geos/issues/634
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -340,13 +340,6 @@ if(PROJECT_IS_TOP_LEVEL)
- endif()
- 
- #-----------------------------------------------------------------------------
--# Web Site
--#-----------------------------------------------------------------------------
--if(PROJECT_IS_TOP_LEVEL)
--  add_subdirectory(web)
--endif()
--
--#-----------------------------------------------------------------------------
- # Install and export targets - support 'make install' or equivalent
- #-----------------------------------------------------------------------------
- 


=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-no-web.patch


=====================================
debian/watch
=====================================
@@ -1,7 +1,6 @@
 version=4
 opts=\
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
-uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/,\
-repacksuffix=+ds \
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/ \
 https://download.osgeo.org/geos/ \
 (?:|.*/)geos-(?:[_\-]v?|)(\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)


=====================================
include/geos/geom/CoordinateSequence.h
=====================================
@@ -184,14 +184,12 @@ public:
 
 
     /** \brief
-    * Tests whether an array of {@link Coordinate}s forms a ring,
-    * by checking length and closure.
-    * Self-intersection is not checked.
+    * Tests whether an a {@link CoordinateSequence} forms a ring,
+    * by checking length and closure. Self-intersection is not checked.
     *
-    * @param pts an array of Coordinates
     * @return true if the coordinate form a ring.
     */
-    static bool isRing(const CoordinateSequence *pts);
+    bool isRing() const;
 
     /// Reverse Coordinate order in given CoordinateSequence
     static void reverse(CoordinateSequence* cl);


=====================================
include/geos/io/WKBReader.h
=====================================
@@ -85,6 +85,8 @@ public:
     /// Inizialize parser with default GeometryFactory.
     WKBReader();
 
+    void setFixStructure(bool doFixStructure);
+
     /**
      * \brief Reads a Geometry from an istream.
      *
@@ -132,6 +134,7 @@ private:
     unsigned int inputDimension;
     bool hasZ;
     bool hasM;
+    bool fixStructure;
 
     ByteOrderDataInStream dis;
 


=====================================
include/geos/io/WKTReader.h
=====================================
@@ -69,12 +69,14 @@ public:
     explicit WKTReader(const geom::GeometryFactory& gf)
         : geometryFactory(&gf)
         , precisionModel(gf.getPrecisionModel())
+        , fixStructure(false)
         {};
 
         /** @deprecated in 3.4.0 */
     explicit WKTReader(const geom::GeometryFactory* gf)
         : geometryFactory(gf)
         , precisionModel(gf->getPrecisionModel())
+        , fixStructure(false)
         {};
 
     /**
@@ -84,10 +86,16 @@ public:
     WKTReader()
         : geometryFactory(geom::GeometryFactory::getDefaultInstance())
         , precisionModel(geometryFactory->getPrecisionModel())
+        , fixStructure(false)
         {};
 
     ~WKTReader() {};
 
+    void
+    setFixStructure(bool doFixStructure) {
+        fixStructure = doFixStructure;
+    }
+
     /// Parse a WKT string returning a Geometry
     template<typename T>
     std::unique_ptr<T> read(const std::string& wkt) const {
@@ -121,6 +129,7 @@ protected:
 private:
     const geom::GeometryFactory* geometryFactory;
     const geom::PrecisionModel* precisionModel;
+    bool fixStructure;
 
     void getPreciseCoordinate(io::StringTokenizer* tokenizer, geom::Coordinate&, std::size_t& dim) const;
 


=====================================
release.md
=====================================
@@ -1,4 +1,4 @@
-2022-06-12
+2022-06-20
 
 - New things:
   - OffsetCurve (GH-530, Paul Ramsey/Martin Davis)


=====================================
src/geom/CoordinateSequence.cpp
=====================================
@@ -157,15 +157,15 @@ CoordinateSequence::increasingDirection(const CoordinateSequence& pts)
     return 1;
 }
 
-/* public static */
+/* public */
 bool
-CoordinateSequence::isRing(const CoordinateSequence *pts)
+CoordinateSequence::isRing() const
 {
-    if (pts->size() < 4) return false;
+    if (size() < 4)
+        return false;
 
-    if (pts->getAt(0) != pts->getAt(pts->size()-1)) {
+    if (getAt(0) != getAt(size()-1))
         return false;
-    }
 
     return true;
 }


=====================================
src/io/WKBReader.cpp
=====================================
@@ -31,6 +31,7 @@
 #include <geos/geom/MultiPolygon.h>
 #include <geos/geom/CoordinateSequenceFactory.h>
 #include <geos/geom/CoordinateSequence.h>
+#include <geos/geom/CoordinateArraySequence.h>
 #include <geos/geom/PrecisionModel.h>
 
 #include <iomanip>
@@ -51,12 +52,19 @@ WKBReader::WKBReader(geom::GeometryFactory const& f)
     , inputDimension(2)
     , hasZ(false)
     , hasM(false)
+    , fixStructure(false)
     {}
 
 WKBReader::WKBReader()
     : WKBReader(*(GeometryFactory::getDefaultInstance()))
     {}
 
+void
+WKBReader::setFixStructure(bool doFixStructure)
+{
+    fixStructure = doFixStructure;
+}
+
 std::ostream&
 WKBReader::printHEX(std::istream& is, std::ostream& os)
 {
@@ -366,6 +374,12 @@ WKBReader::readLinearRing()
     std::size_t << "WKB npoints: " << size << std::endl;
 #endif
     auto pts = readCoordinateSequence(size);
+    // Replace unclosed ring with closed
+    if (fixStructure && !pts->isRing()) {
+        std::unique_ptr<CoordinateArraySequence> cas(new CoordinateArraySequence(*pts));
+        cas->closeRing();
+        pts.reset(cas.release());
+    }
     return factory.createLinearRing(std::move(pts));
 }
 


=====================================
src/io/WKTReader.cpp
=====================================
@@ -264,6 +264,11 @@ std::unique_ptr<LinearRing>
 WKTReader::readLinearRingText(StringTokenizer* tokenizer) const
 {
     auto&& coords = getCoordinates(tokenizer);
+    if (fixStructure && !coords->isRing()) {
+        std::unique_ptr<CoordinateArraySequence> cas(new CoordinateArraySequence(*coords));
+        cas->closeRing();
+        coords.reset(cas.release());
+    }
     return geometryFactory->createLinearRing(std::move(coords));
 }
 


=====================================
src/operation/buffer/BufferCurveSetBuilder.cpp
=====================================
@@ -207,7 +207,7 @@ BufferCurveSetBuilder::addLineString(const LineString* line)
      *
      * Singled-sided buffers currently treat rings as if they are lines.
      */
-    if (CoordinateSequence::isRing(coord.get()) && ! curveBuilder.getBufferParameters().isSingleSided()) {
+    if (coord->isRing() && ! curveBuilder.getBufferParameters().isSingleSided()) {
         addRingBothSides(coord.get(), distance);
     }
     else {


=====================================
tests/unit/capi/GEOSGeomFromWKBTest.cpp
=====================================
@@ -27,7 +27,7 @@ struct test_capigeosgeomfromwkb_data : public capitest::utility {
     }
 
     void
-    test_wkb(std::string const& wkbhex, std::string const& wkt)
+    test_wkb(const std::string& wkbhex, const std::string& wkt)
     {
         wkb_hex_decoder::binary_type wkb;
         wkb_hex_decoder::decode(wkbhex, wkb);
@@ -35,13 +35,9 @@ struct test_capigeosgeomfromwkb_data : public capitest::utility {
         geom1_ = GEOSGeomFromWKB_buf(&wkb[0], wkb.size());
         ensure("GEOSGeomFromWKB_buf failed to create geometry", nullptr != geom1_);
 
-        // TODO: Update test to compare with WKT-based geometry
-        (void)wkt;
-        //       ATM, some XYZ and XYZM geometries fail
-        //geom2_ = GEOSWKTReader_read(reader_, wkt.c_str());
-        //ensure ( 0 != geom2_ );
-        //char result = GEOSEquals(geom1_, geom2_);
-        //ensure_equals(result, char(1));
+        geom2_ = GEOSWKTReader_read(reader_, wkt.c_str());
+        ensure ("GEOSWKTReader_read failed to create geometry", nullptr != geom2_ );
+        ensure_geometry_equals(geom1_, geom2_);
     }
 };
 
@@ -109,17 +105,30 @@ void object::test<5>
     test_wkb(ewkb, wkt);
 }
 
-// TODO: Does GEOSGeomFromWKB_buf accept EWKB or WKB only?
-//       The cases below test EWKB input and they are failing.
-//template<>
-//template<>
-//void object::test<6>()
-//{
-//    // SELECT st_geomfromewkt('MULTIPOINT((0 0 1 1), (3 2 2 1))') ;
-//    std::string wkt("MULTIPOINT((0 0 1 1), (3 2 2 1))");
-//    std::string ewkb("01040000C00200000001010000C000000000000000000000000000000000000000000000F03F000000000000F03F01010000C0000000000000084000000000000000400000000000000040000000000000F03F");
-//    test_wkb(ewkb, wkt);
-//}
+// Check force close on unclosed rings
+template<>
+template<>
+void object::test<6>
+()
+{
+    geom1_ = GEOSWKTReader_read(reader_, "POLYGON((0 0, 0 1, 1 1, 1 0, 0 0))");
+    ensure("geom1_ not null", geom1_ != nullptr);
+    GEOSWKTReader_setFixStructure(reader_, 1);
+    geom2_ = GEOSWKTReader_read(reader_, "POLYGON((0 0, 0 1, 1 1, 1 0))");
+    ensure("geom2_ not null", geom2_ != nullptr);
+    ensure_geometry_equals(geom1_, geom2_);
+}
+
+// Supply EWKB input
+template<>
+template<>
+void object::test<7>()
+{
+    test_wkb(
+        "01040000C00200000001010000C000000000000000000000000000000000000000000000F03F000000000000F03F01010000C0000000000000084000000000000000400000000000000040000000000000F03F",
+        "MULTIPOINT((0 0 1 1), (3 2 2 1))"
+    );
+}
 
 } // namespace tut
 


=====================================
tests/unit/capi/GEOSPolygonHullSimplifyTest.cpp
=====================================
@@ -85,7 +85,7 @@ void object::test<5>()
 {
     input_ = GEOSGeomFromWKT("POLYGON ((0 0, 0 1, 1 1, 1 0, 0 0))");
     ensure(nullptr != input_);
-    geom1_ = GEOSPolygonHullSimplifyByArea(input_, 1, 0.7);
+    geom1_ = GEOSPolygonHullSimplifyMode(input_, 1, GEOSHULL_PARAM_AREA_RATIO, 0.7);
     ensure(nullptr != geom1_);
     // char *wkt = GEOSWKTWriter_write(wktw_, geom1_);
     // printf("%s\n", wkt);


=====================================
tests/unit/io/WKTReaderTest.cpp
=====================================
@@ -10,6 +10,7 @@
 #include <geos/geom/GeometryFactory.h>
 #include <geos/geom/Geometry.h>
 #include <geos/geom/LineString.h>
+#include <geos/geom/Polygon.h>
 #include <geos/geom/Point.h>
 #include <geos/geom/CoordinateSequence.h>
 #include <geos/util/GEOSException.h>
@@ -303,5 +304,17 @@ void object::test<12>
     ensure("MULTIPOINT( EMPTY, (1 1))", geom3->getGeometryN(0)->isEmpty());
 }
 
+template<>
+template<>
+void object::test<13>
+()
+{
+    wktreader.setFixStructure(true);
+    auto geom = wktreader.read("POLYGON((0 0, 0 1, 1 1, 1 0))");
+    std::unique_ptr<geos::geom::Polygon> p(static_cast<geos::geom::Polygon*>(geom.release()));
+    ensure("setFixStructure", p->getExteriorRing()->getNumPoints() == 5);
+}
+
+
 
 } // namespace tut



View it on GitLab: https://salsa.debian.org/debian-gis-team/geos/-/compare/8e5e1efe5553ae5f07a5b4a739c402c7c143d8cf...12c57d8f49367cc963bb3bb31ed4c2401f1bb6eb

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/geos/-/compare/8e5e1efe5553ae5f07a5b4a739c402c7c143d8cf...12c57d8f49367cc963bb3bb31ed4c2401f1bb6eb
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20220620/419d2a2c/attachment-0001.htm>