different crs reprojection code revision

enricofer · m-kuhn · commit 6bbcb3de2357 · 2020-07-03T14:58:57.000+02:00
diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp
@@ -5696,9 +5696,9 @@ static QVariant executeGeomOverlay( const QVariantList &values, const QgsExpress
     request.setFilterExpression( filterString ); //filter cached features
   }
 
-  if (targetLayer->crs().authid() != sourceLayer->crs().authid())
+  if ( targetLayer->crs() != sourceLayer->crs() )
   {
-      QgsCoordinateTransformContext TransformContext;
+      QgsCoordinateTransformContext TransformContext = context->variable( QStringLiteral( "_project_transform_context" ) ).value<QgsCoordinateTransformContext>();
       request.setDestinationCrs(sourceLayer->crs(), TransformContext); //if crs are not the same, cached target will be reprojected to source crs
   }
 
@@ -5790,7 +5790,7 @@ static QVariant indexedFilteredOverlay( QgsExpression &subExp, QgsExpressionCont
   QVariantList results;
   for ( QgsFeatureId id : targetFeatureIds )
   {
-    if (!currentFeatId.isNull() && currentFeatId.toLongLong() == id)
+    if ( !currentFeatId.isNull() && currentFeatId.toLongLong() == id )
     {
         continue; //if sourceLayer and targetLayer are the same, current feature have to be excluded from spatial check
     }

Original file line number	Diff line number	Diff line change
`@@ -5696,9 +5696,9 @@ static QVariant executeGeomOverlay( const QVariantList &values, const QgsExpress`
`5696`	`5696`	`request.setFilterExpression( filterString ); //filter cached features`
`5697`	`5697`	`}`
`5698`	`5698`
`5699`		`- if (targetLayer->crs().authid() != sourceLayer->crs().authid())`
	`5699`	`+ if ( targetLayer->crs() != sourceLayer->crs() )`
`5700`	`5700`	`{`
`5701`		`- QgsCoordinateTransformContext TransformContext;`
	`5701`	`+ QgsCoordinateTransformContext TransformContext = context->variable( QStringLiteral( "_project_transform_context" ) ).value<QgsCoordinateTransformContext>();`
`5702`	`5702`	`request.setDestinationCrs(sourceLayer->crs(), TransformContext); //if crs are not the same, cached target will be reprojected to source crs`
`5703`	`5703`	`}`
`5704`	`5704`
`@@ -5790,7 +5790,7 @@ static QVariant indexedFilteredOverlay( QgsExpression &subExp, QgsExpressionCont`
`5790`	`5790`	`QVariantList results;`
`5791`	`5791`	`for ( QgsFeatureId id : targetFeatureIds )`
`5792`	`5792`	`{`
`5793`		`- if (!currentFeatId.isNull() && currentFeatId.toLongLong() == id)`
	`5793`	`+ if ( !currentFeatId.isNull() && currentFeatId.toLongLong() == id )`
`5794`	`5794`	`{`
`5795`	`5795`	`continue; //if sourceLayer and targetLayer are the same, current feature have to be excluded from spatial check`
`5796`	`5796`	`}`