Do not re-lookup already present CRSes

m-kuhn · m-kuhn · commit c0a8ee51e1c3 · 2017-02-24T09:15:22.000+01:00
diff --git a/python/plugins/processing/algs/qgis/FieldsCalculator.py b/python/plugins/processing/algs/qgis/FieldsCalculator.py
@@ -99,7 +99,7 @@ def processAlgorithm(self, feedback):
         exp = QgsExpression(formula)
 
         da = QgsDistanceArea()
-        da.setSourceCrs(layer.crs().srsid())
+        da.setSourceCrs(layer.crs())
         da.setEllipsoidalMode(
             iface.mapCanvas().mapSettings().hasCrsTransformEnabled())
         da.setEllipsoid(QgsProject.instance().readEntry(
diff --git a/python/plugins/processing/algs/qgis/FieldsMapper.py b/python/plugins/processing/algs/qgis/FieldsMapper.py
@@ -103,7 +103,7 @@ def processAlgorithm(self, feedback):
         expressions = []
 
         da = QgsDistanceArea()
-        da.setSourceCrs(layer.crs().srsid())
+        da.setSourceCrs(layer.crs())
         da.setEllipsoidalMode(
             iface.mapCanvas().mapSettings().hasCrsTransformEnabled())
         da.setEllipsoid(QgsProject.instance().readEntry(
diff --git a/python/plugins/processing/algs/qgis/HubDistanceLines.py b/python/plugins/processing/algs/qgis/HubDistanceLines.py
@@ -99,7 +99,7 @@ def processAlgorithm(self, feedback):
         index = vector.spatialindex(layerHubs)
 
         distance = QgsDistanceArea()
-        distance.setSourceCrs(layerPoints.crs().srsid())
+        distance.setSourceCrs(layerPoints.crs())
         distance.setEllipsoidalMode(True)
 
         # Scan source points, find nearest hub, and write to output file
diff --git a/python/plugins/processing/algs/qgis/HubDistancePoints.py b/python/plugins/processing/algs/qgis/HubDistancePoints.py
@@ -99,7 +99,7 @@ def processAlgorithm(self, feedback):
         index = vector.spatialindex(layerHubs)
 
         distance = QgsDistanceArea()
-        distance.setSourceCrs(layerPoints.crs().srsid())
+        distance.setSourceCrs(layerPoints.crs())
         distance.setEllipsoidalMode(True)
 
         # Scan source points, find nearest hub, and write to output file
diff --git a/src/analysis/network/qgsgraphbuilderinterface.h b/src/analysis/network/qgsgraphbuilderinterface.h
@@ -46,7 +46,7 @@ class ANALYSIS_EXPORT QgsGraphBuilderInterface
         , mCtfEnabled( ctfEnabled )
         , mTopologyTolerance( topologyTolerance )
     {
-      mDa.setSourceCrs( mCrs.srsid() );
+      mDa.setSourceCrs( mCrs );
       mDa.setEllipsoid( ellipsoidID );
       mDa.setEllipsoidalMode( ctfEnabled );
     }
diff --git a/src/analysis/vector/qgstransectsample.cpp b/src/analysis/vector/qgstransectsample.cpp
@@ -123,7 +123,7 @@ int QgsTransectSample::createSample( QProgressDialog* pd )
 
   //configure distanceArea depending on minDistance units and output CRS
   QgsDistanceArea distanceArea;
-  distanceArea.setSourceCrs( mStrataLayer->crs().srsid() );
+  distanceArea.setSourceCrs( mStrataLayer->crs() );
   if ( mMinDistanceUnits == Meters )
   {
     distanceArea.setEllipsoidalMode( true );
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -7506,7 +7506,7 @@ void QgisApp::selectByForm()
   }
   QgsDistanceArea myDa;
 
-  myDa.setSourceCrs( vlayer->crs().srsid() );
+  myDa.setSourceCrs( vlayer->crs() );
   myDa.setEllipsoidalMode( true );
   myDa.setEllipsoid( QgsProject::instance()->ellipsoid() );
 
diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -697,7 +697,7 @@ QgsAttributeDialog* QgisAppInterface::getFeatureForm( QgsVectorLayer *l, QgsFeat
 {
   QgsDistanceArea myDa;
 
-  myDa.setSourceCrs( l->crs().srsid() );
+  myDa.setSourceCrs( l->crs() );
   myDa.setEllipsoidalMode( true );
   myDa.setEllipsoid( QgsProject::instance()->ellipsoid() );
 
diff --git a/src/app/qgsattributeactionpropertiesdialog.cpp b/src/app/qgsattributeactionpropertiesdialog.cpp
@@ -199,7 +199,7 @@ void QgsAttributeActionPropertiesDialog::init( const QSet<QString>& actionScopes
   }
 
   QgsDistanceArea myDa;
-  myDa.setSourceCrs( mLayer->crs().srsid() );
+  myDa.setSourceCrs( mLayer->crs() );
   myDa.setEllipsoidalMode( true );
   myDa.setEllipsoid( QgsProject::instance()->ellipsoid() );
 
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -586,7 +586,7 @@ void QgsAttributeTableDialog::filterExpressionBuilder()
   dlg.setWindowTitle( tr( "Expression based filter" ) );
 
   QgsDistanceArea myDa;
-  myDa.setSourceCrs( mLayer->crs().srsid() );
+  myDa.setSourceCrs( mLayer->crs() );
   myDa.setEllipsoidalMode( true );
   myDa.setEllipsoid( QgsProject::instance()->ellipsoid() );
   dlg.setGeomCalculator( myDa );
@@ -947,7 +947,7 @@ void QgsAttributeTableDialog::setFilterExpression( const QString& filterString,
   QgsFeatureIds filteredFeatures;
   QgsDistanceArea myDa;
 
-  myDa.setSourceCrs( mLayer->crs().srsid() );
+  myDa.setSourceCrs( mLayer->crs() );
   myDa.setEllipsoidalMode( true );
   myDa.setEllipsoid( QgsProject::instance()->ellipsoid() );
 
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -173,7 +173,7 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
   // field combo and expression button
   mSizeFieldExpressionWidget->setLayer( mLayer );
   QgsDistanceArea myDa;
-  myDa.setSourceCrs( mLayer->crs().srsid() );
+  myDa.setSourceCrs( mLayer->crs() );
   myDa.setEllipsoidalMode( true );
   myDa.setEllipsoid( QgsProject::instance()->ellipsoid() );
   mSizeFieldExpressionWidget->setGeomCalculator( myDa );
@@ -865,7 +865,7 @@ QString QgsDiagramProperties::showExpressionBuilder( const QString& initialExpre
   dlg.setWindowTitle( tr( "Expression based attribute" ) );
 
   QgsDistanceArea myDa;
-  myDa.setSourceCrs( mLayer->crs().srsid() );
+  myDa.setSourceCrs( mLayer->crs() );
   myDa.setEllipsoidalMode( true );
   myDa.setEllipsoid( QgsProject::instance()->ellipsoid() );
   dlg.setGeomCalculator( myDa );
diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
@@ -55,7 +55,7 @@ QgsFieldCalculator::QgsFieldCalculator( QgsVectorLayer* vl, QWidget* parent )
   connect( mOutputFieldWidthSpinBox, SIGNAL( editingFinished() ), this, SLOT( setPrecisionMinMax() ) );
 
   QgsDistanceArea myDa;
-  myDa.setSourceCrs( vl->crs().srsid() );
+  myDa.setSourceCrs( vl->crs() );
   myDa.setEllipsoidalMode( true );
   myDa.setEllipsoid( QgsProject::instance()->ellipsoid() );
   builder->setGeomCalculator( myDa );
@@ -155,7 +155,7 @@ void QgsFieldCalculator::accept()
   // Set up QgsDistanceArea each time we (re-)calculate
   QgsDistanceArea myDa;
 
-  myDa.setSourceCrs( mVectorLayer->crs().srsid() );
+  myDa.setSourceCrs( mVectorLayer->crs() );
   myDa.setEllipsoidalMode( true );
   myDa.setEllipsoid( QgsProject::instance()->ellipsoid() );
 
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -107,7 +107,7 @@ void QgsLabelingGui::setLayer( QgsMapLayer* mapLayer )
 
   mFieldExpressionWidget->setLayer( mLayer );
   QgsDistanceArea da;
-  da.setSourceCrs( mLayer->crs().srsid() );
+  da.setSourceCrs( mLayer->crs() );
   da.setEllipsoidalMode( true );
   da.setEllipsoid( QgsProject::instance()->ellipsoid() );
   mFieldExpressionWidget->setGeomCalculator( da );
diff --git a/src/app/qgsmaptoolmeasureangle.cpp b/src/app/qgsmaptoolmeasureangle.cpp
@@ -182,7 +182,7 @@ void QgsMapToolMeasureAngle::updateSettings()
 void QgsMapToolMeasureAngle::configureDistanceArea()
 {
   QString ellipsoidId = QgsProject::instance()->ellipsoid();
-  mDa.setSourceCrs( mCanvas->mapSettings().destinationCrs().srsid() );
+  mDa.setSourceCrs( mCanvas->mapSettings().destinationCrs() );
   mDa.setEllipsoid( ellipsoidId );
   mDa.setEllipsoidalMode( true );
 }
diff --git a/src/app/qgsmeasuredialog.cpp b/src/app/qgsmeasuredialog.cpp
@@ -77,7 +77,7 @@ void QgsMeasureDialog::updateSettings()
   // Configure QgsDistanceArea
   mDistanceUnits = QgsProject::instance()->distanceUnits();
   mAreaUnits = QgsProject::instance()->areaUnits();
-  mDa.setSourceCrs( mTool->canvas()->mapSettings().destinationCrs().srsid() );
+  mDa.setSourceCrs( mTool->canvas()->mapSettings().destinationCrs() );
   mDa.setEllipsoid( QgsProject::instance()->ellipsoid() );
   mDa.setEllipsoidalMode( true );
 
diff --git a/src/core/composer/qgscomposerscalebar.cpp b/src/core/composer/qgscomposerscalebar.cpp
@@ -338,7 +338,7 @@ double QgsComposerScaleBar::mapWidth() const
   {
     QgsDistanceArea da;
     da.setEllipsoidalMode( true );
-    da.setSourceCrs( mComposerMap->crs().srsid() );
+    da.setSourceCrs( mComposerMap->crs() );
     da.setEllipsoid( mComposition->project()->ellipsoid() );
 
     QgsUnitTypes::DistanceUnit units = QgsUnitTypes::DistanceMeters;
diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp
@@ -355,7 +355,7 @@ QMap< QString, QString > QgsMapToolIdentify::featureDerivedAttributes( QgsFeatur
   QgsDistanceArea calc;
   calc.setEllipsoidalMode( true );
   calc.setEllipsoid( ellipsoid );
-  calc.setSourceCrs( layer->crs().srsid() );
+  calc.setSourceCrs( layer->crs() );
 
   QgsWkbTypes::Type wkbType = QgsWkbTypes::NoGeometry;
   QgsWkbTypes::GeometryType geometryType = QgsWkbTypes::NullGeometry;
diff --git a/src/providers/grass/qgsgrassgislib.cpp b/src/providers/grass/qgsgrassgislib.cpp
@@ -234,7 +234,7 @@ int GRASS_LIB_EXPORT QgsGrassGisLib::G__gisinit( const char * version, const cha
       mCrs.saveAsUserCRS( myName );
     }
   }
-  mDistanceArea.setSourceCrs( mCrs.srsid() );
+  mDistanceArea.setSourceCrs( mCrs );
 
   // Read region fron environment variable
   // QGIS_GRASS_REGION=west,south,east,north,cols,rows

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class ANALYSIS_EXPORT QgsGraphBuilderInterface`
`46`	`46`	`, mCtfEnabled( ctfEnabled )`
`47`	`47`	`, mTopologyTolerance( topologyTolerance )`
`48`	`48`	`{`
`49`		`- mDa.setSourceCrs( mCrs.srsid() );`
	`49`	`+ mDa.setSourceCrs( mCrs );`
`50`	`50`	`mDa.setEllipsoid( ellipsoidID );`
`51`	`51`	`mDa.setEllipsoidalMode( ctfEnabled );`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ int QgsTransectSample::createSample( QProgressDialog* pd )`
`123`	`123`
`124`	`124`	`//configure distanceArea depending on minDistance units and output CRS`
`125`	`125`	`QgsDistanceArea distanceArea;`
`126`		`- distanceArea.setSourceCrs( mStrataLayer->crs().srsid() );`
	`126`	`+ distanceArea.setSourceCrs( mStrataLayer->crs() );`
`127`	`127`	`if ( mMinDistanceUnits == Meters )`
`128`	`128`	`{`
`129`	`129`	`distanceArea.setEllipsoidalMode( true );`
Original file line number	Diff line number	Diff line change
`@@ -7506,7 +7506,7 @@ void QgisApp::selectByForm()`
`7506`	`7506`	`}`
`7507`	`7507`	`QgsDistanceArea myDa;`
`7508`	`7508`
`7509`		`- myDa.setSourceCrs( vlayer->crs().srsid() );`
	`7509`	`+ myDa.setSourceCrs( vlayer->crs() );`
`7510`	`7510`	`myDa.setEllipsoidalMode( true );`
`7511`	`7511`	`myDa.setEllipsoid( QgsProject::instance()->ellipsoid() );`
`7512`	`7512`
Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,7 @@ QgsAttributeDialog* QgisAppInterface::getFeatureForm( QgsVectorLayer *l, QgsFeat`
`697`	`697`	`{`
`698`	`698`	`QgsDistanceArea myDa;`
`699`	`699`
`700`		`- myDa.setSourceCrs( l->crs().srsid() );`
	`700`	`+ myDa.setSourceCrs( l->crs() );`
`701`	`701`	`myDa.setEllipsoidalMode( true );`
`702`	`702`	`myDa.setEllipsoid( QgsProject::instance()->ellipsoid() );`
`703`	`703`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ void QgsAttributeActionPropertiesDialog::init( const QSet<QString>& actionScopes`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`QgsDistanceArea myDa;`
`202`		`- myDa.setSourceCrs( mLayer->crs().srsid() );`
	`202`	`+ myDa.setSourceCrs( mLayer->crs() );`
`203`	`203`	`myDa.setEllipsoidalMode( true );`
`204`	`204`	`myDa.setEllipsoid( QgsProject::instance()->ellipsoid() );`
`205`	`205`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ void QgsMapToolMeasureAngle::updateSettings()`
`182`	`182`	`void QgsMapToolMeasureAngle::configureDistanceArea()`
`183`	`183`	`{`
`184`	`184`	`QString ellipsoidId = QgsProject::instance()->ellipsoid();`
`185`		`- mDa.setSourceCrs( mCanvas->mapSettings().destinationCrs().srsid() );`
	`185`	`+ mDa.setSourceCrs( mCanvas->mapSettings().destinationCrs() );`
`186`	`186`	`mDa.setEllipsoid( ellipsoidId );`
`187`	`187`	`mDa.setEllipsoidalMode( true );`
`188`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ double QgsComposerScaleBar::mapWidth() const`
`338`	`338`	`{`
`339`	`339`	`QgsDistanceArea da;`
`340`	`340`	`da.setEllipsoidalMode( true );`
`341`		`- da.setSourceCrs( mComposerMap->crs().srsid() );`
	`341`	`+ da.setSourceCrs( mComposerMap->crs() );`
`342`	`342`	`da.setEllipsoid( mComposition->project()->ellipsoid() );`
`343`	`343`
`344`	`344`	`QgsUnitTypes::DistanceUnit units = QgsUnitTypes::DistanceMeters;`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ int GRASS_LIB_EXPORT QgsGrassGisLib::G__gisinit( const char * version, const cha`
`234`	`234`	`mCrs.saveAsUserCRS( myName );`
`235`	`235`	`}`
`236`	`236`	`}`
`237`		`- mDistanceArea.setSourceCrs( mCrs.srsid() );`
	`237`	`+ mDistanceArea.setSourceCrs( mCrs );`
`238`	`238`
`239`	`239`	`// Read region fron environment variable`
`240`	`240`	`// QGIS_GRASS_REGION=west,south,east,north,cols,rows`