geography/geos: Update to 3.11.0

Upstream NEWS:

- New things:
  - OffsetCurve (GH-530, Paul Ramsey/Martin Davis)
  - ConcaveHull (GH-549, Paul Ramsey/Martin Davis)
  - PolygonHull (GH-603, Paul Ramsey/Martin Davis)
  - LineMerger directed option (GH-597, Sergei Sh)
  - CAPI: GEOSHilbertCode (GH-556, Brendan Ward)
  - CAPI: GEOSGeom_createRectangle (GH-558, Brendan Ward)
  - CAPI: GEOSGeom_transformXY (GH-563, Dan Baston/Brendan Ward)
  - CAPI: GEOSRemoveRepeatedPoints (GH-599, Paul Ramsey)
  - CAPI: GEOSLineMergeDirected (GH-597, Sergei Sh)

- Improvements:
  - Allow direct setting of grid size (GH-513, Martin Davis)
  - Allow GEOS to be used as a CMake subproject (GH-518, Robert Coup)
  - Remove .inl inline files in favour of header declaration (GH-543, Paul Ramsey)
  - Add SnappingNoder seeding (Martin Davis)
  - Add OverlayNG area check heuristic (JTS-812, Paul Ramsey)

4 files changed, 30 insertions, 67 deletions

diff --git a/geography/geos/Makefile b/geography/geos/Makefile
index 63add54efbd..b57b07fd8d5 100644
--- a/geography/geos/Makefile
+++ b/geography/geos/Makefile
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.43 2022/06/22 11:42:22 gdt Exp $
+# $NetBSD: Makefile,v 1.44 2022/07/08 13:21:59 gdt Exp $
 
-DISTNAME=	geos-3.10.3
-PKGREVISION=	1
+VERSION_BASE=	3.11.0
+# Accomodate testing unreleased versions.
+VERSION_RC=	rc0
+VERSION=	${VERSION_BASE}${VERSION_RC}
+DISTNAME=	geos-${VERSION}
+EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	geography
 MASTER_SITES=	http://download.osgeo.org/geos/
-EXTRACT_SUFX=	.tar.bz2
 
 # geos has two libraries:
 #   geos_c (C), which follows normal versioning rules
diff --git a/geography/geos/PLIST b/geography/geos/PLIST
index 848da927078..92a536c37e8 100644
--- a/geography/geos/PLIST
+++ b/geography/geos/PLIST
@@ -1,15 +1,14 @@
-@comment $NetBSD: PLIST,v 1.21 2022/06/03 20:01:32 gdt Exp $
+@comment $NetBSD: PLIST,v 1.22 2022/07/08 13:21:59 gdt Exp $
 bin/geos-config
 bin/geosop
+include/geos.h
 include/geos/algorithm/Angle.h
 include/geos/algorithm/Area.h
 include/geos/algorithm/BoundaryNodeRule.h
 include/geos/algorithm/CGAlgorithmsDD.h
-include/geos/algorithm/CGAlgorithmsDD.inl
 include/geos/algorithm/CentralEndpointIntersector.h
 include/geos/algorithm/Centroid.h
 include/geos/algorithm/ConvexHull.h
-include/geos/algorithm/ConvexHull.inl
 include/geos/algorithm/Distance.h
 include/geos/algorithm/HCoordinate.h
 include/geos/algorithm/InteriorPointArea.h
@@ -18,7 +17,6 @@ include/geos/algorithm/InteriorPointPoint.h
 include/geos/algorithm/Intersection.h
 include/geos/algorithm/Length.h
 include/geos/algorithm/LineIntersector.h
-include/geos/algorithm/LineIntersector.inl
 include/geos/algorithm/MinimumBoundingCircle.h
 include/geos/algorithm/MinimumDiameter.h
 include/geos/algorithm/NotRepresentableException.h
@@ -36,6 +34,10 @@ include/geos/algorithm/distance/DiscreteFrechetDistance.h
 include/geos/algorithm/distance/DiscreteHausdorffDistance.h
 include/geos/algorithm/distance/DistanceToPoint.h
 include/geos/algorithm/distance/PointPairDistance.h
+include/geos/algorithm/hull/ConcaveHull.h
+include/geos/algorithm/hull/ConcaveHullOfPolygons.h
+include/geos/algorithm/hull/HullTri.h
+include/geos/algorithm/hull/HullTriangulation.h
 include/geos/algorithm/locate/IndexedPointInAreaLocator.h
 include/geos/algorithm/locate/PointOnGeometryLocator.h
 include/geos/algorithm/locate/SimplePointInAreaLocator.h
