[geos-commits] r3309 - in trunk: include/geos/operation/linemerge src/operation/linemerge

svn_geos at osgeo.org svn_geos at osgeo.org
Wed Apr 27 11:47:14 EDT 2011


Author: strk
Date: 2011-04-27 08:47:14 -0700 (Wed, 27 Apr 2011)
New Revision: 3309

Modified:
   trunk/include/geos/operation/linemerge/EdgeString.h
   trunk/include/geos/operation/linemerge/LineMergeDirectedEdge.h
   trunk/include/geos/operation/linemerge/LineMergeEdge.h
   trunk/include/geos/operation/linemerge/LineMergeGraph.h
   trunk/include/geos/operation/linemerge/LineMerger.h
   trunk/include/geos/operation/linemerge/LineSequencer.h
   trunk/src/operation/linemerge/EdgeString.cpp
   trunk/src/operation/linemerge/LineMergeDirectedEdge.cpp
   trunk/src/operation/linemerge/LineMergeEdge.cpp
   trunk/src/operation/linemerge/LineMergeGraph.cpp
   trunk/src/operation/linemerge/LineMerger.cpp
   trunk/src/operation/linemerge/LineSequencer.cpp
Log:
Sync linemerge package to JTS-1.12 (nothing changed)

Modified: trunk/include/geos/operation/linemerge/EdgeString.h
===================================================================
--- trunk/include/geos/operation/linemerge/EdgeString.h	2011-04-27 15:33:11 UTC (rev 3308)
+++ trunk/include/geos/operation/linemerge/EdgeString.h	2011-04-27 15:47:14 UTC (rev 3309)
@@ -15,7 +15,7 @@
  *
  **********************************************************************
  *
- * Last port: operation/linemerge/EdgeString.java r320 (JTS-1.12)
+ * Last port: operation/linemerge/EdgeString.java r378 (JTS-1.12)
  *
  **********************************************************************/
 

Modified: trunk/include/geos/operation/linemerge/LineMergeDirectedEdge.h
===================================================================
--- trunk/include/geos/operation/linemerge/LineMergeDirectedEdge.h	2011-04-27 15:33:11 UTC (rev 3308)
+++ trunk/include/geos/operation/linemerge/LineMergeDirectedEdge.h	2011-04-27 15:47:14 UTC (rev 3309)
@@ -13,7 +13,7 @@
  *
  **********************************************************************
  *
- * Last port: operation/linemerge/LineMergeDirectedEdge.java rev. 1.5 (JTS-1.10)
+ * Last port: operation/linemerge/LineMergeDirectedEdge.java r378 (JTS-1.12)
  *
  **********************************************************************/
 

Modified: trunk/include/geos/operation/linemerge/LineMergeEdge.h
===================================================================
--- trunk/include/geos/operation/linemerge/LineMergeEdge.h	2011-04-27 15:33:11 UTC (rev 3308)
+++ trunk/include/geos/operation/linemerge/LineMergeEdge.h	2011-04-27 15:47:14 UTC (rev 3309)
@@ -4,7 +4,8 @@
  * GEOS - Geometry Engine Open Source
  * http://geos.refractions.net
  *
- * Copyright (C) 2006 Refractions Research Inc.
+ * 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
@@ -13,7 +14,7 @@
  *
  **********************************************************************
  *
- * Last port: operation/linemerge/LineMergeEdge.java r320 (JTS-1.12)
+ * Last port: operation/linemerge/LineMergeEdge.java r378 (JTS-1.12)
  *
  **********************************************************************/
 

Modified: trunk/include/geos/operation/linemerge/LineMergeGraph.h
===================================================================
--- trunk/include/geos/operation/linemerge/LineMergeGraph.h	2011-04-27 15:33:11 UTC (rev 3308)
+++ trunk/include/geos/operation/linemerge/LineMergeGraph.h	2011-04-27 15:47:14 UTC (rev 3309)
@@ -6,6 +6,7 @@
  *
  * Copyright (C) 2011 Sandro Santilli <strk at keybit.net>
  * Copyright (C) 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
@@ -14,7 +15,7 @@
  *
  **********************************************************************
  *
- * Last port: operation/linemerge/LineMergeGraph.java r320 (JTS-1.12)
+ * Last port: operation/linemerge/LineMergeGraph.java r378 (JTS-1.12)
  *
  **********************************************************************/
 
@@ -75,6 +76,8 @@
 	 * LineString representation of an edge. 
 	 * 
 	 * Empty lines or lines with all coordinates equal are not added.
+	 * 
+	 * @param lineString the linestring to add to the graph
 	 */
 	void addEdge(const geom::LineString *lineString);
 

Modified: trunk/include/geos/operation/linemerge/LineMerger.h
===================================================================
--- trunk/include/geos/operation/linemerge/LineMerger.h	2011-04-27 15:33:11 UTC (rev 3308)
+++ trunk/include/geos/operation/linemerge/LineMerger.h	2011-04-27 15:47:14 UTC (rev 3309)
@@ -13,7 +13,7 @@
  *
  **********************************************************************
  *
- * Last port: operation/linemerge/LineMerger.java r320 (JTS-1.11)
+ * Last port: operation/linemerge/LineMerger.java r378 (JTS-1.12)
  *
  **********************************************************************/
 

Modified: trunk/include/geos/operation/linemerge/LineSequencer.h
===================================================================
--- trunk/include/geos/operation/linemerge/LineSequencer.h	2011-04-27 15:33:11 UTC (rev 3308)
+++ trunk/include/geos/operation/linemerge/LineSequencer.h	2011-04-27 15:47:14 UTC (rev 3309)
@@ -14,7 +14,7 @@
  *
  **********************************************************************
  *
