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

package/dist/prebuilt/Emscripten-x86_64/include/geos/planargraph/Subgraph.h

@@ -83,7 +83,7 @@ public:
      *
      * @return a pair with first element being an iterator
      *         to the Edge in set and second element
-     *	       being a boolean value indicating wheter
+     *	       being a boolean value indicating whether
      *	       the Edge has been inserted now or was
      *	       already in the set.
      */

package/dist/prebuilt/Emscripten-x86_64/include/geos/precision/CommonBitsOp.h

@@ -149,7 +149,7 @@ public:
         double distance);
 
     /** \brief
-     * If required, returning the result to the orginal precision
+     * If required, returning the result to the original precision
      * if required.
      *
      * In this current implementation, no rounding is performed on the

package/dist/prebuilt/Emscripten-x86_64/include/geos/precision/GeometryPrecisionReducer.h

@@ -45,7 +45,7 @@ namespace precision { // geos.precision
  * It can be forced to be reduced pointwise by using setPointwise(boolean).
  * Note that in this case the result geometry may be invalid.
  * Linear and point geometry is always reduced pointwise (i.e. without further change to
- * its topology or stucture), since this does not change validity.
+ * its topology or structure), since this does not change validity.
  *
  * By default the geometry precision model is not changed.
  * This can be overridden by usingsetChangePrecisionModel(boolean).
@@ -193,6 +193,8 @@ public:
 
     std::unique_ptr<geom::Geometry> reduce(const geom::Geometry& geom);
 
+
+
 };
 
 } // namespace geos.precision

package/dist/prebuilt/Emscripten-x86_64/include/geos/precision/PointwisePrecisionReducerTransformer.h

@@ -63,7 +63,7 @@ protected:
 
     std::unique_ptr<geom::CoordinateSequence> transformCoordinates(
         const geom::CoordinateSequence* coords,
-        const geom::Geometry* parent);
+        const geom::Geometry* parent) override;
 
 
 };

package/dist/prebuilt/Emscripten-x86_64/include/geos/simplify/LineSegmentIndex.h

@@ -60,7 +60,7 @@ public:
 
     void remove(const geom::LineSegment* seg);
 
-    std::unique_ptr< std::vector<geom::LineSegment*> >
+    std::vector<const geom::LineSegment*>
     query(const geom::LineSegment* seg);
 
 

package/dist/prebuilt/Emscripten-x86_64/include/geos/simplify/TaggedLineSegment.h

@@ -20,7 +20,7 @@
  * makes it useless for a TaggedLineSegment to store copies
  * of coordinates. Using pointers would be good enough here.
  * We don't do it to avoid having to break inheritance from
- * LineSegment, which has copies intead. Wheter LineSegment
+ * LineSegment, which has copies instead. Whether LineSegment
  * itself should be refactored can be discussed.
  *  --strk 2006-04-12
  *

package/dist/prebuilt/Emscripten-x86_64/include/geos/simplify/TaggedLineString.h

@@ -105,7 +105,7 @@ public:
 
     void addToResult(std::unique_ptr<TaggedLineSegment> seg);
 
-    void removeRingEndpoint();
+    const TaggedLineSegment* removeRingEndpoint();
 
     std::unique_ptr<geom::Geometry> asLineString() const;
 

package/dist/prebuilt/Emscripten-x86_64/include/geos/triangulate/polygon/ConstrainedDelaunayTriangulator.h

@@ -55,7 +55,7 @@ private:
     const Geometry* inputGeom;
     const GeometryFactory* geomFact;
 
-    std::unique_ptr<Geometry> compute();
+    std::unique_ptr<Geometry> compute() const;
 
     static std::unique_ptr<Geometry> toGeometry(
         const geom::GeometryFactory* geomFact,

package/dist/prebuilt/Emscripten-x86_64/include/geos/triangulate/quadedge/QuadEdgeSubdivision.h

@@ -110,7 +110,7 @@ public:
      * that encloses a supplied bounding box.
      * A new super-bounding box that contains the triangle is computed and stored.
      *
-     * @param env the bouding box to surround
+     * @param env the bounding box to surround
      * @param tolerance the tolerance value for determining if two sites are equal
      */
     QuadEdgeSubdivision(const geom::Envelope& env, double tolerance);