@@ -47,10 +49,8 @@ include/geos/edgegraph/MarkHalfEdge.h
 include/geos/export.h
 include/geos/geom.h
 include/geos/geom/Coordinate.h
-include/geos/geom/Coordinate.inl
 include/geos/geom/CoordinateArraySequence.h
 include/geos/geom/CoordinateArraySequenceFactory.h
-include/geos/geom/CoordinateArraySequenceFactory.inl
 include/geos/geom/CoordinateFilter.h
 include/geos/geom/CoordinateList.h
 include/geos/geom/CoordinateSequence.h
@@ -59,34 +59,26 @@ include/geos/geom/CoordinateSequenceFilter.h
 include/geos/geom/DefaultCoordinateSequenceFactory.h
 include/geos/geom/Dimension.h
 include/geos/geom/Envelope.h
-include/geos/geom/Envelope.inl
 include/geos/geom/FixedSizeCoordinateSequence.h
 include/geos/geom/Geometry.h
 include/geos/geom/GeometryCollection.h
-include/geos/geom/GeometryCollection.inl
 include/geos/geom/GeometryComponentFilter.h
 include/geos/geom/GeometryFactory.h
-include/geos/geom/GeometryFactory.inl
 include/geos/geom/GeometryFilter.h
 include/geos/geom/HeuristicOverlay.h
 include/geos/geom/IntersectionMatrix.h
 include/geos/geom/LineSegment.h
-include/geos/geom/LineSegment.inl
 include/geos/geom/LineString.h
 include/geos/geom/LinearRing.h
 include/geos/geom/Location.h
 include/geos/geom/MultiLineString.h
-include/geos/geom/MultiLineString.inl
 include/geos/geom/MultiPoint.h
 include/geos/geom/MultiPolygon.h
-include/geos/geom/MultiPolygon.inl
 include/geos/geom/Point.h
 include/geos/geom/Polygon.h
 include/geos/geom/Position.h
 include/geos/geom/PrecisionModel.h
-include/geos/geom/PrecisionModel.inl
 include/geos/geom/Quadrant.h
-include/geos/geom/Quadrant.inl
 include/geos/geom/Triangle.h
 include/geos/geom/prep/AbstractPreparedPolygonContains.h
 include/geos/geom/prep/BasicPreparedGeometry.h
@@ -112,6 +104,7 @@ include/geos/geom/util/GeometryEditor.h
 include/geos/geom/util/GeometryEditorOperation.h
 include/geos/geom/util/GeometryExtracter.h
 include/geos/geom/util/GeometryFixer.h
+include/geos/geom/util/GeometryMapper.h
 include/geos/geom/util/GeometryTransformer.h
 include/geos/geom/util/LinearComponentExtracter.h
 include/geos/geom/util/NoOpGeometryOperation.h
@@ -120,9 +113,7 @@ include/geos/geom/util/PolygonExtracter.h
 include/geos/geom/util/ShortCircuitedGeometryVisitor.h
 include/geos/geom/util/SineStarFactory.h
 include/geos/geomgraph/Depth.h
-include/geos/geomgraph/Depth.inl
 include/geos/geomgraph/DirectedEdge.h
-include/geos/geomgraph/DirectedEdge.inl
 include/geos/geomgraph/DirectedEdgeStar.h
 include/geos/geomgraph/Edge.h
 include/geos/geomgraph/EdgeEnd.h
@@ -133,22 +124,18 @@ include/geos/geomgraph/EdgeList.h
 include/geos/geomgraph/EdgeNodingValidator.h
 include/geos/geomgraph/EdgeRing.h
 include/geos/geomgraph/GeometryGraph.h
-include/geos/geomgraph/GeometryGraph.inl
 include/geos/geomgraph/GraphComponent.h
 include/geos/geomgraph/Label.h
-include/geos/geomgraph/Label.inl
 include/geos/geomgraph/Node.h
 include/geos/geomgraph/NodeFactory.h
 include/geos/geomgraph/NodeMap.h
 include/geos/geomgraph/PlanarGraph.h
 include/geos/geomgraph/TopologyLocation.h