- * Last port: operation/linemerge/LineSequencer.java r320 (JTS-1.12)
+ * Last port: operation/linemerge/LineSequencer.java r378 (JTS-1.12)
  *
  **********************************************************************/
 
@@ -63,6 +63,12 @@
  * components of the input.  Each linestring is oriented
  * so that identical endpoints are adjacent in the list.
  *
+ * A typical use case is to convert a set of
+ * unoriented geometric links
+ * from a linear network
+ * (e.g. such as block faces on a bus route)
+ * into a continuous oriented path through the network.
+ *
  * The input linestrings may form one or more connected sets.
  * The input linestrings should be correctly noded, or the results may
  * not be what is expected.
@@ -82,10 +88,11 @@
  *   node of an linestring, use that node as the end of the sequence
  * - If the sequence has no degree-1 nodes, use any node as the start
  *
- * Not all arrangements of lines can be sequenced.
+ * Note that not all arrangements of lines can be sequenced.
  * For a connected set of edges in a graph,
- * Euler's Theorem states that there is a sequence containing each edge once
- * if and only if there are no more than 2 nodes of odd degree.
+ * <i>Euler's Theorem</i> states that there is a sequence
+ * containing each edge once
+ * <b>if and only if</b> there are no more than 2 nodes of odd degree.
  * If it is not possible to find a sequence, the isSequenceable method
  * will return <code>false</code>.
  *

Modified: trunk/src/operation/linemerge/EdgeString.cpp
===================================================================
--- trunk/src/operation/linemerge/EdgeString.cpp	2011-04-27 15:33:11 UTC (rev 3308)
+++ trunk/src/operation/linemerge/EdgeString.cpp	2011-04-27 15:47:14 UTC (rev 3309)
@@ -15,7 +15,7 @@
  *
  **********************************************************************
  *
- * Last port: operation/linemerge/EdgeString.java r320 (JTS-1.12)
+ * Last port: operation/linemerge/EdgeString.java r378 (JTS-1.12)
  *
  **********************************************************************/
 

Modified: trunk/src/operation/linemerge/LineMergeDirectedEdge.cpp
===================================================================
--- trunk/src/operation/linemerge/LineMergeDirectedEdge.cpp	2011-04-27 15:33:11 UTC (rev 3308)
+++ trunk/src/operation/linemerge/LineMergeDirectedEdge.cpp	2011-04-27 15:47:14 UTC (rev 3309)
@@ -14,7 +14,7 @@
  *
  **********************************************************************
  *
- * Last port: operation/linemerge/LineMergeDirectedEdge.java rev. 1.5 (JTS-1.10)
+ * Last port: operation/linemerge/LineMergeDirectedEdge.java r378 (JTS-1.12)
  *
  **********************************************************************/
 

Modified: trunk/src/operation/linemerge/LineMergeEdge.cpp
===================================================================
--- trunk/src/operation/linemerge/LineMergeEdge.cpp	2011-04-27 15:33:11 UTC (rev 3308)
+++ trunk/src/operation/linemerge/LineMergeEdge.cpp	2011-04-27 15:47:14 UTC (rev 3309)
@@ -14,7 +14,7 @@
  *
  **********************************************************************
  *
- * Last port: operation/linemerge/LineMergeEdge.java r320 (JTS-1.12)
+ * Last port: operation/linemerge/LineMergeEdge.java r378 (JTS-1.12)
  *
  **********************************************************************/
 

Modified: trunk/src/operation/linemerge/LineMergeGraph.cpp
===================================================================
--- trunk/src/operation/linemerge/LineMergeGraph.cpp	2011-04-27 15:33:11 UTC (rev 3308)
+++ trunk/src/operation/linemerge/LineMergeGraph.cpp	2011-04-27 15:47:14 UTC (rev 3309)
@@ -15,7 +15,7 @@
  *
  **********************************************************************
  *
- * Last port: operation/linemerge/LineMergeGraph.java r320 (JTS-1.12)
+ * Last port: operation/linemerge/LineMergeGraph.java r378 (JTS-1.12)
  *
  **********************************************************************/
 

Modified: trunk/src/operation/linemerge/LineMerger.cpp
===================================================================
--- trunk/src/operation/linemerge/LineMerger.cpp	2011-04-27 15:33:11 UTC (rev 3308)
+++ trunk/src/operation/linemerge/LineMerger.cpp	2011-04-27 15:47:14 UTC (rev 3309)
@@ -14,7 +14,7 @@
  *
  **********************************************************************
  *
- * Last port: operation/linemerge/LineMerger.java r320 (JTS-1.11)
+ * Last port: operation/linemerge/LineMerger.java r378 (JTS-1.12)
  *
  **********************************************************************/
 

Modified: trunk/src/operation/linemerge/LineSequencer.cpp
===================================================================
--- trunk/src/operation/linemerge/LineSequencer.cpp	2011-04-27 15:33:11 UTC (rev 3308)
+++ trunk/src/operation/linemerge/LineSequencer.cpp	2011-04-27 15:47:14 UTC (rev 3309)
@@ -14,7 +14,7 @@
  *
  **********************************************************************
  *
- * Last port: operation/linemerge/LineSequencer.java r320 (JTS-1.12)
+ * Last port: operation/linemerge/LineSequencer.java r378 (JTS-1.12)
  *
  **********************************************************************/
 



More information about the geos-commits mailing list