Road graph plugin not work or work incorrectly.

stopa85milk · stopa85milk · commit fb43d16f1690 · 2011-05-10T17:05:48.000+06:00
Show message "First point not tied" if:
1. 'on the fly' CRS transfomation disabled
2. Source layer CRS not equal project CRS
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, double topologyTolerance ) :
-    mCrs( crs ), mTopologyToleraceFactor( topologyTolerance )
+RgGraphBuilder::RgGraphBuilder( const QgsCoordinateReferenceSystem& crs, bool ctfEnabled, double topologyTolerance ) :
+    mCrs( crs ), mTopologyToleraceFactor( topologyTolerance ), mCoordinateTransformEnabled( ctfEnabled )
 {
 
 }
@@ -38,3 +38,8 @@ double RgGraphBuilder::topologyTolerance()
 {
   return mTopologyToleraceFactor;
 }
+
+bool RgGraphBuilder::coordinateTransformEnabled() const
+{
+  return mCoordinateTransformEnabled;
+}
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, double topologyTolerance = 0.0 );
+    RgGraphBuilder( const QgsCoordinateReferenceSystem& crs, bool coordinateTransform, double topologyTolerance = 0.0 );
 
     //! Destructor
     virtual ~RgGraphBuilder();
@@ -48,6 +48,11 @@ class RgGraphBuilder
      */
     double topologyTolerance();
 
+    /**
+     * coordinate transform Enabled
+     */
+    bool coordinateTransformEnabled() const;
+
     /**
      * add vertex
      */
@@ -62,5 +67,7 @@ class RgGraphBuilder
     QgsCoordinateReferenceSystem mCrs;
 
     double mTopologyToleraceFactor;
+
+    bool mCoordinateTransformEnabled;
 };
 #endif //GRAPHBUILDER