-include/geos/geomgraph/TopologyLocation.inl
 include/geos/geomgraph/index/EdgeSetIntersector.h
 include/geos/geomgraph/index/MonotoneChain.h
 include/geos/geomgraph/index/MonotoneChainEdge.h
 include/geos/geomgraph/index/MonotoneChainIndexer.h
 include/geos/geomgraph/index/SegmentIntersector.h
-include/geos/geomgraph/index/SegmentIntersector.inl
 include/geos/geomgraph/index/SimpleEdgeSetIntersector.h
 include/geos/geomgraph/index/SimpleMCSweepLineIntersector.h
 include/geos/geomgraph/index/SimpleSweepLineIntersector.h
@@ -157,6 +144,7 @@ include/geos/geomgraph/index/SweepLineEventObj.h
 include/geos/geomgraph/index/SweepLineSegment.h
 include/geos/index/ItemVisitor.h
 include/geos/index/SpatialIndex.h
+include/geos/index/VertexSequencePackedRtree.h
 include/geos/index/bintree/Bintree.h
 include/geos/index/bintree/Interval.h
 include/geos/index/bintree/Key.h
@@ -202,9 +190,7 @@ include/geos/index/sweepline/SweepLineEvent.h
 include/geos/index/sweepline/SweepLineIndex.h
 include/geos/index/sweepline/SweepLineInterval.h
 include/geos/index/sweepline/SweepLineOverlapAction.h
-include/geos/inline.h
 include/geos/io/ByteOrderDataInStream.h
-include/geos/io/ByteOrderDataInStream.inl
 include/geos/io/ByteOrderValues.h
 include/geos/io/CLocalizer.h
 include/geos/io/GeoJSON.h
@@ -216,7 +202,6 @@ include/geos/io/WKBConstants.h
 include/geos/io/WKBReader.h
 include/geos/io/WKBWriter.h
 include/geos/io/WKTReader.h
-include/geos/io/WKTReader.inl
 include/geos/io/WKTWriter.h
 include/geos/io/Writer.h
 include/geos/linearref/ExtractLineByLocation.h
@@ -232,7 +217,6 @@ include/geos/linearref/LocationIndexedLine.h
 include/geos/math/DD.h
 include/geos/namespaces.h
 include/geos/noding/BasicSegmentString.h
-include/geos/noding/BasicSegmentString.inl
 include/geos/noding/FastNodingValidator.h
 include/geos/noding/FastSegmentSetIntersectionFinder.h
 include/geos/noding/GeometryNoder.h
@@ -240,22 +224,19 @@ include/geos/noding/IntersectionAdder.h
 include/geos/noding/IntersectionFinderAdder.h
 include/geos/noding/IteratedNoder.h
 include/geos/noding/MCIndexNoder.h
-include/geos/noding/MCIndexNoder.inl
 include/geos/noding/MCIndexSegmentSetMutualIntersector.h
 include/geos/noding/NodableSegmentString.h
 include/geos/noding/NodedSegmentString.h
-include/geos/noding/NodedSegmentString.inl
 include/geos/noding/Noder.h
 include/geos/noding/NodingIntersectionFinder.h
-include/geos/noding/NodingIntersectionFinder.inl
 include/geos/noding/NodingValidator.h
 include/geos/noding/Octant.h
 include/geos/noding/OrientedCoordinateArray.h
 include/geos/noding/ScaledNoder.h
+include/geos/noding/SegmentExtractingNoder.h
 include/geos/noding/SegmentIntersectionDetector.h
 include/geos/noding/SegmentIntersector.h
 include/geos/noding/SegmentNode.h
-include/geos/noding/SegmentNode.inl
 include/geos/noding/SegmentNodeList.h
 include/geos/noding/SegmentPointComparator.h
 include/geos/noding/SegmentSetMutualIntersector.h
@@ -268,7 +249,6 @@ include/geos/noding/snap/SnappingIntersectionAdder.h
 include/geos/noding/snap/SnappingNoder.h
 include/geos/noding/snap/SnappingPointIndex.h
 include/geos/noding/snapround/HotPixel.h
-include/geos/noding/snapround/HotPixel.inl
 include/geos/noding/snapround/HotPixelIndex.h
 include/geos/noding/snapround/MCIndexPointSnapper.h
 include/geos/noding/snapround/MCIndexSnapRounder.h
@@ -276,15 +256,17 @@ include/geos/noding/snapround/SnapRoundingIntersectionAdder.h
 include/geos/noding/snapround/SnapRoundingNoder.h
 include/geos/operation/GeometryGraphOperation.h
 include/geos/operation/buffer/BufferBuilder.h
