[geos-commits] r2562 - in trunk/source:
headers/geos/operation/linemerge operation/linemerge
svn_geos at osgeo.org
svn_geos at osgeo.org
Mon Jun 8 11:28:28 EDT 2009
Author: strk
Date: 2009-06-08 11:28:27 -0400 (Mon, 08 Jun 2009)
New Revision: 2562
Modified:
trunk/source/headers/geos/operation/linemerge/EdgeString.h
trunk/source/headers/geos/operation/linemerge/LineMergeDirectedEdge.h
trunk/source/headers/geos/operation/linemerge/LineMergeEdge.h
trunk/source/headers/geos/operation/linemerge/LineMergeGraph.h
trunk/source/headers/geos/operation/linemerge/LineMerger.h
trunk/source/headers/geos/operation/linemerge/LineSequencer.h
trunk/source/operation/linemerge/EdgeString.cpp
trunk/source/operation/linemerge/LineMergeDirectedEdge.cpp
trunk/source/operation/linemerge/LineMergeEdge.cpp
trunk/source/operation/linemerge/LineMergeGraph.cpp
trunk/source/operation/linemerge/LineMerger.cpp
trunk/source/operation/linemerge/LineSequencer.cpp
Log:
Port info in operation::linemerge (a single class is still at JTS-1.7, needs changes in GeometryGraphComponent.h to go up)
Modified: trunk/source/headers/geos/operation/linemerge/EdgeString.h
===================================================================
--- trunk/source/headers/geos/operation/linemerge/EdgeString.h 2009-06-08 10:37:11 UTC (rev 2561)
+++ trunk/source/headers/geos/operation/linemerge/EdgeString.h 2009-06-08 15:28:27 UTC (rev 2562)
@@ -11,6 +11,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: operation/linemerge/EdgeString.java rev. 1.5 (JTS-1.10)
+ *
**********************************************************************/
#ifndef GEOS_OP_LINEMERGE_EDGESTRING_H
Modified: trunk/source/headers/geos/operation/linemerge/LineMergeDirectedEdge.h
===================================================================
--- trunk/source/headers/geos/operation/linemerge/LineMergeDirectedEdge.h 2009-06-08 10:37:11 UTC (rev 2561)
+++ trunk/source/headers/geos/operation/linemerge/LineMergeDirectedEdge.h 2009-06-08 15:28:27 UTC (rev 2562)
@@ -11,6 +11,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: operation/linemerge/LineMergeDirectedEdge.java rev. 1.5 (JTS-1.10)
+ *
**********************************************************************/
#ifndef GEOS_OP_LINEMERGE_LINEMERGEDIRECTEDEDGE_H
Modified: trunk/source/headers/geos/operation/linemerge/LineMergeEdge.h
===================================================================
--- trunk/source/headers/geos/operation/linemerge/LineMergeEdge.h 2009-06-08 10:37:11 UTC (rev 2561)
+++ trunk/source/headers/geos/operation/linemerge/LineMergeEdge.h 2009-06-08 15:28:27 UTC (rev 2562)
@@ -11,6 +11,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: operation/linemerge/LineMergeEdge.java rev. 1.4 (JTS-1.10)
+ *
**********************************************************************/
#ifndef GEOS_OP_LINEMERGE_LINEMERGEEDGE_H
Modified: trunk/source/headers/geos/operation/linemerge/LineMergeGraph.h
===================================================================
--- trunk/source/headers/geos/operation/linemerge/LineMergeGraph.h 2009-06-08 10:37:11 UTC (rev 2561)
+++ trunk/source/headers/geos/operation/linemerge/LineMergeGraph.h 2009-06-08 15:28:27 UTC (rev 2562)
@@ -11,6 +11,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: operation/linemerge/LineMergeGraph.java rev. 1.5 (JTS-1.10)
+ *
**********************************************************************/
#ifndef GEOS_OP_LINEMERGE_LINEMERGEGRAPH_H
Modified: trunk/source/headers/geos/operation/linemerge/LineMerger.h
===================================================================
--- trunk/source/headers/geos/operation/linemerge/LineMerger.h 2009-06-08 10:37:11 UTC (rev 2561)
+++ trunk/source/headers/geos/operation/linemerge/LineMerger.h 2009-06-08 15:28:27 UTC (rev 2562)
@@ -11,6 +11,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: operation/linemerge/LineMerger.java rev. 1.6 (JTS-1.7)
+ *
**********************************************************************/
#ifndef GEOS_OP_LINEMERGE_LINEMERGER_H
Modified: trunk/source/headers/geos/operation/linemerge/LineSequencer.h
===================================================================
--- trunk/source/headers/geos/operation/linemerge/LineSequencer.h 2009-06-08 10:37:11 UTC (rev 2561)
+++ trunk/source/headers/geos/operation/linemerge/LineSequencer.h 2009-06-08 15:28:27 UTC (rev 2562)
@@ -11,6 +11,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: operation/linemerge/LineSequencer.java rev. 1.6 (JTS-1.10)
+ *
**********************************************************************/
#ifndef GEOS_OP_LINEMERGE_LINESEQUENCER_H
@@ -79,7 +83,6 @@
* If it is not possible to find a sequence, the isSequenceable method
* will return <code>false</code>.
*
- * Last port: operation/linemerge/LineSequencer.java rev. 1.5 (JTS-1.7)
*/
class GEOS_DLL LineSequencer {
Modified: trunk/source/operation/linemerge/EdgeString.cpp
===================================================================
--- trunk/source/operation/linemerge/EdgeString.cpp 2009-06-08 10:37:11 UTC (rev 2561)
+++ trunk/source/operation/linemerge/EdgeString.cpp 2009-06-08 15:28:27 UTC (rev 2562)
@@ -12,6 +12,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: operation/linemerge/EdgeString.java rev. 1.5 (JTS-1.10)
+ *
**********************************************************************/
#include <geos/operation/linemerge/EdgeString.h>
Modified: trunk/source/operation/linemerge/LineMergeDirectedEdge.cpp
===================================================================
--- trunk/source/operation/linemerge/LineMergeDirectedEdge.cpp 2009-06-08 10:37:11 UTC (rev 2561)
+++ trunk/source/operation/linemerge/LineMergeDirectedEdge.cpp 2009-06-08 15:28:27 UTC (rev 2562)
@@ -12,6 +12,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: operation/linemerge/LineMergeDirectedEdge.java rev. 1.5 (JTS-1.10)
+ *
**********************************************************************/
#include <geos/operation/linemerge/LineMergeDirectedEdge.h>
Modified: trunk/source/operation/linemerge/LineMergeEdge.cpp
===================================================================
--- trunk/source/operation/linemerge/LineMergeEdge.cpp 2009-06-08 10:37:11 UTC (rev 2561)
+++ trunk/source/operation/linemerge/LineMergeEdge.cpp 2009-06-08 15:28:27 UTC (rev 2562)
@@ -12,6 +12,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: operation/linemerge/LineMergeEdge.java rev. 1.4 (JTS-1.10)
+ *
**********************************************************************/
#include <geos/operation/linemerge/LineMergeEdge.h>
Modified: trunk/source/operation/linemerge/LineMergeGraph.cpp
===================================================================
--- trunk/source/operation/linemerge/LineMergeGraph.cpp 2009-06-08 10:37:11 UTC (rev 2561)
+++ trunk/source/operation/linemerge/LineMergeGraph.cpp 2009-06-08 15:28:27 UTC (rev 2562)
@@ -12,6 +12,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: operation/linemerge/LineMergeGraph.java rev. 1.5 (JTS-1.10)
+ *
**********************************************************************/
#include <geos/operation/linemerge/LineMergeGraph.h>
Modified: trunk/source/operation/linemerge/LineMerger.cpp
===================================================================
--- trunk/source/operation/linemerge/LineMerger.cpp 2009-06-08 10:37:11 UTC (rev 2561)
+++ trunk/source/operation/linemerge/LineMerger.cpp 2009-06-08 15:28:27 UTC (rev 2562)
@@ -12,6 +12,10 @@
* by the Free Software Foundation.
* See the COPYING file for more information.
*
+ **********************************************************************
+ *
+ * Last port: operation/linemerge/LineMerger.java rev. 1.6 (JTS-1.7)
+ *
**********************************************************************/
#include <geos/operation/linemerge/LineMerger.h>
@@ -20,6 +24,7 @@
#include <geos/planargraph/DirectedEdge.h>
#include <geos/planargraph/Edge.h>
#include <geos/planargraph/Node.h>
+//#include <geos/planargraph/GraphComponent.h>
#include <geos/geom/GeometryComponentFilter.h>
#include <geos/geom/LineString.h>
@@ -98,6 +103,16 @@
{
if (mergedLineStrings!=NULL) return;
+#if 0 // requires changes to GraphComponent to enhance porting to rev 1.7
+ // reset marks (this allows incremental processing)
+ GraphComponent::setMarked(graph.nodeIterator(), false);
+ GraphComponent::setMarked(graph.edgeIterator(), false);
+
+ for (size_t i=0, n=edgeStrings.size(); i<n; ++i)
+ delete edgeStrings[i];
+ edgeStrings.clear();
+#endif
+
buildEdgeStringsForObviousStartNodes();
buildEdgeStringsForIsolatedLoops();
Modified: trunk/source/operation/linemerge/LineSequencer.cpp
===================================================================
--- trunk/source/operation/linemerge/LineSequencer.cpp 2009-06-08 10:37:11 UTC (rev 2561)
+++ trunk/source/operation/linemerge/LineSequencer.cpp 2009-06-08 15:28:27 UTC (rev 2562)
@@ -13,7 +13,7 @@
*
**********************************************************************
*
- * Last port: operation/linemerge/LineSequencer.java rev. 1.5 (JTS-1.7)
+ * Last port: operation/linemerge/LineSequencer.java rev. 1.6 (JTS-1.10)
*
**********************************************************************/
More information about the geos-commits
mailing list