diff --git a/src/plugins/roadgraph/linevectorlayerdirector.cpp b/src/plugins/roadgraph/linevectorlayerdirector.cpp
@@ -72,11 +72,21 @@ void RgLineVectorLayerDirector::makeGraph( RgGraphBuilder *builder, const QVecto
   int featureCount = ( int ) vl->featureCount() * 2;
   int step = 0;
 
-  QgsCoordinateTransform ct( vl->crs(), builder->destinationCrs() );
-
+  QgsCoordinateTransform ct;
   QgsDistanceArea da;
-  da.setSourceCrs( builder->destinationCrs().srsid() );
-  da.setProjectionsEnabled( true );
+  ct.setSourceCrs( vl->crs() );
+
+  if ( builder->coordinateTransformEnabled() )
+  {
+    ct.setDestCRS( builder->destinationCrs() );
+    da.setProjectionsEnabled( true );
+    da.setSourceCrs( builder->destinationCrs().srsid() );
+  }
+  else
+  {
+    ct.setDestCRS( vl->crs() );
+    da.setProjectionsEnabled( false );
+  }
 
   tiedPoint = QVector< QgsPoint >( additionalPoints.size(), QgsPoint( 0.0, 0.0 ) );
   TiePointInfo tmpInfo;
diff --git a/src/plugins/roadgraph/roadgraphplugin.cpp b/src/plugins/roadgraph/roadgraphplugin.cpp
@@ -305,7 +305,8 @@ void RoadGraphPlugin::render( QPainter *painter )
   if ( graphDirector == NULL )
     return;
 
-  RgSimpleGraphBuilder builder( mQGisIface->mapCanvas()->mapRenderer()->destinationCrs() );
+  RgSimpleGraphBuilder builder( mQGisIface->mapCanvas()->mapRenderer()->destinationCrs(),
+                                mQGisIface->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() );
   QVector< QgsPoint > null;
   graphDirector->makeGraph( &builder , null, null );
   AdjacencyMatrix m = builder.adjacencyMatrix();
diff --git a/src/plugins/roadgraph/shortestpathwidget.cpp b/src/plugins/roadgraph/shortestpathwidget.cpp
@@ -236,8 +236,11 @@ bool RgShortestPathWidget::getPath( AdjacencyMatrix& matrix, QgsPoint& p1, QgsPo
     return false;
   }
 
-  RgSimpleGraphBuilder builder( mPlugin->iface()->mapCanvas()->mapRenderer()->destinationCrs(),
-                                mPlugin->topologyToleranceFactor() );
+  RgSimpleGraphBuilder builder(
+    mPlugin->iface()->mapCanvas()->mapRenderer()->destinationCrs(),
+    mPlugin->iface()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled(),
+    mPlugin->topologyToleranceFactor() );
+
   {
     const RgGraphDirector *director = mPlugin->director();
     if ( director == NULL )
diff --git a/src/plugins/roadgraph/simplegraphbuilder.cpp b/src/plugins/roadgraph/simplegraphbuilder.cpp
@@ -21,8 +21,8 @@
 #include <qgsfeature.h>
 #include <qgsgeometry.h>
 
-RgSimpleGraphBuilder::RgSimpleGraphBuilder( const QgsCoordinateReferenceSystem& crs, double topologyTolerance ) :
-    RgGraphBuilder( crs, topologyTolerance )
+RgSimpleGraphBuilder::RgSimpleGraphBuilder( const QgsCoordinateReferenceSystem& crs, bool ctfEnabled, double topologyTolerance ) :
+    RgGraphBuilder( crs,  ctfEnabled, topologyTolerance )
 {
 }
 
diff --git a/src/plugins/roadgraph/simplegraphbuilder.h b/src/plugins/roadgraph/simplegraphbuilder.h
@@ -38,7 +38,7 @@ class RgSimpleGraphBuilder : public RgGraphBuilder
     /**
      * default constructor
      */
-    RgSimpleGraphBuilder( const QgsCoordinateReferenceSystem& crs, double topologyTolerance = 0.0 );
+    RgSimpleGraphBuilder( const QgsCoordinateReferenceSystem& crs, bool ctfEnabled, double topologyTolerance = 0.0 );
 
     /**
      * MANDATORY BUILDER PROPERTY DECLARATION

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, double topologyTolerance ) :`
`22`		`- mCrs( crs ), mTopologyToleraceFactor( topologyTolerance )`
	`21`	`+RgGraphBuilder::RgGraphBuilder( const QgsCoordinateReferenceSystem& crs, bool ctfEnabled, double topologyTolerance ) :`
	`22`	`+ mCrs( crs ), mTopologyToleraceFactor( topologyTolerance ), mCoordinateTransformEnabled( ctfEnabled )`
`23`	`23`	`{`
`24`	`24`
`25`	`25`	`}`
`@@ -38,3 +38,8 @@ double RgGraphBuilder::topologyTolerance()`
`38`	`38`	`{`
`39`	`39`	`return mTopologyToleraceFactor;`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+bool RgGraphBuilder::coordinateTransformEnabled() const`
	`43`	`+{`
	`44`	`+ return mCoordinateTransformEnabled;`
	`45`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -236,8 +236,11 @@ bool RgShortestPathWidget::getPath( AdjacencyMatrix& matrix, QgsPoint& p1, QgsPo`
`236`	`236`	`return false;`
`237`	`237`	`}`
`238`	`238`
`239`		`- RgSimpleGraphBuilder builder( mPlugin->iface()->mapCanvas()->mapRenderer()->destinationCrs(),`
`240`		`- mPlugin->topologyToleranceFactor() );`
	`239`	`+ RgSimpleGraphBuilder builder(`
	`240`	`+ mPlugin->iface()->mapCanvas()->mapRenderer()->destinationCrs(),`
	`241`	`+ mPlugin->iface()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled(),`
	`242`	`+ mPlugin->topologyToleranceFactor() );`
	`243`	`+`
`241`	`244`	`{`
`242`	`245`	`const RgGraphDirector *director = mPlugin->director();`
`243`	`246`	`if ( director == NULL )`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@`
`21`	`21`	`#include <qgsfeature.h>`
`22`	`22`	`#include <qgsgeometry.h>`
`23`	`23`
`24`		`-RgSimpleGraphBuilder::RgSimpleGraphBuilder( const QgsCoordinateReferenceSystem& crs, double topologyTolerance ) :`
`25`		`- RgGraphBuilder( crs, topologyTolerance )`
	`24`	`+RgSimpleGraphBuilder::RgSimpleGraphBuilder( const QgsCoordinateReferenceSystem& crs, bool ctfEnabled, double topologyTolerance ) :`
	`25`	`+ RgGraphBuilder( crs, ctfEnabled, topologyTolerance )`
`26`	`26`	`{`
`27`	`27`	`}`
`28`	`28`