+include/geos/operation/buffer/BufferCurveSetBuilder.h
 include/geos/operation/buffer/BufferInputLineSimplifier.h
 include/geos/operation/buffer/BufferOp.h
 include/geos/operation/buffer/BufferParameters.h
 include/geos/operation/buffer/BufferSubgraph.h
+include/geos/operation/buffer/OffsetCurve.h
 include/geos/operation/buffer/OffsetCurveBuilder.h
-include/geos/operation/buffer/OffsetCurveSetBuilder.h
 include/geos/operation/buffer/OffsetSegmentGenerator.h
 include/geos/operation/buffer/OffsetSegmentString.h
 include/geos/operation/buffer/RightmostEdgeFinder.h
+include/geos/operation/buffer/SegmentMCIndex.h
 include/geos/operation/buffer/SubgraphDepthLocater.h
 include/geos/operation/distance/ConnectedElementLocationFilter.h
 include/geos/operation/distance/ConnectedElementPointFilter.h
@@ -308,7 +290,6 @@ include/geos/operation/overlay/ElevationMatrixCell.h
 include/geos/operation/overlay/LineBuilder.h
 include/geos/operation/overlay/MaximalEdgeRing.h
 include/geos/operation/overlay/MinimalEdgeRing.h
-include/geos/operation/overlay/MinimalEdgeRing.inl
 include/geos/operation/overlay/OverlayNodeFactory.h
 include/geos/operation/overlay/OverlayOp.h
 include/geos/operation/overlay/PointBuilder.h
@@ -319,10 +300,9 @@ include/geos/operation/overlay/snap/SnapOverlayOp.h
 include/geos/operation/overlay/validate/FuzzyPointLocator.h
 include/geos/operation/overlay/validate/OffsetPointGenerator.h
 include/geos/operation/overlay/validate/OverlayResultValidator.h
+include/geos/operation/overlayng/CoverageUnion.h
 include/geos/operation/overlayng/Edge.h
-include/geos/operation/overlayng/Edge.inl
 include/geos/operation/overlayng/EdgeKey.h
-include/geos/operation/overlayng/EdgeKey.inl
 include/geos/operation/overlayng/EdgeMerger.h
 include/geos/operation/overlayng/EdgeNodingBuilder.h
 include/geos/operation/overlayng/EdgeSourceInfo.h
@@ -334,11 +314,9 @@ include/geos/operation/overlayng/LineBuilder.h
 include/geos/operation/overlayng/LineLimiter.h
 include/geos/operation/overlayng/MaximalEdgeRing.h
 include/geos/operation/overlayng/OverlayEdge.h
-include/geos/operation/overlayng/OverlayEdge.inl
 include/geos/operation/overlayng/OverlayEdgeRing.h
 include/geos/operation/overlayng/OverlayGraph.h
 include/geos/operation/overlayng/OverlayLabel.h
-include/geos/operation/overlayng/OverlayLabel.inl
 include/geos/operation/overlayng/OverlayLabeller.h
 include/geos/operation/overlayng/OverlayMixedPoints.h
 include/geos/operation/overlayng/OverlayNG.h
@@ -376,7 +354,6 @@ include/geos/operation/union/OverlapUnion.h
 include/geos/operation/union/PointGeometryUnion.h
 include/geos/operation/union/UnaryUnionOp.h
 include/geos/operation/union/UnionStrategy.h
-include/geos/operation/valid/ConnectedInteriorTester.h
 include/geos/operation/valid/ConsistentAreaTester.h
 include/geos/operation/valid/IndexedNestedHoleTester.h
 include/geos/operation/valid/IndexedNestedPolygonTester.h
@@ -418,6 +395,10 @@ include/geos/shape/fractal/MortonCode.h
 include/geos/simplify/DouglasPeuckerLineSimplifier.h
 include/geos/simplify/DouglasPeuckerSimplifier.h
 include/geos/simplify/LineSegmentIndex.h
+include/geos/simplify/LinkedRing.h
+include/geos/simplify/PolygonHullSimplifier.h
+include/geos/simplify/RingHull.h
+include/geos/simplify/RingHullIndex.h
 include/geos/simplify/TaggedLineSegment.h
 include/geos/simplify/TaggedLineString.h
 include/geos/simplify/TaggedLineStringSimplifier.h
