[geos-commits] r3429 - in trunk: include/geos/geomgraph
src/geomgraph
svn_geos at osgeo.org
svn_geos at osgeo.org
Wed Jul 6 03:02:13 EDT 2011
Author: strk
Date: 2011-07-06 00:02:13 -0700 (Wed, 06 Jul 2011)
New Revision: 3429
Modified:
trunk/include/geos/geomgraph/GeometryGraph.h
trunk/include/geos/geomgraph/GeometryGraph.inl
trunk/src/geomgraph/GeometryGraph.cpp
Log:
Nodes always have labels (ported JTS fix to GeometryGraph::insertBoundaryPoint). Update port info.
Modified: trunk/include/geos/geomgraph/GeometryGraph.h
===================================================================
--- trunk/include/geos/geomgraph/GeometryGraph.h 2011-07-06 07:02:02 UTC (rev 3428)
+++ trunk/include/geos/geomgraph/GeometryGraph.h 2011-07-06 07:02:13 UTC (rev 3429)
@@ -14,7 +14,7 @@
*
**********************************************************************
*
- * Last port: geomgraph/GeometryGraph.java rev. 1.9 (JTS-1.10)
+ * Last port: geomgraph/GeometryGraph.java r411 (JTS-1.12+)
*
**********************************************************************/
Modified: trunk/include/geos/geomgraph/GeometryGraph.inl
===================================================================
--- trunk/include/geos/geomgraph/GeometryGraph.inl 2011-07-06 07:02:02 UTC (rev 3428)
+++ trunk/include/geos/geomgraph/GeometryGraph.inl 2011-07-06 07:02:13 UTC (rev 3429)
@@ -13,7 +13,7 @@
*
**********************************************************************
*
- * Last port: geomgraph/GeometryGraph.java rev. 1.9 (JTS-1.10)
+ * Last port: geomgraph/GeometryGraph.java r411 (JTS-1.12+)
*
**********************************************************************/
Modified: trunk/src/geomgraph/GeometryGraph.cpp
===================================================================
--- trunk/src/geomgraph/GeometryGraph.cpp 2011-07-06 07:02:02 UTC (rev 3428)
+++ trunk/src/geomgraph/GeometryGraph.cpp 2011-07-06 07:02:13 UTC (rev 3429)
@@ -14,7 +14,7 @@
*
**********************************************************************
*
- * Last port: geomgraph/GeometryGraph.java rev. 1.9 (JTS-1.10)
+ * Last port: geomgraph/GeometryGraph.java r411 (JTS-1.12+)
*
**********************************************************************/
@@ -415,17 +415,17 @@
* iff if it is in the boundaries of an odd number of Geometries
*/
void
-GeometryGraph::insertBoundaryPoint(int argIndex,const Coordinate& coord)
+GeometryGraph::insertBoundaryPoint(int argIndex, const Coordinate& coord)
{
Node *n=nodes->addNode(coord);
+ // nodes always have labels
Label *lbl=n->getLabel();
+ assert(lbl);
// the new point to insert is on a boundary
int boundaryCount=1;
// determine the current location for the point (if any)
- if ( NULL == lbl ) return;
-
int loc = lbl->getLocation(argIndex,Position::ON);
if (loc==Location::BOUNDARY) boundaryCount++;
More information about the geos-commits
mailing list