@cpp.js/package-geos 1.0.0-beta.20 → 1.0.0-beta.22

package/dist/prebuilt/iOS-iphoneos/include/geos/geomgraph/PlanarGraph.h

@@ -69,7 +69,7 @@ namespace geomgraph { // geos.geomgraph
  *    different graphs
  *
  */
-class GEOS_DLL PlanarGraph {
+class GEOS_DLL PlanarGraph /* non-final */ {
 public:
 
     /** \brief
@@ -105,36 +105,36 @@ public:
 
     virtual ~PlanarGraph();
 
-    virtual std::vector<Edge*>::iterator getEdgeIterator();
+    std::vector<Edge*>::iterator getEdgeIterator();
 
-    virtual std::vector<EdgeEnd*>* getEdgeEnds();
+    std::vector<EdgeEnd*>* getEdgeEnds();
 
-    virtual bool isBoundaryNode(uint8_t geomIndex, const geom::Coordinate& coord);
+    bool isBoundaryNode(uint8_t geomIndex, const geom::Coordinate& coord);
 
-    virtual void add(EdgeEnd* e);
+    void add(EdgeEnd* e);
 
-    virtual NodeMap::iterator getNodeIterator();
+    NodeMap::iterator getNodeIterator();
 
-    virtual void getNodes(std::vector<Node*>&);
+    void getNodes(std::vector<Node*>&);
 
-    virtual Node* addNode(Node* node);
+    Node* addNode(Node* node);
 
-    virtual Node* addNode(const geom::Coordinate& coord);
+    Node* addNode(const geom::Coordinate& coord);
 
     /**
      * @return the node if found; null otherwise
      */
-    virtual Node* find(geom::Coordinate& coord);
+    Node* find(geom::Coordinate& coord);
 
     /** \brief
      * Add a set of edges to the graph.  For each edge two DirectedEdges
      * will be created.  DirectedEdges are NOT linked by this method.
      */
-    virtual void addEdges(const std::vector<Edge*>& edgesToAdd);
+    void addEdges(const std::vector<Edge*>& edgesToAdd);
 
-    virtual void linkResultDirectedEdges();
+    void linkResultDirectedEdges();
 
-    virtual void linkAllDirectedEdges();
+    void linkAllDirectedEdges();
 
     /** \brief
      * Returns the EdgeEnd which has edge e as its base edge
@@ -143,7 +143,7 @@ public:
      * @return the edge, if found
      *    <code>null</code> if the edge was not found
      */
-    virtual EdgeEnd* findEdgeEnd(Edge* e);
+    EdgeEnd* findEdgeEnd(Edge* e);
 
     /** \brief
      * Returns the edge whose first two coordinates are p0 and p1
@@ -151,7 +151,7 @@ public:
      * @return the edge, if found
      *    <code>null</code> if the edge was not found
      */
-    virtual Edge* findEdge(const geom::Coordinate& p0,
+    Edge* findEdge(const geom::Coordinate& p0,
                            const geom::Coordinate& p1);
 
     /** \brief
@@ -161,12 +161,12 @@ public:
      * @return the edge, if found
      *    <code>null</code> if the edge was not found
      */
-    virtual Edge* findEdgeInSameDirection(const geom::Coordinate& p0,
+    Edge* findEdgeInSameDirection(const geom::Coordinate& p0,
                                           const geom::Coordinate& p1);
 
-    virtual std::string printEdges();
+    std::string printEdges();
 
-    virtual NodeMap* getNodeMap();
+    NodeMap* getNodeMap();
 
 protected:
 
@@ -176,7 +176,7 @@ protected:
 
     std::vector<EdgeEnd*>* edgeEndList;
 
-    virtual void insertEdge(Edge* e);
+    void insertEdge(Edge* e);
 
 private:
 

package/dist/prebuilt/iOS-iphoneos/include/geos/index/bintree/Bintree.h

@@ -44,7 +44,7 @@ namespace bintree { // geos::index::bintree
  * may be a single point).
  *
  * This implementation does not require specifying the extent of the inserted
- * items beforehand. It will automatically expand to accomodate any extent
+ * items beforehand. It will automatically expand to accommodate any extent
  * of dataset.
  *
  * This index is different to the "Interval Tree of Edelsbrunner"

package/dist/prebuilt/iOS-iphoneos/include/geos/index/chain/MonotoneChain.h

@@ -197,6 +197,7 @@ private:
 
     /// Owned by this class
     mutable geom::Envelope env;
+
 };
 
 } // namespace geos::index::chain

package/dist/prebuilt/iOS-iphoneos/include/geos/index/quadtree/Quadtree.h

@@ -61,7 +61,7 @@ namespace quadtree { // geos::index::quadtree
  * intersection, such as testing other kinds of spatial relationships.
  *
  * This implementation does not require specifying the extent of the inserted
- * items beforehand.  It will automatically expand to accomodate any extent
+ * items beforehand.  It will automatically expand to accommodate any extent
  * of dataset.
  *
  * This data structure is also known as an <i>MX-CIF quadtree</i>

package/dist/prebuilt/iOS-iphoneos/include/geos/index/strtree/TemplateSTRtree.h

@@ -203,10 +203,9 @@ public:
         return nearestNeighbour(*this, distance);
     }
 
-    /** Determine the two closest items in the tree using distance metric `distance`. */
+    /** Determine the two closest items in the tree using distance metric `ItemDistance`. */
     template<typename ItemDistance>
     std::pair<ItemType, ItemType> nearestNeighbour() {
-        ItemDistance id;
         return nearestNeighbour(*this);
     }
 
@@ -222,7 +221,7 @@ public:
         return td.nearestNeighbour(*root, *other.root);
     }
 
-    /** Determine the two closest items this tree and `other` tree using distance metric `distance`. */
+    /** Determine the two closest items this tree and `other` tree using distance metric `ItemDistance`. */
     template<typename ItemDistance>
     std::pair<ItemType, ItemType> nearestNeighbour(TemplateSTRtreeImpl<ItemType, BoundsTraits>& other) {
         ItemDistance id;

package/dist/prebuilt/iOS-iphoneos/include/geos/io/GeoJSON.h

@@ -98,6 +98,13 @@ public:
     GeoJSONFeature(std::unique_ptr<geom::Geometry> g,
                    std::map<std::string, GeoJSONValue>&& p);
 
+    GeoJSONFeature(std::unique_ptr<geom::Geometry> g,
+                   const std::map<std::string, GeoJSONValue>& p,
+                   const std::string& id);
+
+    GeoJSONFeature(std::unique_ptr<geom::Geometry> g,
+                   std::map<std::string, GeoJSONValue>&& p, std::string id);
+
     GeoJSONFeature(GeoJSONFeature const& other);
 
     GeoJSONFeature(GeoJSONFeature&& other);
@@ -110,12 +117,16 @@ public:
 
     const std::map<std::string, GeoJSONValue>& getProperties() const;
 
+    const std::string& getId() const;
+
 private:
 
     std::unique_ptr<geom::Geometry> geometry;
 
     std::map<std::string, GeoJSONValue> properties;
 
+    std::string id;
+
 };
 
 class GEOS_DLL GeoJSONFeatureCollection {

package/dist/prebuilt/iOS-iphoneos/include/geos/io/GeoJSONReader.h

@@ -50,7 +50,7 @@ class GEOS_DLL GeoJSONReader {
 public:
 
     /**
-     * \brief Inizialize parser with given GeometryFactory.
+     * \brief Initialize parser with given GeometryFactory.
      *
      * Note that all Geometry objects created by the
      * parser will contain a pointer to the given factory
@@ -60,7 +60,7 @@ public:
     GeoJSONReader(const geom::GeometryFactory& gf);
 
     /**
-     * \brief Inizialize parser with default GeometryFactory.
+     * \brief Initialize parser with default GeometryFactory.
      *
      */
     GeoJSONReader();

package/dist/prebuilt/iOS-iphoneos/include/geos/io/GeoJSONWriter.h

@@ -74,11 +74,33 @@ public:
 
     std::string write(const GeoJSONFeatureCollection& features);
 
+    /*
+     * \brief
+     * Returns the output dimension used by the
+     * <code>GeoJSONWriter</code>.
+     */
+    int
+    getOutputDimension() const
+    {
+        return defaultOutputDimension;
+    }
+
+    /*
+     * Sets the output dimension used by the <code>GeoJSONWriter</code>.
+     *
+     * @param newOutputDimension Supported values are 2 or 3.
+     *        Default since GEOS 3.12 is 3.
+     *        Note that 3 indicates up to 3 dimensions will be
+     *        written but 2D GeoJSON is still produced for 2D geometries.
+     */
+    void setOutputDimension(uint8_t newOutputDimension);
+
 private:
+    uint8_t defaultOutputDimension = 3;
 
-    std::pair<double, double> convertCoordinate(const geom::CoordinateXY* c);
+    std::vector<double> convertCoordinate(const geom::Coordinate* c);
 
-    std::vector<std::pair<double, double>> convertCoordinateSequence(const geom::CoordinateSequence* c);
+    std::vector<std::vector<double>> convertCoordinateSequence(const geom::CoordinateSequence* c);
 
     void encode(const geom::Geometry* g, GeoJSONType type, geos_nlohmann::ordered_json& j);
 

package/dist/prebuilt/iOS-iphoneos/include/geos/io/WKBConstants.h

@@ -37,7 +37,12 @@ namespace WKBConstants {
         wkbMultiPoint = 4,
         wkbMultiLineString = 5,
         wkbMultiPolygon = 6,
-        wkbGeometryCollection = 7
+        wkbGeometryCollection = 7,
+        wkbCircularString = 8,
+        wkbCompoundCurve = 9,
+        wkbCurvePolygon = 10,
+        wkbMultiCurve = 11,
+        wkbMultiSurface = 12,
     };
 
     enum wkbFlavour {

package/dist/prebuilt/iOS-iphoneos/include/geos/io/WKBReader.h

@@ -20,7 +20,8 @@
 #pragma once
 
 #include <geos/export.h>
-
+#include <geos/geom/Geometry.h>
+#include <geos/geom/GeometryTypeName.h>
 #include <geos/io/ByteOrderDataInStream.h> // for composition
 
 #include <iosfwd> // ostream, istream
@@ -28,8 +29,6 @@
 // #include <vector>
 #include <array>
 
-#define BAD_GEOM_TYPE_MSG "Bad geometry type encountered in"
-
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
@@ -41,17 +40,24 @@ namespace geom {
 
 class GeometryFactory;
 class Coordinate;
+class CircularString;
+class CompoundCurve;
+class CurvePolygon;
 class Geometry;
+enum GeometryTypeId : int;
 class GeometryCollection;
 class Point;
 class LineString;
 class LinearRing;
 class Polygon;
+class MultiCurve;
 class MultiPoint;
 class MultiLineString;
 class MultiPolygon;
+class MultiSurface;
 class PrecisionModel;
 class CoordinateSequence;
+class SimpleCurve;
 
 } // namespace geom
 } // namespace geos
@@ -82,7 +88,7 @@ public:
 
     WKBReader(geom::GeometryFactory const& f);
 
-    /// Inizialize parser with default GeometryFactory.
+    /// Initialize parser with default GeometryFactory.
     WKBReader();
 
     void setFixStructure(bool doFixStructure);
@@ -148,22 +154,42 @@ private:
 
     std::unique_ptr<geom::LinearRing> readLinearRing();
 
+    std::unique_ptr<geom::CircularString> readCircularString();
+
+    std::unique_ptr<geom::CompoundCurve> readCompoundCurve();
+
     std::unique_ptr<geom::Polygon> readPolygon();
 
+    std::unique_ptr<geom::CurvePolygon> readCurvePolygon();
+
     std::unique_ptr<geom::MultiPoint> readMultiPoint();
 
     std::unique_ptr<geom::MultiLineString> readMultiLineString();
 
+    std::unique_ptr<geom::MultiCurve> readMultiCurve();
+
     std::unique_ptr<geom::MultiPolygon> readMultiPolygon();
 
+    std::unique_ptr<geom::MultiSurface> readMultiSurface();
+
     std::unique_ptr<geom::GeometryCollection> readGeometryCollection();
 
     std::unique_ptr<geom::CoordinateSequence> readCoordinateSequence(unsigned int); // throws IOException
 
-    void minMemSize(int geomType, uint64_t size);
+    void minMemSize(geom::GeometryTypeId geomType, uint64_t size) const;
 
     void readCoordinate(); // throws IOException
 
+    template<typename T>
+    std::unique_ptr<T> readChild()
+    {
+        auto g = readGeometry();
+        if (dynamic_cast<const T*>(g.get())) {
+            return std::unique_ptr<T>(static_cast<T*>(g.release()));
+        }
+        throw io::ParseException(std::string("Expected ") + geom::GeometryTypeName<T>::name + " but got " + g->getGeometryType());
+    }
+
     // Declare type as noncopyable
     WKBReader(const WKBReader& other) = delete;
     WKBReader& operator=(const WKBReader& rhs) = delete;

package/dist/prebuilt/iOS-iphoneos/include/geos/io/WKBWriter.h

@@ -33,6 +33,8 @@ namespace geos {
 namespace geom {
 
 class CoordinateSequence;
+class CompoundCurve;
+class CurvePolygon;
 class Geometry;
 class GeometryCollection;
 class Point;
@@ -43,6 +45,7 @@ class MultiPoint;
 class MultiLineString;
 class MultiPolygon;
 class PrecisionModel;
+class SimpleCurve;
 
 } // namespace geom
 } // namespace geos
@@ -194,6 +197,8 @@ public:
     void writeHEX(const geom::Geometry& g, std::ostream& os);
     // throws IOException, ParseException
 
+    static int getWkbType(const geom::Geometry&);
+
 private:
 
     // 2, 3, or 4
@@ -215,13 +220,17 @@ private:
     void writePointEmpty(const geom::Point& p);
     // throws IOException
 
-    void writeLineString(const geom::LineString& ls);
+    void writeSimpleCurve(const geom::SimpleCurve& ls);
     // throws IOException
 
+    void writeCompoundCurve(const geom::CompoundCurve& curve);
+
     void writePolygon(const geom::Polygon& p);
     // throws IOException
 
-    void writeGeometryCollection(const geom::GeometryCollection& c, int wkbtype);
+    void writeCurvePolygon(const geom::CurvePolygon& p);
+
+    void writeGeometryCollection(const geom::GeometryCollection& gc);
     // throws IOException, ParseException
 
     void writeCoordinateSequence(const geom::CoordinateSequence& cs, bool sized);

package/dist/prebuilt/iOS-iphoneos/include/geos/io/WKTReader.h

@@ -40,10 +40,15 @@ class GeometryCollection;
 class Point;
 class LineString;
 class LinearRing;
+class CircularString;
+class CompoundCurve;
 class Polygon;
+class CurvePolygon;
 class MultiPoint;
 class MultiLineString;
+class MultiCurve;
 class MultiPolygon;
+class MultiSurface;
 class PrecisionModel;
 }
 }
@@ -118,7 +123,8 @@ protected:
     static std::string getNextCloserOrComma(io::StringTokenizer* tokenizer);
     static std::string getNextCloser(io::StringTokenizer* tokenizer);
     static std::string getNextWord(io::StringTokenizer* tokenizer);
-    std::unique_ptr<geom::Geometry> readGeometryTaggedText(io::StringTokenizer* tokenizer, OrdinateSet& ordinateFlags) const;
+    std::unique_ptr<geom::Geometry> readGeometryTaggedText(io::StringTokenizer* tokenizer, OrdinateSet& ordinateFlags, const geom::GeometryTypeId* emptyType = nullptr) const;
+
     std::unique_ptr<geom::Point> readPointText(io::StringTokenizer* tokenizer, OrdinateSet& ordinateFlags) const;
     std::unique_ptr<geom::LineString> readLineStringText(io::StringTokenizer* tokenizer, OrdinateSet& ordinateFlags) const;
     std::unique_ptr<geom::LinearRing> readLinearRingText(io::StringTokenizer* tokenizer, OrdinateSet& ordinateFlags) const;
@@ -127,6 +133,17 @@ protected:
     std::unique_ptr<geom::MultiLineString> readMultiLineStringText(io::StringTokenizer* tokenizer, OrdinateSet& ordinateFlags) const;
     std::unique_ptr<geom::MultiPolygon> readMultiPolygonText(io::StringTokenizer* tokenizer, OrdinateSet& ordinateFlags) const;
     std::unique_ptr<geom::GeometryCollection> readGeometryCollectionText(io::StringTokenizer* tokenizer, OrdinateSet& ordinateFlags) const;
+    std::unique_ptr<geom::CircularString> readCircularStringText(io::StringTokenizer* tokenizer, OrdinateSet& ordinateFlags) const;
+    std::unique_ptr<geom::CompoundCurve> readCompoundCurveText(io::StringTokenizer* tokenizer, OrdinateSet& ordinateFlags) const;
+    std::unique_ptr<geom::CurvePolygon> readCurvePolygonText(io::StringTokenizer* tokenizer, OrdinateSet& ordinateFlags) const;
+    std::unique_ptr<geom::MultiCurve> readMultiCurveText(io::StringTokenizer* tokenizer, OrdinateSet& ordinateFlags) const;
+    std::unique_ptr<geom::MultiSurface> readMultiSurfaceText(io::StringTokenizer* tokenizer, OrdinateSet& ordinateFlags) const;
+
+    /// Read the contents of a LINEARRING, LINESTRING, CIRCULARSTRING, or COMPOUNDCURVE
+    std::unique_ptr<geom::Curve> readCurveText(io::StringTokenizer* tokenizer, OrdinateSet& ordinateFlags) const;
+
+    /// Read the contents of a POLYGON or a CURVEPOLYGON
+    std::unique_ptr<geom::Geometry> readSurfaceText(io::StringTokenizer* tokenizer, OrdinateSet& ordinateFlags) const;
 private:
     const geom::GeometryFactory* geometryFactory;
     const geom::PrecisionModel* precisionModel;

package/dist/prebuilt/iOS-iphoneos/include/geos/io/WKTWriter.h

@@ -39,6 +39,8 @@ class Coordinate;
 class CoordinateXY;
 class CoordinateXYZM;
 class CoordinateSequence;
+class Curve;
+class CompoundCurve;
 class Geometry;
 class GeometryCollection;
 class Point;
@@ -49,6 +51,8 @@ class MultiPoint;
 class MultiLineString;
 class MultiPolygon;
 class PrecisionModel;
+class SimpleCurve;
+class Surface;
 }
 namespace io {
 class Writer;
@@ -117,7 +121,7 @@ public:
      *
      * @return the WKT
      */
-    static std::string toLineString(const geom::Coordinate& p0, const geom::Coordinate& p1);
+    static std::string toLineString(const geom::CoordinateXY& p0, const geom::CoordinateXY& p1);
 
     /**
      * Generates the WKT for a <code>Point</code>.
@@ -195,6 +199,9 @@ public:
      */
     void setOutputDimension(uint8_t newOutputDimension);
 
+    static std::string writeNumber(double d, bool trim, uint32_t precision);
+    static int writeTrimmedNumber(double d, uint32_t precision, char* buf);
+
 protected:
 
     int decimalPlaces;
@@ -205,23 +212,28 @@ protected:
             int level,
             Writer& writer) const;
 
+    void appendTag(
+            const geom::Geometry& geometry,
+            OrdinateSet outputOrdinates,
+            Writer& writer) const;
+
     void appendPointTaggedText(
         const geom::Point& point,
         OrdinateSet outputOrdinates,
         int level, Writer& writer) const;
 
-    void appendLineStringTaggedText(
-        const geom::LineString& lineString,
+    void appendSimpleCurveTaggedText(
+        const geom::SimpleCurve& lineString,
         OrdinateSet outputOrdinates,
         int level, Writer& writer) const;
 
-    void appendLinearRingTaggedText(
-        const geom::LinearRing& lineString,
+    void appendCompoundCurveTaggedText(
+        const geom::CompoundCurve& lineString,
         OrdinateSet outputOrdinates,
         int level, Writer& writer) const;
 
-    void appendPolygonTaggedText(
-        const geom::Polygon& polygon,
+    void appendSurfaceTaggedText(
+        const geom::Surface& polygon,
         OrdinateSet outputOrdinates,
         int level, Writer& writer) const;
 
@@ -230,13 +242,13 @@ protected:
         OrdinateSet outputOrdinates,
         int level, Writer& writer) const;
 
-    void appendMultiLineStringTaggedText(
-        const geom::MultiLineString& multiLineString,
+    void appendMultiCurveTaggedText(
+        const geom::GeometryCollection& multiCurve,
         OrdinateSet outputOrdinates,
         int level, Writer& writer) const;
 
-    void appendMultiPolygonTaggedText(
-        const geom::MultiPolygon& multiPolygon,
+    void appendMultiSurfaceTaggedText(
+        const geom::GeometryCollection& multiSurface,
         OrdinateSet outputOrdinates,
         int level, Writer& writer) const;
 
@@ -260,13 +272,18 @@ protected:
 
     std::string writeNumber(double d) const;
 
-    void appendLineStringText(
-        const geom::LineString& lineString,
+    void appendCurveText(
+        const geom::Curve& lineString,
         OrdinateSet outputOrdinates,
         int level, bool doIndent, Writer& writer) const;
 
-    void appendPolygonText(
-        const geom::Polygon& polygon,
+    void appendSimpleCurveText(
+        const geom::SimpleCurve& lineString,
+        OrdinateSet outputOrdinates,
+        int level, bool doIndent, Writer& writer) const;
+
+    void appendSurfaceText(
+        const geom::Surface& polygon,
         OrdinateSet outputOrdinates,
         int level, bool indentFirst, Writer& writer) const;
 
@@ -275,13 +292,13 @@ protected:
         OrdinateSet outputOrdinates,
         int level, Writer& writer) const;
 
-    void appendMultiLineStringText(
-        const geom::MultiLineString& multiLineString,
+    void appendMultiCurveText(
+        const geom::GeometryCollection& multiCurve,
         OrdinateSet outputOrdinates,
         int level, bool indentFirst, Writer& writer) const;
 
-    void appendMultiPolygonText(
-        const geom::MultiPolygon& multiPolygon,
+    void appendMultiSurfaceText(
+        const geom::GeometryCollection& multiSurface,
         OrdinateSet outputOrdinates,
         int level, Writer& writer) const;
 
@@ -296,8 +313,6 @@ private:
         INDENT = 2
     };
 
-//	static const int INDENT = 2;
-
     bool isFormatted;
 
     int roundingPrecision;
@@ -306,8 +321,6 @@ private:
 
     bool removeEmptyDimensions = false;
 
-    int level;
-
     static constexpr int coordsPerLine = 10;
 
     uint8_t defaultOutputDimension;

package/dist/prebuilt/iOS-iphoneos/include/geos/linearref/LengthIndexedLine.h

@@ -157,7 +157,7 @@ public:
      *
      * (The subline must **conform** to the line; that is,
      * all vertices in the subline (except possibly the first and last)
-     * must be vertices of the line and occcur in the same order).
+     * must be vertices of the line and occur in the same order).
      *
      * @param subLine a subLine of the line
      * @return a pair of indices for the start and end of the subline.

package/dist/prebuilt/iOS-iphoneos/include/geos/math/DD.h

@@ -93,6 +93,7 @@
 #pragma once
 
 #include <cmath>
+#include <geos/export.h>
 
 namespace geos {
 namespace math { // geos.math

package/dist/prebuilt/iOS-iphoneos/include/geos/namespaces.h

@@ -143,7 +143,7 @@ namespace index { // geos.index
 /// formats.
 ///
 /// The Java Topology Suite (JTS) is a Java API that implements a core set of
-/// spatial data operations usin g an explicit precision model and robust
+/// spatial data operations using an explicit precision model and robust
 /// geometric algorithms. JTS is intended to be used in the devel opment of
 /// applications that support the validation, cleaning, integration and
 /// querying of spatial data sets.

package/dist/prebuilt/iOS-iphoneos/include/geos/noding/MCIndexSegmentSetMutualIntersector.h

@@ -20,12 +20,15 @@
 #include <geos/index/strtree/TemplateSTRtree.h> // inherited
 
 namespace geos {
+namespace geom {
+    class Envelope;
+}
 namespace index {
-class SpatialIndex;
+    class SpatialIndex;
 }
 namespace noding {
-class SegmentString;
-class SegmentIntersector;
+    class SegmentString;
+    class SegmentIntersector;
 }
 }
 
@@ -41,7 +44,7 @@ namespace noding { // geos::noding
  *
  * @version 1.7
  */
-class MCIndexSegmentSetMutualIntersector : public SegmentSetMutualIntersector {
+class GEOS_DLL MCIndexSegmentSetMutualIntersector : public SegmentSetMutualIntersector {
 public:
 
     MCIndexSegmentSetMutualIntersector(double p_tolerance)
@@ -51,6 +54,17 @@ public:
         , nOverlaps(0)
         , overlapTolerance(p_tolerance)
         , indexBuilt(false)
+        , envelope(nullptr)
+    {}
+
+    MCIndexSegmentSetMutualIntersector(const geom::Envelope* p_envelope)
+        : monoChains()
+        , indexCounter(0)
+        , processCounter(0)
+        , nOverlaps(0)
+        , overlapTolerance(0.0)
+        , indexBuilt(false)
+        , envelope(p_envelope)
     {}
 
     MCIndexSegmentSetMutualIntersector()
@@ -117,6 +131,7 @@ private:
      */
     bool indexBuilt;
     MonoChains indexChains;
+    const geom::Envelope* envelope;
 
     void addToIndex(SegmentString* segStr);
 

package/dist/prebuilt/iOS-iphoneos/include/geos/noding/Octant.h

@@ -46,7 +46,7 @@ namespace noding { // geos.noding
  */
 class GEOS_DLL Octant {
 private:
-    Octant() {} // Can't instanciate it
+    Octant() {} // Can't instantiate it
 public:
 
     /**