@@ -431,7 +412,6 @@ include/geos/triangulate/polygon/PolygonEarClipper.h
 include/geos/triangulate/polygon/PolygonHoleJoiner.h
 include/geos/triangulate/polygon/PolygonTriangulator.h
 include/geos/triangulate/polygon/TriDelaunayImprover.h
-include/geos/triangulate/polygon/VertexSequencePackedRtree.h
 include/geos/triangulate/quadedge/LastFoundQuadEdgeLocator.h
 include/geos/triangulate/quadedge/LocateFailureException.h
 include/geos/triangulate/quadedge/QuadEdge.h
@@ -469,8 +449,8 @@ lib/cmake/GEOS/geos-config.cmake
 lib/cmake/GEOS/geos-targets-release.cmake
 lib/cmake/GEOS/geos-targets.cmake
 lib/libgeos.so
-lib/libgeos.so.${PKGVERSION}
+lib/libgeos.so.3.11.0
 lib/libgeos_c.so
 lib/libgeos_c.so.1
-lib/libgeos_c.so.1.16.1
+lib/libgeos_c.so.1.17.0
 lib/pkgconfig/geos.pc
diff --git a/geography/geos/distinfo b/geography/geos/distinfo
index 298050daff0..c05330b2580 100644
--- a/geography/geos/distinfo
+++ b/geography/geos/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.44 2022/06/22 11:42:22 gdt Exp $
+$NetBSD: distinfo,v 1.45 2022/07/08 13:21:59 gdt Exp $
 
-BLAKE2s (geos-3.10.3.tar.bz2) = 6453d24761e52d77ec4f3c5c3ccc4784f274c614a235af7fbdee629e2fc800de
-SHA512 (geos-3.10.3.tar.bz2) = d6df49193ab006e8d0ddc86c58cfd3d3ee8f42c0a1b325fbe3f77e4d98abce8e7cce283343b81355aa96a5212b740fe04f7cbaca0106b02a9688e9fa78818e34
-Size (geos-3.10.3.tar.bz2) = 6720568 bytes
+BLAKE2s (geos-3.11.0rc0.tar.bz2) = 52c96b1ba051b1ae61ce8e27bb519bf93b55d63a97fa47c1ef281312545218c4
+SHA512 (geos-3.11.0rc0.tar.bz2) = 40799ec41a3b16c04aa8a52602c43521ce74e052268d54bdfadb38371c329abfac8040f429e0d0f23b5f534ad893572f94a7fd7a4857dd93b3ef18c59cc296d2
+Size (geos-3.11.0rc0.tar.bz2) = 6727766 bytes
 SHA1 (patch-ae) = 253ae5cf5c2705a80d89d996507e3e94f2a11296
-SHA1 (patch-src_noding_snap_SnappingNoder.cpp) = 9d9cc766750b9d546f2c42cb011dbd483f2e31fc
 SHA1 (patch-util_geosop_cxxopts.hpp) = 6da706852b026df7275be0a3caddadd1315f6e81
diff --git a/geography/geos/patches/patch-src_noding_snap_SnappingNoder.cpp b/geography/geos/patches/patch-src_noding_snap_SnappingNoder.cpp
deleted file mode 100644
index 034fdfe42b4..00000000000
--- a/geography/geos/patches/patch-src_noding_snap_SnappingNoder.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_noding_snap_SnappingNoder.cpp,v 1.1 2022/06/22 11:42:22 gdt Exp $
-
-Work around Solaris compiler behavior, which fails to resolve the
-C++-required sqrt for integral types, by changing 5 to 5.0.
-
-Reported upstream via email, and a larger fix has been merged:
-  https://github.com/libgeos/geos/pull/641
-
---- src/noding/snap/SnappingNoder.cpp.orig	2022-06-03 16:04:49.000000000 +0000
-+++ src/noding/snap/SnappingNoder.cpp
-@@ -63,7 +63,7 @@ SnappingNoder::snapVertices(std::vector<
- void
- SnappingNoder::seedSnapIndex(std::vector<SegmentString*>& segStrings)
- {
--    double PHI_INV = (sqrt(5) - 1.0) / 2.0;
-+    double PHI_INV = (sqrt(5.0) - 1.0) / 2.0;
- 
-     for (SegmentString* ss: segStrings) {
-         CoordinateSequence* cs = ss->getCoordinates();