[geos-commits] [SCM] GEOS branch master updated. 09ca35b403759c07a98aec829add26364f08a156
git at osgeo.org
git at osgeo.org
Sun Jun 2 22:47:25 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 09ca35b403759c07a98aec829add26364f08a156 (commit)
from 8cb7ae530008835c8e74cc5461c15683a9642e50 (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 09ca35b403759c07a98aec829add26364f08a156
Author: Sandro Santilli <strk at kbt.io>
Date: Mon Jun 3 07:32:22 2019 +0200
Fix some doxygen link resolutions
diff --git a/include/geos/algorithm/distance/DiscreteFrechetDistance.h b/include/geos/algorithm/distance/DiscreteFrechetDistance.h
index b1dacee..85cfb1c 100644
--- a/include/geos/algorithm/distance/DiscreteFrechetDistance.h
+++ b/include/geos/algorithm/distance/DiscreteFrechetDistance.h
@@ -62,7 +62,7 @@ namespace distance { // geos::algorithm::distance
/** \brief
* An algorithm for computing a distance metric
* which is an approximation to the Frechet Distance
- * based on a discretization of the input {@link Geometry}.
+ * based on a discretization of the input {@link geom::Geometry}.
*
* The algorithm computes the Frechet distance restricted to discrete points
* for one of the geometries.
diff --git a/include/geos/algorithm/distance/DiscreteHausdorffDistance.h b/include/geos/algorithm/distance/DiscreteHausdorffDistance.h
index 10a8bef..df198cc 100644
--- a/include/geos/algorithm/distance/DiscreteHausdorffDistance.h
+++ b/include/geos/algorithm/distance/DiscreteHausdorffDistance.h
@@ -59,7 +59,7 @@ namespace distance { // geos::algorithm::distance
/** \brief
* An algorithm for computing a distance metric
* which is an approximation to the Hausdorff Distance
- * based on a discretization of the input {@link Geometry}.
+ * based on a discretization of the input {@link geom::Geometry}.
*
* The algorithm computes the Hausdorff distance restricted to discrete points
* for one of the geometries.
diff --git a/include/geos/operation/distance/DistanceOp.h b/include/geos/operation/distance/DistanceOp.h
index e8f45cc..33b831b 100644
--- a/include/geos/operation/distance/DistanceOp.h
+++ b/include/geos/operation/distance/DistanceOp.h
@@ -56,7 +56,7 @@ namespace distance { // geos::operation::distance
/**
* \brief
- * Find two points on two {@link Geometry}s which lie
+ * Find two points on two {@link geom::Geometry}s which lie
* within a given distance, or else are the nearest points
* on the geometries (in which case this also
* provides the distance between the geometries).
@@ -78,8 +78,8 @@ public:
* \brief
* Compute the distance between the nearest points of two geometries.
*
- * @param g0 a {@link Geometry}
- * @param g1 another {@link Geometry}
+ * @param g0 a {@link geom::Geometry}
+ * @param g1 another {@link geom::Geometry}
* @return the distance between the geometries
* @return 0 if either input geometry is empty
* @throws IllegalArgumentException if either input geometry is null
@@ -96,8 +96,8 @@ public:
* Test whether two geometries lie within a given distance of
* each other.
*
- * @param g0 a {@link Geometry}
- * @param g1 another {@link Geometry}
+ * @param g0 a {@link geom::Geometry}
+ * @param g1 another {@link geom::Geometry}
* @param distance the distance to test
* @return true if g0.distance(g1) <= distance
*/
@@ -110,8 +110,8 @@ public:
*
* The points are presented in the same order as the input Geometries.
*
- * @param g0 a {@link Geometry}
- * @param g1 another {@link Geometry}
+ * @param g0 a {@link geom::Geometry}
+ * @param g1 another {@link geom::Geometry}
*
* @return the nearest points in the geometries, ownership to caller.
* A NULL return means one of the geometries is empty.
@@ -126,8 +126,8 @@ public:
*
* The points are presented in the same order as the input Geometries.
*
- * @param g0 a {@link Geometry}
- * @param g1 another {@link Geometry}
+ * @param g0 a {@link geom::Geometry}
+ * @param g1 another {@link geom::Geometry}
*
* @return the closest points in the geometries, ownership to caller.
* A NULL return means one of the geometries is empty.
@@ -177,7 +177,7 @@ public:
* Report the coordinates of the closest points in the input geometries.
* The points are presented in the same order as the input Geometries.
*
- * @return a pair of {@link Coordinate}s of the closest points
+ * @return a pair of {@link geom::Coordinate}s of the closest points
* as a newly allocated object (ownership to caller)
*
* @deprecated renamed to nearestPoints
@@ -188,7 +188,7 @@ public:
* Report the coordinates of the nearest points in the input geometries.
* The points are presented in the same order as the input Geometries.
*
- * @return a pair of {@link Coordinate}s of the nearest points
+ * @return a pair of {@link geom::Coordinate}s of the nearest points
* as a newly allocated object (ownership to caller)
*
*/
diff --git a/include/geos/operation/overlay/snap/GeometrySnapper.h b/include/geos/operation/overlay/snap/GeometrySnapper.h
index d984fa7..224f0da 100644
--- a/include/geos/operation/overlay/snap/GeometrySnapper.h
+++ b/include/geos/operation/overlay/snap/GeometrySnapper.h
@@ -41,7 +41,7 @@ namespace overlay { // geos::operation::overlay
namespace snap { // geos::operation::overlay::snap
/** \brief
- * Snaps the vertices and segments of a {@link Geometry}
+ * Snaps the vertices and segments of a {@link geom::Geometry}
* to another Geometry's vertices.
*
* A snap distance tolerance is used to control where snapping is performed.
@@ -89,7 +89,7 @@ public:
}
/** \brief
- * Snaps the vertices in the component {@link LineString}s
+ * Snaps the vertices in the component {@link geom::LineString}s
* of the source geometry to the vertices of the given snap geometry
* with a given snap tolerance
*
@@ -101,7 +101,7 @@ public:
double snapTolerance);
/** \brief
- * Snaps the vertices in the component {@link LineString}s
+ * Snaps the vertices in the component {@link geom::LineString}s
* of the source geometry to the vertices of itself
* with a given snap tolerance and optionally cleaning the result.
*
diff --git a/include/geos/operation/union/CascadedPolygonUnion.h b/include/geos/operation/union/CascadedPolygonUnion.h
index c095bf2..dc8cd85 100644
--- a/include/geos/operation/union/CascadedPolygonUnion.h
+++ b/include/geos/operation/union/CascadedPolygonUnion.h
@@ -52,7 +52,8 @@ namespace geounion { // geos::operation::geounion
/**
* \brief
* Provides an efficient method of unioning a collection of
- * {@link Polygonal} geometries.
+ * {@link geom::Polygonal} geometries.
+ *
* This algorithm is faster and likely more robust than
* the simple iterated approach of
* repeatedly unioning each polygon to a result geometry.
@@ -103,15 +104,17 @@ public:
/**
* Computes the union of
- * a collection of {@link Polygonal} {@link Geometry}s.
+ * a collection of {@link geom::Polygonal} {@link geom::Geometry}s.
*
- * @param polys a collection of {@link Polygonal} {@link Geometry}s.
- * ownership of elements _and_ vector are left to caller.
+ * @param polys a collection of {@link geom::Polygonal}
+ * {@link geom::Geometry}s.
+ * ownership of elements _and_ vector are left to caller.
*/
static geom::Geometry* Union(std::vector<geom::Polygon*>* polys);
/**
- * Computes the union of a set of {@link Polygonal} {@link Geometry}s.
+ * Computes the union of a set of {@link geom::Polygonal}
+ * {@link geom::Geometry}s.
*
* @tparam T an iterator yelding something castable to const Polygon *
* @param start start iterator
@@ -131,19 +134,21 @@ public:
/**
* Computes the union of
- * a collection of {@link Polygonal} {@link Geometry}s.
+ * a collection of {@link geom::Polygonal} {@link geom::Geometry}s.
*
- * @param polys a collection of {@link Polygonal} {@link Geometry}s
- * ownership of elements _and_ vector are left to caller.
+ * @param polys a collection of {@link geom::Polygonal}
+ * {@link geom::Geometry}s.
+ * Ownership of elements _and_ vector are left to caller.
*/
static geom::Geometry* Union(const geom::MultiPolygon* polys);
/**
* Creates a new instance to union
- * the given collection of {@link Geometry}s.
+ * the given collection of {@link geom::Geometry}s.
*
- * @param geoms a collection of {@link Polygonal} {@link Geometry}s
- * ownership of elements _and_ vector are left to caller.
+ * @param geoms a collection of {@link geom::Polygonal}
+ * {@link geom::Geometry}s.
+ * Ownership of elements _and_ vector are left to caller.
*/
CascadedPolygonUnion(std::vector<geom::Polygon*>* polys)
: inputPolys(polys),
diff --git a/include/geos/operation/union/CascadedUnion.h b/include/geos/operation/union/CascadedUnion.h
index 77d6361..ecfa4a7 100644
--- a/include/geos/operation/union/CascadedUnion.h
+++ b/include/geos/operation/union/CascadedUnion.h
@@ -70,15 +70,15 @@ public:
CascadedUnion();
/**
- * Computes the union of a collection of {@link Geometry}s.
+ * Computes the union of a collection of {@link geom::Geometry}s.
*
- * @param geoms a collection of {@link Geometry}s.
+ * @param geoms a collection of {@link geom::Geometry}s.
* ownership of elements _and_ vector are left to caller.
*/
static geom::Geometry* Union(std::vector<geom::Geometry*>* geoms);
/**
- * Computes the union of a set of {@link Geometry}s.
+ * Computes the union of a set of {@link geom::Geometry}s.
*
* @tparam T an iterator yelding something castable to const Geometry *
* @param start start iterator
@@ -98,10 +98,10 @@ public:
/**
* Creates a new instance to union
- * the given collection of {@link Geometry}s.
+ * the given collection of {@link geom::Geometry}s.
*
- * @param geoms a collection of {@link Geometryal} {@link Geometry}s
- * ownership of elements _and_ vector are left to caller.
+ * @param geoms a collection of {@link geom::Geometry}s.
+ * Ownership of elements _and_ vector are left to caller.
*/
CascadedUnion(const std::vector<geom::Geometry*>* geoms)
: inputGeoms(geoms),
diff --git a/include/geos/precision/GeometryPrecisionReducer.h b/include/geos/precision/GeometryPrecisionReducer.h
index 5999839..250c626 100644
--- a/include/geos/precision/GeometryPrecisionReducer.h
+++ b/include/geos/precision/GeometryPrecisionReducer.h
@@ -36,8 +36,8 @@ namespace geos {
namespace precision { // geos.precision
/** \brief
- * Reduces the precision of a {@link Geometry}
- * according to the supplied {@link PrecisionModel},
+ * Reduces the precision of a {@link geom::Geometry}
+ * according to the supplied {@link geom::PrecisionModel},
* ensuring that the result is topologically valid.
*/
class GEOS_DLL GeometryPrecisionReducer {
diff --git a/include/geos/precision/SimpleGeometryPrecisionReducer.h b/include/geos/precision/SimpleGeometryPrecisionReducer.h
index 982d38a..cd8b1b3 100644
--- a/include/geos/precision/SimpleGeometryPrecisionReducer.h
+++ b/include/geos/precision/SimpleGeometryPrecisionReducer.h
@@ -29,8 +29,8 @@ namespace geos {
namespace precision { // geos.precision
/** \brief
- * Reduces the precision of a {@link Geometry}
- * according to the supplied {@link PrecisionModel}, without
+ * Reduces the precision of a {@link geom::Geometry}
+ * according to the supplied {@link geom::PrecisionModel}, without
* attempting to preserve valid topology.
*
* The topology of the resulting geometry may be invalid if
diff --git a/include/geos/triangulate/DelaunayTriangulationBuilder.h b/include/geos/triangulate/DelaunayTriangulationBuilder.h
index e39e9bf..38379d2 100644
--- a/include/geos/triangulate/DelaunayTriangulationBuilder.h
+++ b/include/geos/triangulate/DelaunayTriangulationBuilder.h
@@ -55,14 +55,18 @@ namespace triangulate { //geos.triangulate
class GEOS_DLL DelaunayTriangulationBuilder {
public:
/**
- * Extracts the unique {@link Coordinate}s from the given {@link Geometry}.
+ * Extracts the unique {@link geom::Coordinate}s from the given
+ * {@link geom::Geometry}.
+ *
* @param geom the geometry to extract from
* @return a List of the unique Coordinates. Caller takes ownership of the returned object.
*/
static std::unique_ptr<geom::CoordinateSequence> extractUniqueCoordinates(const geom::Geometry& geom);
/**
- * Converts all {@link Coordinate}s in a collection to {@link Vertex}es.
+ * Converts all {@link geom::Coordinate}s in a collection to
+ * {@link quadedge::Vertex}es.
+ *
* @param coords the coordinates to convert
* @return a List of Vertex objects. Call takes ownership of returned object.
*/
@@ -99,7 +103,7 @@ public:
/**
* Sets the sites (vertices) which will be triangulated
- * from a collection of {@link Coordinate}s.
+ * from a collection of {@link geom::Coordinate}s.
*
* @param geom a CoordinateSequence.
*/
@@ -130,7 +134,7 @@ public:
quadedge::QuadEdgeSubdivision& getSubdivision();
/**
- * Gets the edges of the computed triangulation as a {@link MultiLineString}.
+ * Gets the edges of the computed triangulation as a {@link geom::MultiLineString}.
*
* @param geomFact the geometry factory to use to create the output
* @return the edges of the triangulation. The caller takes ownership of the returned object.
@@ -138,8 +142,8 @@ public:
std::unique_ptr<geom::MultiLineString> getEdges(const geom::GeometryFactory& geomFact);
/**
- * Gets the faces of the computed triangulation as a {@link GeometryCollection}
- * of {@link Polygon}.
+ * Gets the faces of the computed triangulation as a {@link geom::GeometryCollection}
+ * of {@link geom::Polygon}.
*
* @param geomFact the geometry factory to use to create the output
* @return the faces of the triangulation. The caller takes ownership of the returned object.
@@ -147,7 +151,8 @@ public:
std::unique_ptr<geom::GeometryCollection> getTriangles(const geom::GeometryFactory& geomFact);
/**
- * Computes the {@link Envelope} of a collection of {@link Coordinate}s.
+ * Computes the {@link geom::Envelope} of a collection of
+ * {@link geom::Coordinate}s.
*
* @param coords a List of Coordinates
* @return the envelope of the set of coordinates
diff --git a/include/geos/triangulate/IncrementalDelaunayTriangulator.h b/include/geos/triangulate/IncrementalDelaunayTriangulator.h
index b4ad5fc..340e2e2 100644
--- a/include/geos/triangulate/IncrementalDelaunayTriangulator.h
+++ b/include/geos/triangulate/IncrementalDelaunayTriangulator.h
@@ -33,8 +33,8 @@ class QuadEdgeSubdivision;
}
/**
- * Computes a Delauanay Triangulation of a set of {@link Vertex}es, using an
- * incrementatal insertion algorithm.
+ * Computes a Delauanay Triangulation of a set of {@link quadedge::Vertex}es,
+ * using an incrementatal insertion algorithm.
*
* @author JTS: Martin Davis
* @author Benjamin Campbell
@@ -46,7 +46,7 @@ private:
public:
/**
- * Creates a new triangulator using the given {@link QuadEdgeSubdivision}.
+ * Creates a new triangulator using the given {@link quadedge::QuadEdgeSubdivision}.
* The triangulator uses the tolerance of the supplied subdivision.
*
* @param subdiv
-----------------------------------------------------------------------
Summary of changes:
.../algorithm/distance/DiscreteFrechetDistance.h | 2 +-
.../algorithm/distance/DiscreteHausdorffDistance.h | 2 +-
include/geos/operation/distance/DistanceOp.h | 22 +++++++++---------
.../geos/operation/overlay/snap/GeometrySnapper.h | 6 ++---
.../geos/operation/union/CascadedPolygonUnion.h | 27 +++++++++++++---------
include/geos/operation/union/CascadedUnion.h | 12 +++++-----
include/geos/precision/GeometryPrecisionReducer.h | 4 ++--
.../precision/SimpleGeometryPrecisionReducer.h | 4 ++--
.../triangulate/DelaunayTriangulationBuilder.h | 19 +++++++++------
.../triangulate/IncrementalDelaunayTriangulator.h | 6 ++---
10 files changed, 57 insertions(+), 47 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list