[geos-commits] r3353 - in trunk: include/geos/geom/prep src/geom/prep

[svn_geos at osgeo.org]

Author: strk
Date: 2011-05-11 23:13:39 -0700 (Wed, 11 May 2011)
New Revision: 3353

Modified:
   trunk/include/geos/geom/prep/PreparedLineStringIntersects.h
   trunk/src/geom/prep/PreparedLineStringIntersects.cpp
Log:
Port info for PreparedLineStringIntersects, and avoid polluting the global namespace

Modified: trunk/include/geos/geom/prep/PreparedLineStringIntersects.h
===================================================================
--- trunk/include/geos/geom/prep/PreparedLineStringIntersects.h	2011-05-12 06:10:20 UTC (rev 3352)
+++ trunk/include/geos/geom/prep/PreparedLineStringIntersects.h	2011-05-12 06:13:39 UTC (rev 3353)
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * GEOS - Geometry Engine Open Source
  * http://geos.refractions.net
@@ -14,7 +13,7 @@
  *
  **********************************************************************
  *
- * Last port: geom/prep/PreparedLineStringIntersects.java rev 1.2 (JTS-1.10)
+ * Last port: geom/prep/PreparedLineStringIntersects.java r338 (JTS-1.12)
  *
  **********************************************************************/
 
@@ -27,9 +26,6 @@
 #include <geos/geom/Coordinate.h> 
 #include <geos/noding/SegmentStringUtil.h>
 
-using namespace geos::algorithm;
-using namespace geos::geom::util;
-
 namespace geos {
 namespace geom { // geos::geom
 namespace prep { // geos::geom::prep
@@ -80,7 +76,6 @@
 
 protected:
 	PreparedLineString & prepLine;
-	//PreparedLineString * prepLine;
 
 	/**
 	 * Tests whether any representative point of the test Geometry intersects
@@ -91,25 +86,7 @@
 	 * @return true if any point of the argument intersects the prepared geometry
 	 */
 	bool isAnyTestPointInTarget(const geom::Geometry * testGeom) const;
-	//{
-	//	/**
-	//	 * This could be optimized by using the segment index on the lineal target.
-	//	 * However, it seems like the L/P case would be pretty rare in practice.
-	//	 */
-	//	PointLocator * locator = new PointLocator();
 
-	//	geom::Coordinate::ConstVect coords;
-	//	ComponentCoordinateExtracter::getCoordinates( *testGeom, coords);
-
-	//	for (std::size_t i=0, n=coords.size(); i<n; i++)
-	//	{
-	//		geom::Coordinate c = *(coords[i]);
-	//		if ( locator->intersects( c, &(prepLine->getGeometry()) ))
-	//			return true;
-	//	}
-	//	return false;
-	//}
-
     // Declare type as noncopyable
     PreparedLineStringIntersects(const PreparedLineStringIntersects& other);
     PreparedLineStringIntersects& operator=(const PreparedLineStringIntersects& rhs);
@@ -120,7 +97,4 @@
 } // namespace geos
 
 #endif // GEOS_GEOM_PREP_PREPAREDLINESTRINGINTERSECTS_H
-/**********************************************************************
- * $Log$
- **********************************************************************/
 

Modified: trunk/src/geom/prep/PreparedLineStringIntersects.cpp
===================================================================
--- trunk/src/geom/prep/PreparedLineStringIntersects.cpp	2011-05-12 06:10:20 UTC (rev 3352)
+++ trunk/src/geom/prep/PreparedLineStringIntersects.cpp	2011-05-12 06:13:39 UTC (rev 3353)
@@ -1,5 +1,4 @@
 /**********************************************************************
- * $Id$
  *
  * GEOS - Geometry Engine Open Source
  * http://geos.refractions.net
@@ -13,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: geom/prep/PreparedLineStringIntersects.java rev 1.2 (JTS-1.10)
+ * Last port: geom/prep/PreparedLineStringIntersects.java r338 (JTS-1.12)
  *
  **********************************************************************/
 
@@ -26,6 +25,9 @@
 #include <geos/noding/SegmentStringUtil.h>
 #include <geos/noding/FastSegmentSetIntersectionFinder.h>
 
+using namespace geos::algorithm;
+using namespace geos::geom::util;
+
 namespace geos {
 namespace geom { // geos.geom
 namespace prep { // geos.geom.prep
@@ -91,7 +93,3 @@
 } // namespace geos.geom
 } // namespace geos
 
-/**********************************************************************
- * $Log$
- *
- **********************************************************************/