pre topology tolerance changeset

stopa85 · stopa85 · commit f6a6da975de8 · 2011-02-21T13:17:07.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15232 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/roadgraph/graphbuilder.cpp b/src/plugins/roadgraph/graphbuilder.cpp
@@ -18,8 +18,8 @@
 
 // Qgis includes
 
-RgGraphBuilder::RgGraphBuilder( const QgsCoordinateReferenceSystem& crs ) :
-    mCrs( crs )
+RgGraphBuilder::RgGraphBuilder( const QgsCoordinateReferenceSystem& crs, double topologyTolerance ) :
+    mCrs( crs ), mTopologyToleraceFactor( topologyTolerance )
 {
 
 }
@@ -33,3 +33,8 @@ QgsCoordinateReferenceSystem& RgGraphBuilder::destinationCrs()
 {
   return mCrs;
 }
+
+double RgGraphBuilder::topologyTolerance()
+{
+  return mTopologyToleraceFactor;
+}
diff --git a/src/plugins/roadgraph/graphbuilder.h b/src/plugins/roadgraph/graphbuilder.h
@@ -33,7 +33,7 @@ class RgGraphBuilder
 {
   public:
     //! Constructor
-    RgGraphBuilder( const QgsCoordinateReferenceSystem& crs );
+    RgGraphBuilder( const QgsCoordinateReferenceSystem& crs, double topologyTolerance = 0.0 );
 
     //! Destructor
     virtual ~RgGraphBuilder();
@@ -43,10 +43,15 @@ class RgGraphBuilder
      */
     QgsCoordinateReferenceSystem& destinationCrs();
 
+    /**
+     * get topology tolerance factor
+     */
+    double topologyTolerance();
+
     /**
      * add vertex
      */
-    virtual void addVertex( const QgsPoint& pt ) = 0;
+    virtual QgsPoint addVertex( const QgsPoint& pt ) = 0;
 
     /**
      * add arc
@@ -55,5 +60,7 @@ class RgGraphBuilder
 
   private:
     QgsCoordinateReferenceSystem mCrs;
+
+    double mTopologyToleraceFactor;
 };
 #endif //GRAPHBUILDER
diff --git a/src/plugins/roadgraph/linevectorlayerdirector.cpp b/src/plugins/roadgraph/linevectorlayerdirector.cpp
@@ -94,7 +94,7 @@ void RgLineVectorLayerDirector::makeGraph( RgGraphBuilder *builder, const QVecto
     QgsPolyline::iterator pointIt;
     for ( pointIt = pl.begin(); pointIt != pl.end(); ++pointIt )
     {
-      pt2 = ct.transform( *pointIt );
+      pt2 = builder->addVertex( ct.transform( *pointIt ) );
       if ( !isFirstPoint )
       {
         int i = 0;
@@ -105,6 +105,7 @@ void RgLineVectorLayerDirector::makeGraph( RgGraphBuilder *builder, const QVecto
 
           if ( pointLengthMap[ i ].mLength > info.mLength )
           {
+            info.mTiedPoint = builder->addVertex( info.mTiedPoint );
             info.mFirstPoint = pt1;
             info.mLastPoint = pt2;
 
@@ -181,7 +182,7 @@ void RgLineVectorLayerDirector::makeGraph( RgGraphBuilder *builder, const QVecto
     QgsPolyline::iterator pointIt;
     for ( pointIt = pl.begin(); pointIt != pl.end(); ++pointIt )
     {
-      pt2 = ct.transform( *pointIt );
+      pt2 = builder->addVertex( ct.transform( *pointIt ) );
 
       std::map< double, QgsPoint > pointsOnArc;
       pointsOnArc[ 0.0 ] = pt1;
diff --git a/src/plugins/roadgraph/simplegraphbuilder.cpp b/src/plugins/roadgraph/simplegraphbuilder.cpp
@@ -19,14 +19,30 @@
 
 // Qgis includes
 
-RgSimpleGraphBuilder::RgSimpleGraphBuilder( const QgsCoordinateReferenceSystem& crs ) :
-    RgGraphBuilder( crs )
+RgSimpleGraphBuilder::RgSimpleGraphBuilder( const QgsCoordinateReferenceSystem& crs, double topologyTolerance ) :
+    RgGraphBuilder( crs, topologyTolerance )
 {
 }
 
-void RgSimpleGraphBuilder::addVertex( const QgsPoint& pt )
+QgsPoint RgSimpleGraphBuilder::addVertex( const QgsPoint& pt )
 {
+  // I cann't use QgsSpatialIndex in this time.
+  // QgsSpatialIndex::nearestNeighbor() return only features id not geometry
+  //
+  // This code is very slow and need me for a tests.
+
+  double t = topologyTolerance();
+  if ( t > 0.0 )
+  {
+    AdjacencyMatrix::iterator it;
+    for ( it = mMatrix.begin(); it != mMatrix.end(); ++it )
+    {
+      if ( it->first.sqrDist( pt ) < t )
+        return it->first;
+    }
+  }
   mMatrix[ pt ];
+  return pt;
 }
 
 void RgSimpleGraphBuilder::addArc( const QgsPoint& pt1, const QgsPoint& pt2, double cost, double speed )
diff --git a/src/plugins/roadgraph/simplegraphbuilder.h b/src/plugins/roadgraph/simplegraphbuilder.h
@@ -37,12 +37,12 @@ class RgSimpleGraphBuilder : public RgGraphBuilder
     /**
      * default constructor
      */
-    RgSimpleGraphBuilder( const QgsCoordinateReferenceSystem& crs );
+    RgSimpleGraphBuilder( const QgsCoordinateReferenceSystem& crs, double topologyTolerance = 0.0 );
 
     /**
      * MANDATORY BUILDER PROPERTY DECLARATION
      */
-    void addVertex( const QgsPoint& pt );
+    QgsPoint addVertex( const QgsPoint& pt );
     void addArc( const QgsPoint& pt1, const QgsPoint& pt2, double cost, double speed );
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@`
`18`	`18`
`19`	`19`	`// Qgis includes`
`20`	`20`
`21`		`-RgGraphBuilder::RgGraphBuilder( const QgsCoordinateReferenceSystem& crs ) :`
`22`		`- mCrs( crs )`
	`21`	`+RgGraphBuilder::RgGraphBuilder( const QgsCoordinateReferenceSystem& crs, double topologyTolerance ) :`
	`22`	`+ mCrs( crs ), mTopologyToleraceFactor( topologyTolerance )`
`23`	`23`	`{`
`24`	`24`
`25`	`25`	`}`
`@@ -33,3 +33,8 @@ QgsCoordinateReferenceSystem& RgGraphBuilder::destinationCrs()`
`33`	`33`	`{`
`34`	`34`	`return mCrs;`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+double RgGraphBuilder::topologyTolerance()`
	`38`	`+{`
	`39`	`+ return mTopologyToleraceFactor;`
	`40`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ void RgLineVectorLayerDirector::makeGraph( RgGraphBuilder *builder, const QVecto`
`94`	`94`	`QgsPolyline::iterator pointIt;`
`95`	`95`	`for ( pointIt = pl.begin(); pointIt != pl.end(); ++pointIt )`
`96`	`96`	`{`
`97`		`- pt2 = ct.transform( *pointIt );`
	`97`	`+ pt2 = builder->addVertex( ct.transform( *pointIt ) );`
`98`	`98`	`if ( !isFirstPoint )`
`99`	`99`	`{`
`100`	`100`	`int i = 0;`
`@@ -105,6 +105,7 @@ void RgLineVectorLayerDirector::makeGraph( RgGraphBuilder *builder, const QVecto`
`105`	`105`
`106`	`106`	`if ( pointLengthMap[ i ].mLength > info.mLength )`
`107`	`107`	`{`
	`108`	`+ info.mTiedPoint = builder->addVertex( info.mTiedPoint );`
`108`	`109`	`info.mFirstPoint = pt1;`
`109`	`110`	`info.mLastPoint = pt2;`
`110`	`111`
`@@ -181,7 +182,7 @@ void RgLineVectorLayerDirector::makeGraph( RgGraphBuilder *builder, const QVecto`
`181`	`182`	`QgsPolyline::iterator pointIt;`
`182`	`183`	`for ( pointIt = pl.begin(); pointIt != pl.end(); ++pointIt )`
`183`	`184`	`{`
`184`		`- pt2 = ct.transform( *pointIt );`
	`185`	`+ pt2 = builder->addVertex( ct.transform( *pointIt ) );`
`185`	`186`
`186`	`187`	`std::map< double, QgsPoint > pointsOnArc;`
`187`	`188`	`pointsOnArc[ 0.0 ] = pt1;`