[geos-commits] r2087 - in trunk/source/algorithm: . locate
svn_geos at osgeo.org
svn_geos at osgeo.org
Fri Dec 21 17:40:28 EST 2007
Author: mloskot
Date: 2007-12-21 17:40:28 -0500 (Fri, 21 Dec 2007)
New Revision: 2087
Removed:
trunk/source/algorithm/SimplePointInAreaLocator.cpp
Modified:
trunk/source/algorithm/Makefile.am
trunk/source/algorithm/locate/
Log:
Removed unused SimplePointInAreaLocator.cpp. This unit migrated to algorithm/locate module.
Modified: trunk/source/algorithm/Makefile.am
===================================================================
--- trunk/source/algorithm/Makefile.am 2007-12-21 22:21:39 UTC (rev 2086)
+++ trunk/source/algorithm/Makefile.am 2007-12-21 22:40:28 UTC (rev 2087)
@@ -18,13 +18,10 @@
LineIntersector.cpp \
MCPointInRing.cpp \
MinimumDiameter.cpp \
- NonRobustLineIntersector.cpp \
NotRepresentableException.cpp \
PointLocator.cpp \
RayCrossingCounter.cpp \
RobustDeterminant.cpp \
- RobustLineIntersector.cpp \
- SimplePointInAreaLocator.cpp \
SimplePointInRing.cpp \
SIRtreePointInRing.cpp
Deleted: trunk/source/algorithm/SimplePointInAreaLocator.cpp
===================================================================
--- trunk/source/algorithm/SimplePointInAreaLocator.cpp 2007-12-21 22:21:39 UTC (rev 2086)
+++ trunk/source/algorithm/SimplePointInAreaLocator.cpp 2007-12-21 22:40:28 UTC (rev 2087)
@@ -1,109 +0,0 @@
-/**********************************************************************
- * $Id$
- *
- * GEOS - Geometry Engine Open Source
- * http://geos.refractions.net
- *
- * 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.
- *
- **********************************************************************/
-
-#include <geos/algorithm/CGAlgorithms.h>
-#include <geos/algorithm/SimplePointInAreaLocator.h>
-#include <geos/geom/Geometry.h>
-#include <geos/geom/Polygon.h>
-#include <geos/geom/GeometryCollection.h>
-#include <geos/geom/Location.h>
-#include <geos/geom/CoordinateSequence.h>
-#include <geos/geom/LineString.h>
-
-#include <typeinfo>
-#include <cassert>
-
-using namespace geos::geom;
-
-namespace geos {
-namespace algorithm { // geos.algorithm
-
-/**
- * locate is the main location function. It handles both single-element
- * and multi-element Geometries. The algorithm for multi-element Geometries
- * is more complex, since it has to take into account the boundaryDetermination rule
- */
-int
-SimplePointInAreaLocator::locate(const Coordinate& p, const Geometry *geom)
-{
- if (geom->isEmpty()) return Location::EXTERIOR;
- if (containsPoint(p,geom))
- return Location::INTERIOR;
- return Location::EXTERIOR;
-}
-
-bool
-SimplePointInAreaLocator::containsPoint(const Coordinate& p,const Geometry *geom)
-{
- if (const Polygon *poly = dynamic_cast<const Polygon*>(geom))
- {
- return containsPointInPolygon(p, poly);
- }
-
- if (const GeometryCollection *col = dynamic_cast<const GeometryCollection*>(geom))
- {
- for (GeometryCollection::const_iterator
- it=col->begin(), endIt=col->end();
- it != endIt;
- ++it)
- {
- const Geometry *g2=*it;
- assert (g2!=geom);
- if (containsPoint(p,g2)) return true;
- }
- }
- return false;
-}
-
-bool
-SimplePointInAreaLocator::containsPointInPolygon(const Coordinate& p, const Polygon *poly)
-{
- if (poly->isEmpty()) return false;
- const LineString *shell=poly->getExteriorRing();
- const CoordinateSequence *cl;
- cl = shell->getCoordinatesRO();
- if (!CGAlgorithms::isPointInRing(p,cl)) {
- return false;
- }
-
- // now test if the point lies in or on the holes
- for(size_t i=0, n=poly->getNumInteriorRing(); i<n; i++)
- {
- const LineString *hole = poly->getInteriorRingN(i);
- cl = hole->getCoordinatesRO();
- if (CGAlgorithms::isPointInRing(p,cl)) {
- return false;
- }
- }
- return true;
-}
-
-} // namespace geos.algorithm
-} // namespace geos
-
-/**********************************************************************
- * $Log$
- * Revision 1.22 2006/06/12 11:29:23 strk
- * unsigned int => size_t
- *
- * Revision 1.21 2006/03/21 11:12:23 strk
- * Cleanups: headers inclusion and Log section
- *
- * Revision 1.20 2006/03/09 16:46:46 strk
- * geos::geom namespace definition, first pass at headers split
- *
- **********************************************************************/
-
Property changes on: trunk/source/algorithm/locate
___________________________________________________________________
Name: svn:ignore
+ .deps
.libs
Makefile
Makefile.in
More information about the geos-commits
mailing list