package/dist/prebuilt/Emscripten-x86_64/include/geos/triangulate/quadedge/TrianglePredicate.h

@@ -19,15 +19,14 @@
 #pragma once
 
 #include <geos/export.h>
+#include <geos/geom/Location.h>
 
 namespace geos {
 namespace geom {
-class Coordinate;
+class CoordinateXY;
 }
 }
 
-using geos::geom::Coordinate;
-
 namespace geos {
 namespace triangulate {
 namespace quadedge {
@@ -49,6 +48,8 @@ namespace quadedge {
  */
 class GEOS_DLL TrianglePredicate {
 public:
+    using CoordinateXY = geos::geom::CoordinateXY;
+
     /**
      * Tests if a point is inside the circle defined by
      * the triangle with vertices a, b, c (oriented counter-clockwise).
@@ -61,9 +62,9 @@ public:
      * @param p the point to test
      * @return true if this point is inside the circle defined by the points a, b, c
      */
-    static bool isInCircleNonRobust(
-        const Coordinate& a, const Coordinate& b, const Coordinate& c,
-        const Coordinate& p);
+    static geom::Location isInCircleNonRobust(
+        const CoordinateXY& a, const CoordinateXY& b, const CoordinateXY& c,
+        const CoordinateXY& p);
 
     /**
      * Tests if a point is inside the circle defined by
@@ -82,9 +83,9 @@ public:
      * @param p the point to test
      * @return true if this point is inside the circle defined by the points a, b, c
      */
-    static bool isInCircleNormalized(
-        const Coordinate& a, const Coordinate& b, const Coordinate& c,
-        const Coordinate& p);
+    static geom::Location isInCircleNormalized(
+        const CoordinateXY& a, const CoordinateXY& b, const CoordinateXY& c,
+        const CoordinateXY& p);
 
 private:
     /**
@@ -95,8 +96,8 @@ private:
      * @param b a vertex of the triangle
      * @param c a vertex of the triangle
      */
-    static double triArea(const Coordinate& a,
-                          const Coordinate& b, const Coordinate& c);
+    static double triArea(const CoordinateXY& a,
+                          const CoordinateXY& b, const CoordinateXY& c);
 
 public:
     /**
@@ -110,9 +111,9 @@ public:
      * @param p the point to test
      * @return true if this point is inside the circle defined by the points a, b, c
      */
-    static bool isInCircleRobust(
-        const Coordinate& a, const Coordinate& b, const Coordinate& c,
-        const Coordinate& p);
+    static geom::Location isInCircleRobust(
+        const CoordinateXY& a, const CoordinateXY& b, const CoordinateXY& c,
+        const CoordinateXY& p);
 } ;
 
 

package/dist/prebuilt/Emscripten-x86_64/include/geos/triangulate/quadedge/Vertex.h

@@ -205,7 +205,7 @@ public:
      * @return true if this vertex is in the circumcircle of (a,b,c)
      */
     bool isInCircle(const Vertex& a, const Vertex& b, const Vertex& c) const {
-        return triangulate::quadedge::TrianglePredicate::isInCircleRobust(a.p, b.p, c.p, this->p);
+        return triangulate::quadedge::TrianglePredicate::isInCircleRobust(a.p, b.p, c.p, this->p) == geom::Location::INTERIOR;
     }
 
     /**

package/dist/prebuilt/Emscripten-x86_64/include/geos/util/CoordinateArrayFilter.h

@@ -17,46 +17,69 @@
 
 #include <geos/export.h>
 #include <cassert>
+#include <set>
+#include <vector>
 
 #include <geos/geom/CoordinateFilter.h>
 #include <geos/geom/CoordinateSequence.h>
 #include <geos/geom/Coordinate.h>
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4251) // warning C4251: needs to have dll-interface to be used by clients of class
+#endif
+
 namespace geos {
 namespace util { // geos::util
 
-/** \brief
- * A CoordinateFilter that adds read-only pointers
- * to every Coordinate in a Geometry to a given
- * vector.
- *
- * Last port: util/CoordinateArrayFilter.java rev. 1.15
+/*
+ *  A CoordinateFilter that fills a vector of Coordinate const pointers.
  */
-class GEOS_DLL CoordinateArrayFilter: public geom::CoordinateFilter {
-private:
-    geom::Coordinate::ConstVect& pts; // target vector reference
+class GEOS_DLL CoordinateArrayFilter : public geom::CoordinateInspector<CoordinateArrayFilter> {
 public:
-    /** \brief
-     * Constructs a CoordinateArrayFilter.
-     *
-     * @param target The destination vector.
-     */
-    CoordinateArrayFilter(geom::Coordinate::ConstVect& target)
-        :
-        pts(target)
+
+    CoordinateArrayFilter(std::vector<const geom::Coordinate*>& target)
+        : pts(target)
     {}
 
-    virtual
-    ~CoordinateArrayFilter() {}
+    /**
+     * Destructor.
+     * Virtual dctor promises appropriate behaviour when someone will
+     * delete a derived-class object via a base-class pointer.
+     * http://www.parashift.com/c++-faq-lite/virtual-functions.html#faq-20.7
+     */
+    ~CoordinateArrayFilter() override {}
 
-    virtual void
-    filter_ro(const geom::Coordinate* coord)
+    template<typename CoordType>
+    void filter(const CoordType* coord)
     {
         pts.push_back(coord);
     }
+
+    void filter(const geom::CoordinateXY*) {
+        assert(0); // not supported
+    }
+
+    void filter(const geom::CoordinateXYM*) {
+        assert(0); // not supported
+    }
+
+private:
+    std::vector<const geom::Coordinate*>& pts;  // target set reference
+
+    // Declare type as noncopyable
+    CoordinateArrayFilter(const CoordinateArrayFilter& other) = delete;
+    CoordinateArrayFilter& operator=(const CoordinateArrayFilter& rhs) = delete;
 };
 
 
-} // namespace geos.util
+
+
+
+} // namespace geos::util
 } // namespace geos
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+

package/dist/prebuilt/Emscripten-x86_64/include/geos/util/UniqueCoordinateArrayFilter.h

@@ -47,6 +47,12 @@ public:
      */
     UniqueCoordinateArrayFilter(std::vector<const geom::Coordinate*>& target)
         : pts(target)
+        , maxUnique(NO_COORD_INDEX)
+    {}
+
+    UniqueCoordinateArrayFilter(std::vector<const geom::Coordinate*>& target, std::size_t p_maxUnique)
+        : pts(target)
+        , maxUnique(p_maxUnique)
     {}
 
     /**
@@ -69,6 +75,9 @@ public:
             // TODO make `pts` a CoordinateSequence rather than coercing the type
             pts.push_back(coord);
         }
+        if(maxUnique != NO_COORD_INDEX && uniqPts.size() > maxUnique) {
+            done = true;
+        }
     }
 
     void filter(const geom::CoordinateXY*) {
@@ -80,15 +89,22 @@ public:
         assert(0); // not supported
     }
 
+    bool isDone() const override {
+        return done;
+    }
+
 private:
     std::vector<const geom::Coordinate*>& pts;	// target set reference
     std::set<const geom::CoordinateXY*, geom::CoordinateLessThan> uniqPts; 	// unique points set
+    std::size_t maxUnique; // stop visiting when we have this many unique coordinates
+    bool done = false;
 
     // Declare type as noncopyable
     UniqueCoordinateArrayFilter(const UniqueCoordinateArrayFilter& other) = delete;
     UniqueCoordinateArrayFilter& operator=(const UniqueCoordinateArrayFilter& rhs) = delete;
 };
 
+
 } // namespace geos::util
 } // namespace geos
 

package/dist/prebuilt/Emscripten-x86_64/include/geos/util/string.h

@@ -25,5 +25,7 @@ bool endsWith(const std::string & s, char suffix);
 bool startsWith(const std::string & s, const std::string & prefix);
 bool startsWith(const std::string & s, char prefix);
 
+void toUpper(std::string& s);
+
+}
 }
-}

package/dist/prebuilt/Emscripten-x86_64/include/geos/util.h

@@ -24,6 +24,7 @@
 #include <cassert>
 #include <memory>
 #include <type_traits>
+#include <geos/util/UnsupportedOperationException.h>
 
 //
 // Private macros definition
@@ -59,6 +60,27 @@ template<typename To, typename From> inline To down_cast(From* f)
 }
 
 } // namespace detail
+
+namespace util {
+
+template<typename T>
+void ensureNoCurvedComponents(const T& geom)
+{
+    if (geom.hasCurvedComponents()) {
+        throw UnsupportedOperationException("Curved geometry types are not supported.");
+    }
+}
+
+template<typename T>
+void ensureNoCurvedComponents(const T* geom)
+{
+    ensureNoCurvedComponents(*geom);
+}
+
+
+}
+
+
 } // namespace geos
 
 #endif // GEOS_UTIL_H

package/dist/prebuilt/Emscripten-x86_64/include/geos/vend/json.hpp

@@ -5255,7 +5255,7 @@ auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N))
 }
 
 // This class only handles inputs of input_buffer_adapter type.
-// It's required so that expressions like {ptr, len} can be implicitely casted
+// It's required so that expressions like {ptr, len} can be implicitly casted
 // to the correct adapter.
 class span_input_adapter
 {
@@ -10030,7 +10030,7 @@ class binary_reader
 
     @return whether conversion completed
 
-    @note This function needs to respect the system's endianess, because
+    @note This function needs to respect the system's endianness, because
           bytes in CBOR, MessagePack, and UBJSON are stored in network order
           (big endian) and therefore need reordering on little endian systems.
     */
@@ -10202,7 +10202,7 @@ class binary_reader
     /// the number of characters read
     std::size_t chars_read = 0;
 
-    /// whether we can assume little endianess
+    /// whether we can assume little endianness
     const bool is_little_endian = little_endianess();
 
     /// the SAX parser
@@ -14345,7 +14345,7 @@ class binary_writer
     @tparam OutputIsLittleEndian Set to true if output data is
                                  required to be little endian
 
-    @note This function needs to respect the system's endianess, because bytes
+    @note This function needs to respect the system's endianness, because bytes
           in CBOR, MessagePack, and UBJSON are stored in network order (big
           endian) and therefore need reordering on little endian systems.
     */
@@ -14428,7 +14428,7 @@ class binary_writer
     }
 
   private:
-    /// whether we can assume little endianess
+    /// whether we can assume little endianness
     const bool is_little_endian = little_endianess();
 
     /// the output
@@ -17528,7 +17528,7 @@ class basic_json
        - If a subtype is given and the binary array contains exactly 1, 2, 4, 8,
          or 16 elements, the fixext family (fixext1, fixext2, fixext4, fixext8)
          is used. For other sizes, the ext family (ext8, ext16, ext32) is used.
-         The subtype is then added as singed 8-bit integer.
+         The subtype is then added as signed 8-bit integer.
        - If no subtype is given, the bin family (bin8, bin16, bin32) is used.
     - BSON
        - If a subtype is given, it is used and added as unsigned 8-bit integer.
@@ -21482,7 +21482,7 @@ class basic_json
           `key()` returns an empty string.
 
     @warning Using `items()` on temporary objects is dangerous. Make sure the
-             object's lifetime exeeds the iteration. See
+             object's lifetime exceeds the iteration. See
              <https://github.com/nlohmann/json/issues/2040> for more
              information.
 

package/dist/prebuilt/Emscripten-x86_64/include/geos/version.h

@@ -19,15 +19,15 @@
 #endif
 
 #ifndef GEOS_VERSION_MINOR
-#define GEOS_VERSION_MINOR 12
+#define GEOS_VERSION_MINOR 13
 #endif
 
 #ifndef GEOS_VERSION_PATCH
-#define GEOS_VERSION_PATCH 2
+#define GEOS_VERSION_PATCH 0
 #endif
 
 #ifndef GEOS_VERSION
-#define GEOS_VERSION "3.12.2"
+#define GEOS_VERSION "3.13.0"
 #endif
 
 #ifndef GEOS_JTS_PORT