[geos-commits] [SCM] GEOS branch master updated. 6fa30ee64b91f3456c4b6435cb6713ad1c6cdebc
git at osgeo.org
git at osgeo.org
Thu Dec 13 15:28:17 PST 2018
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 6fa30ee64b91f3456c4b6435cb6713ad1c6cdebc (commit)
from 949b1eba15df850437a805497accccdaaaf99bac (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 6fa30ee64b91f3456c4b6435cb6713ad1c6cdebc
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Dec 13 15:27:49 2018 -0800
Remove CentroidArea, CentroidLine, CentroidPoint as per
JTS 0a775496322c11bc6d838acf99d0106b926a13aa
diff --git a/include/geos/algorithm/CentroidArea.h b/include/geos/algorithm/CentroidArea.h
deleted file mode 100644
index 186d792..0000000
--- a/include/geos/algorithm/CentroidArea.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/**********************************************************************
- *
- * GEOS - Geometry Engine Open Source
- * http://geos.osgeo.org
- *
- * Copyright (C) 2005-2006 Refractions Research Inc.
- * Copyright (C) 2001-2002 Vivid Solutions Inc.
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation.
- * See the COPYING file for more information.
- *
- **********************************************************************
- *
- * Last port: algorithm/CentroidArea.java r612
- *
- **********************************************************************/
-
-#ifndef GEOS_ALGORITHM_CENTROIDAREA_H
-#define GEOS_ALGORITHM_CENTROIDAREA_H
-
-
-#include <geos/export.h>
-#include <geos/geom/Coordinate.h>
-
-// Forward declarations
-namespace geos {
- namespace geom {
- class CoordinateSequence;
- class Geometry;
- class Polygon;
- }
-}
-
-namespace geos {
-namespace algorithm { // geos::algorithm
-
-/**
- * \class CentroidArea geosAlgorithm.h geos/geosAlgorithm.h
- *
- * \brief Computes the centroid of an area geometry.
- *
- * Algorithm:
- *
- * Based on the usual algorithm for calculating
- * the centroid as a weighted sum of the centroids
- * of a decomposition of the area into (possibly overlapping) triangles.
- * The algorithm has been extended to handle holes and multi-polygons.
- * See <code>http://www.faqs.org/faqs/graphics/algorithms-faq/</code>
- * for further details of the basic approach.
- *
- * The code has also be extended to handle degenerate (zero-area) polygons.
- * In this case, the centroid of the line segments in the polygon
- * will be returned.
- *
- * @deprecated use Centroid instead
- *
- */
-class GEOS_DLL CentroidArea {
-
-public:
-
- CentroidArea()
- :
- basePt(0.0, 0.0),
- areasum2(0.0),
- totalLength(0.0)
- {}
-
- ~CentroidArea() {}
-
- /**
- * Adds the area defined by a Geometry to the centroid total.
- * If the geometry has no area it does not contribute to the centroid.
- *
- * @param geom the geometry to add
- */
- void add(const geom::Geometry *geom);
-
- /**
- * Adds the area defined by an array of
- * coordinates. The array must be a ring;
- * i.e. end with the same coordinate as it starts with.
- * @param ring an array of {@link Coordinate}s
- */
- void add(const geom::CoordinateSequence *ring);
-
- // TODO: deprecate
- geom::Coordinate* getCentroid() const;
-
- /// Return false if a centroid couldn't be computed ( empty polygon )
- bool getCentroid(geom::Coordinate& ret) const;
-
-private:
-
- /// the point all triangles are based at
- geom::Coordinate basePt;
-
- // temporary variable to hold centroid of triangle
- geom::Coordinate triangleCent3;
-
- /// Partial area sum
- double areasum2;
-
- /// partial centroid sum
- geom::Coordinate cg3;
-
- // data for linear centroid computation, if needed
- geom::Coordinate centSum;
- double totalLength;
-
- void setBasePoint(const geom::Coordinate &newbasePt);
-
- void add(const geom::Polygon *poly);
-
- void addShell(const geom::CoordinateSequence *pts);
-
- void addHole(const geom::CoordinateSequence *pts);
-
- void addTriangle(const geom::Coordinate &p0, const geom::Coordinate &p1,
- const geom::Coordinate &p2,bool isPositiveArea);
-
- static void centroid3(const geom::Coordinate &p1, const geom::Coordinate &p2,
- const geom::Coordinate &p3, geom::Coordinate &c);
-
- static double area2(const geom::Coordinate &p1, const geom::Coordinate &p2,
- const geom::Coordinate &p3);
-
- /**
- * Adds the linear segments defined by an array of coordinates
- * to the linear centroid accumulators.
- *
- * This is done in case the polygon(s) have zero-area,
- * in which case the linear centroid is computed instead.
- *
- * @param pts an array of {@link Coordinate}s
- */
- void addLinearSegments(const geom::CoordinateSequence& pts);
-
-};
-
-} // namespace geos::algorithm
-} // namespace geos
-
-
-#endif // GEOS_ALGORITHM_CENTROIDAREA_H
diff --git a/include/geos/algorithm/CentroidLine.h b/include/geos/algorithm/CentroidLine.h
deleted file mode 100644
index 8d58ffd..0000000
--- a/include/geos/algorithm/CentroidLine.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**********************************************************************
- *
- * GEOS - Geometry Engine Open Source
- * http://geos.osgeo.org
- *
- * Copyright (C) 2005-2006 Refractions Research Inc.
- * Copyright (C) 2001-2002 Vivid Solutions Inc.
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation.
- * See the COPYING file for more information.
- *
- **********************************************************************/
-
-#ifndef GEOS_ALGORITHM_CENTROIDLINE_H
-#define GEOS_ALGORITHM_CENTROIDLINE_H
-
-
-#include <geos/export.h>
-#include <geos/geom/Coordinate.h>
-
-// Forward declarations
-namespace geos {
- namespace geom {
- class Geometry;
- class CoordinateSequence;
- }
-}
-
-namespace geos {
-namespace algorithm { // geos::algorithm
-
-/// @deprecated use Centroid instead
-class GEOS_DLL CentroidLine {
-private:
-
- geom::Coordinate centSum;
-
- double totalLength;
-
-public:
-
- CentroidLine()
- :
- centSum(0.0, 0.0),
- totalLength(0.0)
- {}
-
- ~CentroidLine() {}
-
- /** \brief
- * Adds the linestring(s) defined by a Geometry to the centroid total.
- *
- * If the geometry is not linear it does not contribute to the centroid
- * @param geom the geometry to add
- */
- void add(const geom::Geometry *geom);
-
- /** \brief
- * Adds the length defined by an array of coordinates.
- *
- * @param pts an array of {@link geom::Coordinate}s
- */
- void add(const geom::CoordinateSequence *pts);
-
- geom::Coordinate* getCentroid() const;
-
- /// return false if centroid could not be computed
- bool getCentroid(geom::Coordinate& ret) const;
-};
-
-} // namespace geos::algorithm
-} // namespace geos
-
-
-#endif // GEOS_ALGORITHM_CENTROIDLINE_H
diff --git a/include/geos/algorithm/CentroidPoint.h b/include/geos/algorithm/CentroidPoint.h
deleted file mode 100644
index ef2fee2..0000000
--- a/include/geos/algorithm/CentroidPoint.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/**********************************************************************
- *
- * GEOS - Geometry Engine Open Source
- * http://geos.osgeo.org
- *
- * Copyright (C) 2005-2006 Refractions Research Inc.
- * Copyright (C) 2001-2002 Vivid Solutions Inc.
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation.
- * See the COPYING file for more information.
- *
- **********************************************************************/
-
-#ifndef GEOS_ALGORITHM_CENTROIDPOINT_H
-#define GEOS_ALGORITHM_CENTROIDPOINT_H
-
-#include <geos/export.h>
-#include <geos/geom/Coordinate.h>
-
-// Forward declarations
-namespace geos {
- namespace geom {
- class Geometry;
- }
-}
-
-
-namespace geos {
-namespace algorithm { // geos::algorithm
-
-/// @deprecated use Centroid instead
-class GEOS_DLL CentroidPoint {
-
-private:
-
- int ptCount;
-
- geom::Coordinate centSum;
-
-public:
-
- CentroidPoint()
- :
- ptCount(0),
- centSum(0.0, 0.0)
- {}
-
- ~CentroidPoint()
- {}
-
- /**
- * Adds the point(s) defined by a Geometry to the centroid total.
- * If the geometry is not of dimension 0 it does not contribute to the
- * centroid.
- * @param geom the geometry to add
- */
- void add(const geom::Geometry *geom);
-
- void add(const geom::Coordinate *pt);
-
- geom::Coordinate* getCentroid() const;
-
- /// Return false if centroid could not be computed
- bool getCentroid(geom::Coordinate& ret) const;
-};
-
-} // namespace geos::algorithm
-} // namespace geos
-
-#endif // GEOS_ALGORITHM_CENTROIDPOINT_H
diff --git a/include/geos/algorithm/Makefile.am b/include/geos/algorithm/Makefile.am
index 6abf2f5..19f13c9 100644
--- a/include/geos/algorithm/Makefile.am
+++ b/include/geos/algorithm/Makefile.am
@@ -15,9 +15,6 @@ geos_HEADERS = \
BoundaryNodeRule.h \
CentralEndpointIntersector.h \
Centroid.h \
- CentroidArea.h \
- CentroidLine.h \
- CentroidPoint.h \
CGAlgorithms.h \
ConvexHull.h \
ConvexHull.inl \
diff --git a/include/geos/geosAlgorithm.h b/include/geos/geosAlgorithm.h
index 006da80..1a93e24 100644
--- a/include/geos/geosAlgorithm.h
+++ b/include/geos/geosAlgorithm.h
@@ -27,9 +27,6 @@
#define GEOS_ALGORITHM_H
//#include <geos/algorithm/CGAlgorithms.h>
-//#include <geos/algorithm/CentroidArea.h>
-//#include <geos/algorithm/CentroidLine.h>
-//#include <geos/algorithm/CentroidPoint.h>
//#include <geos/algorithm/ConvexHull.h>
//#include <geos/algorithm/HCoordinate.h>
//#include <geos/algorithm/InteriorPointArea.h>
diff --git a/src/Makefile.vc b/src/Makefile.vc
index 3874378..803d3bd 100644
--- a/src/Makefile.vc
+++ b/src/Makefile.vc
@@ -33,9 +33,6 @@ OBJ = \
algorithm\Angle.$(EXT) \
algorithm\BoundaryNodeRule.$(EXT) \
algorithm\Centroid.$(EXT) \
- algorithm\CentroidArea.$(EXT) \
- algorithm\CentroidLine.$(EXT) \
- algorithm\CentroidPoint.$(EXT) \
algorithm\CGAlgorithms.$(EXT) \
algorithm\ConvexHull.$(EXT) \
algorithm\HCoordinate.$(EXT) \
diff --git a/src/algorithm/CentroidArea.cpp b/src/algorithm/CentroidArea.cpp
deleted file mode 100644
index 607d98e..0000000
--- a/src/algorithm/CentroidArea.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/**********************************************************************
- *
- * GEOS - Geometry Engine Open Source
- * http://geos.osgeo.org
- *
- * Copyright (C) 2001-2002 Vivid Solutions Inc.
- * Copyright (C) 2006 Refractions Research Inc.
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation.
- * See the COPYING file for more information.
- *
- **********************************************************************
- *
- * Last port: algorithm/CentroidArea.java r612
- *
- **********************************************************************/
-
-#include <geos/algorithm/CentroidArea.h>
-#include <geos/algorithm/CGAlgorithms.h>
-#include <geos/geom/Coordinate.h>
-#include <geos/geom/CoordinateSequence.h>
-#include <geos/geom/Geometry.h>
-#include <geos/geom/GeometryCollection.h>
-#include <geos/geom/LineString.h>
-#include <geos/geom/Polygon.h>
-
-#include <typeinfo>
-
-using namespace geos::geom;
-
-namespace geos {
-namespace algorithm { // geos.algorithm
-
-/*public*/
-void
-CentroidArea::add(const Geometry *geom)
-{
- if(geom->isEmpty()) return;
- else if(const Polygon *poly=dynamic_cast<const Polygon*>(geom)) {
- setBasePoint(poly->getExteriorRing()->getCoordinateN(0));
- add(poly);
- }
- else if(const GeometryCollection *gc=dynamic_cast<const GeometryCollection*>(geom))
- {
- for(std::size_t i=0, n=gc->getNumGeometries(); i<n; ++i)
- {
- add(gc->getGeometryN(i));
- }
- }
-}
-
-/*public*/
-void
-CentroidArea::add(const CoordinateSequence *ring)
-{
- setBasePoint(ring->getAt(0));
- addShell(ring);
-}
-
-/* TODO: deprecate this */
-Coordinate*
-CentroidArea::getCentroid() const
-{
- Coordinate *cent = new Coordinate();
- getCentroid(*cent); // or return NULL on failure !
- return cent;
-}
-
-bool
-CentroidArea::getCentroid(Coordinate& ret) const
-{
- if ( areasum2 ) {
- ret = Coordinate(cg3.x/3.0/areasum2, cg3.y/3.0/areasum2);
- } else if ( totalLength ) {
- ret = Coordinate(centSum.x/totalLength, centSum.y/totalLength);
- } else {
- return false;
- }
- return true;
-}
-
-void
-CentroidArea::setBasePoint(const Coordinate &newbasePt)
-{
- basePt=newbasePt;
-}
-
-void
-CentroidArea::add(const Polygon *poly)
-{
- addShell(poly->getExteriorRing()->getCoordinatesRO());
- for(size_t i=0, n=poly->getNumInteriorRing(); i<n; ++i)
- {
- addHole(poly->getInteriorRingN(i)->getCoordinatesRO());
- }
-}
-
-void
-CentroidArea::addShell(const CoordinateSequence *pts)
-{
- bool isPositiveArea=!CGAlgorithms::isCCW(pts);
- std::size_t const n=pts->getSize()-1;
- for(std::size_t i=0; i<n; ++i)
- {
- addTriangle(basePt, pts->getAt(i), pts->getAt(i+1), isPositiveArea);
- }
- addLinearSegments(*pts);
-}
-
-void
-CentroidArea::addHole(const CoordinateSequence *pts)
-{
- bool isPositiveArea=CGAlgorithms::isCCW(pts);
- std::size_t const n=pts->getSize()-1;
- for(std::size_t i=0; i<n; ++i)
- {
- addTriangle(basePt, pts->getAt(i), pts->getAt(i+1), isPositiveArea);
- }
- addLinearSegments(*pts);
-}
-
-void
-CentroidArea::addTriangle(const Coordinate &p0, const Coordinate &p1,
- const Coordinate &p2, bool isPositiveArea)
-{
- double sign=(isPositiveArea)?1.0:-1.0;
- centroid3(p0,p1,p2,triangleCent3);
- double area2res=area2(p0,p1,p2);
- cg3.x+=sign*area2res*triangleCent3.x;
- cg3.y+=sign*area2res*triangleCent3.y;
- areasum2+=sign*area2res;
-}
-
-/**
- * Returns three times the centroid of the triangle p1-p2-p3.
- * The factor of 3 is
- * left in to permit division to be avoided until later.
- */
-void
-CentroidArea::centroid3(const Coordinate &p1, const Coordinate &p2,
- const Coordinate &p3, Coordinate &c)
-{
- c.x=p1.x+p2.x+p3.x;
- c.y=p1.y+p2.y+p3.y;
-}
-
-/**
- * Returns twice the signed area of the triangle p1-p2-p3,
- * positive if a,b,c are oriented ccw, and negative if cw.
- */
-double
-CentroidArea::area2(const Coordinate &p1, const Coordinate &p2, const Coordinate &p3)
-{
- return (p2.x-p1.x)*(p3.y-p1.y)-(p3.x-p1.x)*(p2.y-p1.y);
-}
-
-void
-CentroidArea::addLinearSegments(const geom::CoordinateSequence& pts)
-{
- std::size_t const n = pts.size()-1;
- for (std::size_t i = 0; i < n; ++i) {
- double segmentLen = pts[i].distance(pts[i + 1]);
- totalLength += segmentLen;
-
- double midx = (pts[i].x + pts[i + 1].x) / 2;
- centSum.x += segmentLen * midx;
- double midy = (pts[i].y + pts[i + 1].y) / 2;
- centSum.y += segmentLen * midy;
- }
-}
-
-} // namespace geos.algorithm
-} //namespace geos
diff --git a/src/algorithm/CentroidLine.cpp b/src/algorithm/CentroidLine.cpp
deleted file mode 100644
index 7577fd4..0000000
--- a/src/algorithm/CentroidLine.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/**********************************************************************
- *
- * GEOS - Geometry Engine Open Source
- * http://geos.osgeo.org
- *
- * Copyright (C) 2001-2002 Vivid Solutions Inc.
- * Copyright (C) 2005 Refractions Research Inc.
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation.
- * See the COPYING file for more information.
- *
- **********************************************************************
- *
- **********************************************************************/
-
-#include <geos/algorithm/CentroidLine.h>
-#include <geos/geom/Coordinate.h>
-#include <geos/geom/CoordinateSequence.h>
-#include <geos/geom/Geometry.h>
-#include <geos/geom/GeometryCollection.h>
-#include <geos/geom/LineString.h>
-
-#include <typeinfo>
-
-using namespace geos::geom;
-
-namespace geos {
-namespace algorithm { // geos.algorithm
-
-/*public*/
-void
-CentroidLine::add(const Geometry *geom)
-{
- const LineString* ls = dynamic_cast<const LineString*>(geom);
- if ( ls )
- {
- add(ls->getCoordinatesRO());
- return;
- }
-
- const GeometryCollection* gc = dynamic_cast<const GeometryCollection*>(geom);
- if (gc)
- {
- for(std::size_t i=0, n=gc->getNumGeometries(); i<n; i++) {
- add(gc->getGeometryN(i));
- }
- }
-}
-
-/*public*/
-void
-CentroidLine::add(const CoordinateSequence *pts)
-{
- std::size_t const npts=pts->getSize();
-
- for(std::size_t i=1; i<npts; ++i)
- {
- const Coordinate &p1=pts->getAt(i-1);
- const Coordinate &p2=pts->getAt(i);
-
- double segmentLen=p1.distance(p2);
- totalLength+=segmentLen;
- double midx=(p1.x+p2.x)/2;
- centSum.x+=segmentLen*midx;
- double midy=(p1.y+p2.y)/2;
- centSum.y+=segmentLen*midy;
- }
-}
-
-Coordinate *
-CentroidLine::getCentroid() const
-{
- return new Coordinate(centSum.x/totalLength, centSum.y/totalLength);
-}
-
-bool
-CentroidLine::getCentroid(Coordinate& c) const
-{
- if ( totalLength == 0.0 ) return false;
- c=Coordinate(centSum.x/totalLength, centSum.y/totalLength);
- return true;
-}
-
-} // namespace geos.algorithm
-} // namespace geos
diff --git a/src/algorithm/CentroidPoint.cpp b/src/algorithm/CentroidPoint.cpp
deleted file mode 100644
index 49fd57c..0000000
--- a/src/algorithm/CentroidPoint.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/**********************************************************************
- *
- * GEOS - Geometry Engine Open Source
- * http://geos.osgeo.org
- *
- * Copyright (C) 2001-2002 Vivid Solutions Inc.
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation.
- * See the COPYING file for more information.
- *
- **********************************************************************/
-
-#include <geos/algorithm/CentroidPoint.h>
-#include <geos/geom/Coordinate.h>
-#include <geos/geom/Geometry.h>
-#include <geos/geom/GeometryCollection.h>
-#include <geos/geom/MultiPoint.h>
-#include <geos/geom/Point.h>
-
-#include <typeinfo>
-
-using namespace geos::geom;
-
-namespace geos {
-namespace algorithm { // geos.algorithm
-
-
-void
-CentroidPoint::add(const Geometry *geom)
-{
- if ( const Point *p = dynamic_cast<const Point*>(geom) )
- {
- add(p->getCoordinate());
- }
- else if ( const GeometryCollection *gc =
- dynamic_cast<const GeometryCollection*>(geom) )
- {
- for(std::size_t i=0, n=gc->getNumGeometries(); i<n; ++i) {
- add(gc->getGeometryN(i));
- }
- }
-}
-
-void
-CentroidPoint::add(const Coordinate *pt)
-{
- ptCount+=1;
- centSum.x += pt->x;
- centSum.y += pt->y;
-}
-
-Coordinate*
-CentroidPoint::getCentroid() const
-{
- return new Coordinate(centSum.x/ptCount, centSum.y/ptCount);
-}
-
-bool
-CentroidPoint::getCentroid(Coordinate& ret) const
-{
- if ( ptCount == 0.0 ) return false;
- ret=Coordinate(centSum.x/ptCount, centSum.y/ptCount);
- return true;
-}
-
-} // namespace geos.algorithm
-} // namespace geos
-
diff --git a/src/algorithm/Makefile.am b/src/algorithm/Makefile.am
index 082a2a9..062d835 100644
--- a/src/algorithm/Makefile.am
+++ b/src/algorithm/Makefile.am
@@ -13,9 +13,6 @@ libalgorithm_la_SOURCES = \
Angle.cpp \
BoundaryNodeRule.cpp \
Centroid.cpp \
- CentroidArea.cpp \
- CentroidLine.cpp \
- CentroidPoint.cpp \
CGAlgorithms.cpp \
CGAlgorithmsDD.cpp \
ConvexHull.cpp \
-----------------------------------------------------------------------
Summary of changes:
include/geos/algorithm/CentroidArea.h | 147 ---------------------------
include/geos/algorithm/CentroidLine.h | 77 ---------------
include/geos/algorithm/CentroidPoint.h | 72 --------------
include/geos/algorithm/Makefile.am | 3 -
include/geos/geosAlgorithm.h | 3 -
src/Makefile.vc | 3 -
src/algorithm/CentroidArea.cpp | 175 ---------------------------------
src/algorithm/CentroidLine.cpp | 87 ----------------
src/algorithm/CentroidPoint.cpp | 70 -------------
src/algorithm/Makefile.am | 3 -
10 files changed, 640 deletions(-)
delete mode 100644 include/geos/algorithm/CentroidArea.h
delete mode 100644 include/geos/algorithm/CentroidLine.h
delete mode 100644 include/geos/algorithm/CentroidPoint.h
delete mode 100644 src/algorithm/CentroidArea.cpp
delete mode 100644 src/algorithm/CentroidLine.cpp
delete mode 100644 src/algorithm/CentroidPoint.cpp
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list