[geos-commits] [SCM] GEOS branch master updated. d924cc7121cca892b1ee550b7cc6e91c6caf34bb
git at osgeo.org
git at osgeo.org
Wed Jun 19 23:16:54 PDT 2019
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".
The branch, master has been updated
via d924cc7121cca892b1ee550b7cc6e91c6caf34bb (commit)
via 84fdaf6a7e2303bc6b0718f665344f923c816827 (commit)
from 386a948d15bd0bde676e6d4a65e375d974d011a7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d924cc7121cca892b1ee550b7cc6e91c6caf34bb
Author: nila <n_larsson at yahoo.com>
Date: Wed Jun 19 20:05:00 2019 +0200
Move GEOS_DLL macro to beginning of declaration
diff --git a/include/geos/geom/Location.h b/include/geos/geom/Location.h
index 896a4dd..050b9d4 100644
--- a/include/geos/geom/Location.h
+++ b/include/geos/geom/Location.h
@@ -24,14 +24,13 @@ namespace geos {
namespace geom { // geos::geom
/** \brief
- * Constants representing the location of a point relative to a geometry.
+ * Constants representing the location of a point relative to a geometry.
*
- * They can also be thought of as the row or column index of a DE-9IM matrix.
- * For a description of the DE-9IM, see the <A
- * HREF="http://www.opengis.org/techno/specs.htm">OpenGIS Simple Features
- * Specification for SQL</A> .
+ * They can also be thought of as the row or column index of a DE-9IM matrix.
+ * For a description of the DE-9IM, see the
+ * [OpenGIS Simple Features Specification for SQL](http://www.opengis.org/techno/specs.htm").
*/
-enum class GEOS_DLL Location : char {
+GEOS_DLL enum class Location : char {
/**
* Used for uninitialized location values.
*/
commit 84fdaf6a7e2303bc6b0718f665344f923c816827
Author: nila <n_larsson at yahoo.com>
Date: Wed Jun 19 19:54:02 2019 +0200
Fix broken doxygen links as a result of removal of Puntal, Lineal, and Polygonal classes
diff --git a/include/geos/algorithm/BoundaryNodeRule.h b/include/geos/algorithm/BoundaryNodeRule.h
index 85e4827..6391388 100644
--- a/include/geos/algorithm/BoundaryNodeRule.h
+++ b/include/geos/algorithm/BoundaryNodeRule.h
@@ -30,7 +30,7 @@ namespace algorithm { // geos::algorithm
/** \brief
* An interface for rules which determine whether node points which are
- * in boundaries of [Lineal](@ref geom::Lineal) geometry components
+ * in boundaries of lineal geometry components
* are in the boundary of the parent geometry collection.
*
* The SFS specifies a single kind of boundary node rule,
diff --git a/include/geos/algorithm/RayCrossingCounter.h b/include/geos/algorithm/RayCrossingCounter.h
index 1181013..ce2df3f 100644
--- a/include/geos/algorithm/RayCrossingCounter.h
+++ b/include/geos/algorithm/RayCrossingCounter.h
@@ -41,11 +41,10 @@ namespace algorithm {
* Counts the number of segments crossed by a horizontal ray extending to the
* right from a given point, in an incremental fashion.
*
- * This can be used to determine whether a point lies in a
- * [Polygonal](@ref geom::Polygonal) geometry. The class determines
- * the situation where the point lies exactly on a segment. When being
- * used for Point-In-Polygon determination, this case allows short-circuiting
- * the evaluation.
+ * This can be used to determine whether a point lies in a polygonal geometry.
+ * The class determines the situation where the point lies exactly on a segment.
+ * When being used for Point-In-Polygon determination, this case allows
+ * short-circuiting the evaluation.
*
* This class handles polygonal geometries with any number of shells and holes.
* The orientation of the shell and hole rings is unimportant.
@@ -57,13 +56,11 @@ namespace algorithm {
*
* The only exception is when the point-on-segment situation is detected, in
* which case no further processing is required.
- * The implication of the above rule is that segments
- * which can be a priori determined to *not* touch the ray
- * (i.e. by a test of their bounding box or Y-extent)
- * do not need to be counted. This allows for optimization by indexing.
+ * The implication of the above rule is that segments which can be a priori
+ * determined to *not* touch the ray (i.e. by a test of their bounding box or
+ * Y-extent) do not need to be counted. This allows for optimization by indexing.
*
* @author Martin Davis
- *
*/
class GEOS_DLL RayCrossingCounter {
private:
@@ -96,7 +93,7 @@ public:
const std::vector<const geom::Coordinate*>& ring);
RayCrossingCounter(const geom::Coordinate& p_point)
- : point(p_point),
+ : point(p_point),
crossingCount(0),
isPointOnSegment(false)
{ }
diff --git a/include/geos/algorithm/RayCrossingCounterDD.h b/include/geos/algorithm/RayCrossingCounterDD.h
index 2cb4f84..2328ab3 100644
--- a/include/geos/algorithm/RayCrossingCounterDD.h
+++ b/include/geos/algorithm/RayCrossingCounterDD.h
@@ -42,11 +42,10 @@ namespace algorithm {
* Counts the number of segments crossed by a horizontal ray extending to
* the right from a given point, in an incremental fashion.
*
- * This can be used to determine whether a point lies in a
- * [Polygonal](@ref geom::Polygonal) geometry. The class determines
- * the situation where the point lies exactly on a segment. When being used
- * for Point-In-Polygon determination, this case allows short-circuiting
- * the evaluation.
+ * This can be used to determine whether a point lies in a polygonal geometry.
+ * The class determines the situation where the point lies exactly on a segment.
+ * When being used for Point-In-Polygon determination, this case allows
+ * short-circuiting the evaluation.
*
* This class handles polygonal geometries with any number of shells and holes.
* The orientation of the shell and hole rings is unimportant.
diff --git a/include/geos/algorithm/locate/IndexedPointInAreaLocator.h b/include/geos/algorithm/locate/IndexedPointInAreaLocator.h
index f1dc458..f66b9a4 100644
--- a/include/geos/algorithm/locate/IndexedPointInAreaLocator.h
+++ b/include/geos/algorithm/locate/IndexedPointInAreaLocator.h
@@ -41,15 +41,13 @@ namespace algorithm { // geos::algorithm
namespace locate { // geos::algorithm::locate
/** \brief
- * Determines the location of {@link geom::Coordinate}s relative to
+ * Determines the location of [Coordinates](@ref geom::Coordinate) relative to
* an areal geometry, using indexing for efficiency.
*
- * The Location is computed precisely, in that points
- * located on the geometry boundary or segments will
- * return {@link geom::Location.BOUNDARY}.
+ * The Location is computed precisely, in that points located on the geometry boundary
+ * or segments will return [Location::BOUNDARY](@ref geom::Location::BOUNDARY).
*
- * {@link geom::Polygonal} and {@link geom::LinearRing} geometries
- * are supported.
+ * Polygonal and [LinearRing](@ref geom::LinearRing) geometries are supported.
*/
class IndexedPointInAreaLocator : public PointOnGeometryLocator {
private:
@@ -96,18 +94,18 @@ private:
IndexedPointInAreaLocator& operator=(const IndexedPointInAreaLocator& rhs) = delete;
public:
- /**
- * Creates a new locator for a given {@link geom::Geometry}
- * {@link geom::Polygonal} and {@link geom::LinearRing} geometries
- * are supported.
- *
+ /** \brief
+ * Creates a new locator for a given [Geometry](@ref geom::Geometry).
+ *
+ * Polygonal and [LinearRing](@ref geom::LinearRing) geometries are supported.
+ *
* @param g the Geometry to locate in
*/
IndexedPointInAreaLocator(const geom::Geometry& g);
- /**
- * Determines the {@link geom::Location} of a point in an areal
- * {@link geom::Geometry}.
+ /** \brief
+ * Determines the [Location](@ref geom::Location) of a point in an areal
+ * [Geometry](@ref geom::Geometry).
*
* @param p the point to test
* @return the location of the point in the geometry
diff --git a/include/geos/algorithm/locate/SimplePointInAreaLocator.h b/include/geos/algorithm/locate/SimplePointInAreaLocator.h
index d1e84ef..8f0bd04 100644
--- a/include/geos/algorithm/locate/SimplePointInAreaLocator.h
+++ b/include/geos/algorithm/locate/SimplePointInAreaLocator.h
@@ -32,7 +32,7 @@ namespace algorithm { // geos::algorithm
namespace locate { // geos::algorithm::locate
/** \brief
- * Computes the location of points relative to a [Polygonal](@ref geom::Polygonal)
+ * Computes the location of points relative to a polygonal
* [Geometry](@ref geom::Geometry), using a simple `O(n)` algorithm.
*
* The algorithm used reports if a point lies in the interior, exterior,
@@ -56,9 +56,12 @@ public:
*
* The return value is one of:
*
- * - [Location::INTERIOR](@ref geom::Location::INTERIOR) if the point is in the geometry interior
- * - [Location::BOUNDARY](@ref geom::Location::BOUNDARY) if the point lies exactly on the boundary
- * - [Location::EXTERIOR](@ref geom::Location::EXTERIOR) if the point is outside the geometry
+ * - [Location::INTERIOR](@ref geom::Location::INTERIOR)
+ * if the point is in the geometry interior
+ * - [Location::BOUNDARY](@ref geom::Location::BOUNDARY)
+ * if the point lies exactly on the boundary
+ * - [Location::EXTERIOR](@ref geom::Location::EXTERIOR)
+ * if the point is outside the geometry
*
* Computes `Location::BOUNDARY` if the point lies exactly
* on the polygon boundary.
@@ -76,7 +79,7 @@ public:
*
* This is a convenience method for
*
- * Location.EXTERIOR != locate(p, geom)
+ * Location::EXTERIOR != locate(p, geom)
*
* @param p the point to test
* @param geom the geometry to test
diff --git a/include/geos/geom/Geometry.h b/include/geos/geom/Geometry.h
index 3bed163..1228743 100644
--- a/include/geos/geom/Geometry.h
+++ b/include/geos/geom/Geometry.h
@@ -251,20 +251,15 @@ public:
return _userData;
}
- /*
- * \brief
- * Returns the ID of the Spatial Reference System used by the
- * <code>Geometry</code>.
+ /** \brief
+ * Returns the ID of the Spatial Reference System used by the Geometry.
*
* GEOS supports Spatial Reference System information in the simple way
* defined in the SFS. A Spatial Reference System ID (SRID) is present
- * in each <code>Geometry</code> object. <code>Geometry</code>
- * provides basic accessor operations for this field, but no others.
- * The SRID is represented as an integer.
- *
- * @return the ID of the coordinate space in which the
- * <code>Geometry</code> is defined.
+ * in each Geometry object. Geometry provides basic accessor operations
+ * for this field, but no others. The SRID is represented as an integer.
*
+ * @return the ID of the coordinate space in which the Geometry is defined.
*/
virtual int
getSRID() const
@@ -272,9 +267,8 @@ public:
return SRID;
}
- /*
- * Sets the ID of the Spatial Reference System used by the
- * <code>Geometry</code>.
+ /** \brief
+ * Sets the ID of the Spatial Reference System used by the Geometry.
*/
virtual void
setSRID(int newSRID)
@@ -288,10 +282,7 @@ public:
*/
const PrecisionModel* getPrecisionModel() const;
- /// \brief
- /// Returns a vertex of this Geometry,
- /// or NULL if this is the empty geometry
- ///
+ /// Returns a vertex of this Geometry, or NULL if this is the empty geometry.
virtual const Coordinate* getCoordinate() const = 0; //Abstract
/**
@@ -321,7 +312,7 @@ public:
return 1;
}
- /// Returns a pointer to the nth Geometry in this collection
+ /// \brief Returns a pointer to the nth Geometry in this collection
/// (or self if this is not a collection)
virtual const Geometry*
getGeometryN(std::size_t /*n*/) const
@@ -649,7 +640,7 @@ public:
/// all the points in the Geometry.
virtual std::unique_ptr<Geometry> convexHull() const;
- /**
+ /** \brief
* Computes a new geometry which has all component coordinate sequences
* in reverse order (opposite orientation) to this one.
*
@@ -680,16 +671,16 @@ public:
std::unique_ptr<Geometry> Union(const Geometry* other) const;
// throw(IllegalArgumentException *, TopologyException *);
- /**
+ /** \brief
* Computes the union of all the elements of this geometry. Heterogeneous
- * {@link GeometryCollection}s are fully supported.
+ * [GeometryCollections](@ref GeometryCollection) are fully supported.
*
* The result obeys the following contract:
*
- * - Unioning a set of {@link LineString}s has the effect of fully noding
+ * - Unioning a set of [LineStrings](@ref LineString) has the effect of fully noding
* and dissolving the linework.
- * - Unioning a set of {@link Polygon}s will always
- * return a {@link Polygonal} geometry (unlike Geometry::Union(const Geometry* other) const),
+ * - Unioning a set of [Polygons](@ref Polygon) will always
+ * return a polygonal geometry (unlike Geometry::Union(const Geometry* other) const),
* which may return geometrys of lower dimension if a topology collapse
* occurred.
*
diff --git a/include/geos/geom/util/GeometryCombiner.h b/include/geos/geom/util/GeometryCombiner.h
index c40ea22..4ed3b8e 100644
--- a/include/geos/geom/util/GeometryCombiner.h
+++ b/include/geos/geom/util/GeometryCombiner.h
@@ -34,20 +34,21 @@ namespace geos {
namespace geom { // geos.geom
namespace util { // geos.geom.util
-/**
- * Combines {@link Geometry}s
- * to produce a {@link GeometryCollection} of the most appropriate type.
- * Input geometries which are already collections
- * will have their elements extracted first.
+/** \brief
+ * Combines [Geometrys](@ref Geometry) to produce a GeometryCollection
+ * of the most appropriate type.
+ *
+ * Input geometries which are already collections will have their elements
+ * extracted first.
* No validation of the result geometry is performed.
- * (The only case where invalidity is possible is where {@link Polygonal}
- * geometries are combined and result in a self-intersection).
+ * (The only case where invalidity is possible is where polygonal geometries
+ * are combined and result in a self-intersection).
*
* @see GeometryFactory#buildGeometry
*/
class GeometryCombiner {
public:
- /**
+ /** \brief
* Combines a collection of geometries.
*
* @param geoms the geometries to combine (ownership left to caller)
@@ -55,7 +56,7 @@ public:
*/
static std::unique_ptr<Geometry> combine(std::vector<Geometry*> const& geoms);
- /**
+ /** \brief
* Combines two geometries.
*
* @param g0 a geometry to combine (ownership left to caller)
@@ -64,7 +65,7 @@ public:
*/
static std::unique_ptr<Geometry> combine(const Geometry* g0, const Geometry* g1);
- /**
+ /** \brief
* Combines three geometries.
*
* @param g0 a geometry to combine (ownership left to caller)
@@ -80,24 +81,24 @@ private:
std::vector<Geometry*> const& inputGeoms;
public:
- /**
- * Creates a new combiner for a collection of geometries
+ /** \brief
+ * Creates a new combiner for a collection of geometries.
*
* @param geoms the geometries to combine
*/
GeometryCombiner(std::vector<Geometry*> const& geoms);
- /**
- * Extracts the GeometryFactory used by the geometries in a collection
+ /** \brief
+ * Extracts the GeometryFactory used by the geometries in a collection.
*
* @param geoms
* @return a GeometryFactory
*/
static GeometryFactory const* extractFactory(std::vector<Geometry*> const& geoms);
- /**
+ /** \brief
* Computes the combination of the input geometries
- * to produce the most appropriate {@link Geometry} or {@link GeometryCollection}
+ * to produce the most appropriate Geometry or GeometryCollection.
*
* @return a Geometry which is the combination of the inputs
*/
diff --git a/include/geos/operation/union/CascadedPolygonUnion.h b/include/geos/operation/union/CascadedPolygonUnion.h
index 638cd64..a26bd52 100644
--- a/include/geos/operation/union/CascadedPolygonUnion.h
+++ b/include/geos/operation/union/CascadedPolygonUnion.h
@@ -51,23 +51,19 @@ namespace geounion { // geos::operation::geounion
/**
* \brief
- * Provides an efficient method of unioning a collection of
- * [Polygonal](@ref geom::Polygonal) geometries.
+ * Provides an efficient method of unioning a collection of polygonal geometries.
*
- * This algorithm is faster and likely more robust than
- * the simple iterated approach of
- * repeatedly unioning each polygon to a result geometry.
+ * This algorithm is faster and likely more robust than the simple iterated
+ * approach of repeatedly unioning each polygon to a result geometry.
*
* The `buffer(0)` trick is sometimes faster, but can be less robust and
* can sometimes take an exceptionally long time to complete.
* This is particularly the case where there is a high degree of overlap
* between the polygons. In this case, `buffer(0)` is forced to compute
- * with *all* line segments from the outset,
- * whereas cascading can eliminate many segments
- * at each stage of processing.
- * The best case for buffer(0) is the trivial case
- * where there is `no` overlap between the input geometries.
- * However, this case is likely rare in practice.
+ * with *all* line segments from the outset, whereas cascading can eliminate
+ * many segments at each stage of processing.
+ * The best case for buffer(0) is the trivial case where there is `no` overlap
+ * between the input geometries. However, this case is likely rare in practice.
*/
class GEOS_DLL CascadedPolygonUnion {
private:
@@ -83,11 +79,11 @@ private:
*/
static int const STRTREE_NODE_CAPACITY = 4;
- /**
- * Computes a {@link Geometry} containing only [Polygonal](@ref geom::Polygonal) components.
+ /** \brief
+ * Computes a [Geometry](@ref geom::Geometry) containing only polygonal components.
*
- * Extracts the {@link Polygon}s from the input
- * and returns them as an appropriate [Polygonal](@ref geom::Polygonal) geometry.
+ * Extracts the [Polygons](@ref geom::Polygon) from the input
+ * and returns them as an appropriate polygonal geometry.
*
* If the input is already `Polygonal`, it is returned unchanged.
*
@@ -103,18 +99,15 @@ public:
CascadedPolygonUnion();
/** \brief
- * Computes the union of a collection of [Polygonal](@ref geom::Polygonal)
- * [Geometrys](@ref geom::Geometry).
+ * Computes the union of a collection of polygonal [Geometrys](@ref geom::Geometry).
*
- * @param polys a collection of [Polygonal](@ref geom::Polygonal)
- * [Geometrys](@ref geom::Geometry).
- * ownership of elements _and_ vector are left to caller.
+ * @param polys a collection of polygonal [Geometrys](@ref geom::Geometry).
+ * ownership of elements *and* vector are left to caller.
*/
static geom::Geometry* Union(std::vector<geom::Polygon*>* polys);
/** \brief
- * Computes the union of a set of [Polygonal](@ref geom::Polygonal)
- * [Geometrys](@ref geom::Geometry).
+ * Computes the union of a set of polygonal [Geometrys](@ref geom::Geometry).
*
* @tparam T an iterator yelding something castable to const Polygon *
* @param start start iterator
@@ -133,21 +126,18 @@ public:
}
/** \brief
- * Computes the union of a collection of [Polygonal](@ref geom::Polygonal)
- * [Geometrys](@ref geom::Geometry).
+ * Computes the union of a collection of polygonal [Geometrys](@ref geom::Geometry).
*
- * @param polys a collection of [Polygonal](@ref geom::Polygonal)
- * [Geometrys](@ref geom::Geometry).
+ * @param polys a collection of polygonal [Geometrys](@ref geom::Geometry).
* Ownership of elements *and* vector are left to caller.
*/
static geom::Geometry* Union(const geom::MultiPolygon* polys);
/** \brief
- * Creates a new instance to union
- * the given collection of {@link geom::Geometry}s.
+ * Creates a new instance to union the given collection of
+ * [Geometrys](@ref geom::Geometry).
*
- * @param polys a collection of [Polygonal](@ref geom::Polygonal)
- * [Geometrys](@ref geom::Geometry).
+ * @param polys a collection of polygonal [Geometrys](@ref geom::Geometry).
* Ownership of elements *and* vector are left to caller.
*/
CascadedPolygonUnion(std::vector<geom::Polygon*>* polys)
diff --git a/include/geos/operation/union/PointGeometryUnion.h b/include/geos/operation/union/PointGeometryUnion.h
index f618262..3c22459 100644
--- a/include/geos/operation/union/PointGeometryUnion.h
+++ b/include/geos/operation/union/PointGeometryUnion.h
@@ -37,8 +37,8 @@ namespace geounion { // geos::operation::geounion
/**
* \brief
- * Computes the union of a [Puntal](@ref geom::Puntal) geometry with
- * another arbitrary [Geometry](@ref geom::Geometry).
+ * Computes the union of a puntal geometry with another
+ * arbitrary [Geometry](@ref geom::Geometry).
*
* Does not copy any component geometries.
*
-----------------------------------------------------------------------
Summary of changes:
include/geos/algorithm/BoundaryNodeRule.h | 2 +-
include/geos/algorithm/RayCrossingCounter.h | 19 ++++----
include/geos/algorithm/RayCrossingCounterDD.h | 9 ++--
.../algorithm/locate/IndexedPointInAreaLocator.h | 26 ++++++-----
.../algorithm/locate/SimplePointInAreaLocator.h | 13 +++---
include/geos/geom/Geometry.h | 39 +++++++----------
include/geos/geom/Location.h | 11 +++--
include/geos/geom/util/GeometryCombiner.h | 33 +++++++-------
.../geos/operation/union/CascadedPolygonUnion.h | 50 +++++++++-------------
include/geos/operation/union/PointGeometryUnion.h | 4 +-
10 files changed, 92 insertions(+), 114 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list