[processing] Also warn on non-matching point and extent CRS

nyalldawson · nyalldawson · commit f5601d585db4 · 2018-05-03T11:23:23.000+10:00
if algorithm cannot handle automatic reprojection (cherry-picked from 386495b)
diff --git a/src/core/processing/qgsprocessingalgorithm.cpp b/src/core/processing/qgsprocessingalgorithm.cpp
@@ -167,7 +167,7 @@ bool QgsProcessingAlgorithm::validateInputCrs( const QVariantMap &parameters, Qg
   QgsCoordinateReferenceSystem crs;
   Q_FOREACH ( const QgsProcessingParameterDefinition *def, mParameters )
   {
-    if ( def->type() == QStringLiteral( "layer" ) || def->type() == QStringLiteral( "raster" ) )
+    if ( def->type() == QgsProcessingParameterMapLayer::typeName() || def->type() == QgsProcessingParameterRasterLayer::typeName() )
     {
       QgsMapLayer *layer = QgsProcessingParameters::parameterAsLayer( def, parameters, context );
       if ( layer )
@@ -183,7 +183,7 @@ bool QgsProcessingAlgorithm::validateInputCrs( const QVariantMap &parameters, Qg
         }
       }
     }
-    else if ( def->type() == QStringLiteral( "source" ) )
+    else if ( def->type() == QgsProcessingParameterFeatureSource::typeName() )
     {
       std::unique_ptr< QgsFeatureSource  > source( QgsProcessingParameters::parameterAsSource( def, parameters, context ) );
       if ( source )
@@ -199,7 +199,7 @@ bool QgsProcessingAlgorithm::validateInputCrs( const QVariantMap &parameters, Qg
         }
       }
     }
-    else if ( def->type() == QStringLiteral( "multilayer" ) )
+    else if ( def->type() == QgsProcessingParameterMultipleLayers::typeName() )
     {
       QList< QgsMapLayer *> layers = QgsProcessingParameters::parameterAsLayerList( def, parameters, context );
       Q_FOREACH ( QgsMapLayer *layer, layers )
@@ -218,6 +218,32 @@ bool QgsProcessingAlgorithm::validateInputCrs( const QVariantMap &parameters, Qg
         }
       }
     }
+    else if ( def->type() == QgsProcessingParameterExtent::typeName() )
+    {
+      QgsCoordinateReferenceSystem extentCrs = QgsProcessingParameters::parameterAsExtentCrs( def, parameters, context );
+      if ( foundCrs && extentCrs.isValid() && crs != extentCrs )
+      {
+        return false;
+      }
+      else if ( !foundCrs && extentCrs.isValid() )
+      {
+        foundCrs = true;
+        crs = extentCrs;
+      }
+    }
+    else if ( def->type() == QgsProcessingParameterPoint::typeName() )
+    {
+      QgsCoordinateReferenceSystem pointCrs = QgsProcessingParameters::parameterAsPointCrs( def, parameters, context );
+      if ( foundCrs && pointCrs.isValid() && crs != pointCrs )
+      {
+        return false;
+      }
+      else if ( !foundCrs && pointCrs.isValid() )
+      {
+        foundCrs = true;
+        crs = pointCrs;
+      }
+    }
   }
   return true;
 }
diff --git a/tests/src/analysis/testqgsprocessing.cpp b/tests/src/analysis/testqgsprocessing.cpp
@@ -255,6 +255,24 @@ class DummyAlgorithm : public QgsProcessingAlgorithm
       addParameter( new QgsProcessingParameterMultipleLayers( "p5" ) );
       parameters.insert( "p5", QVariantList() << layer4326->id() << r1->id() );
       QVERIFY( !validateInputCrs( parameters, context ) );
+
+      // extent
+      parameters.clear();
+      parameters.insert( "p1", QVariant::fromValue( layer3111 ) );
+      addParameter( new QgsProcessingParameterExtent( "extent" ) );
+      parameters.insert( "extent", QgsReferencedRectangle( QgsRectangle( 1, 2, 3, 4 ), QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:4326" ) ) ) );
+      QVERIFY( !validateInputCrs( parameters, context ) );
+      parameters.insert( "extent", QgsReferencedRectangle( QgsRectangle( 1, 2, 3, 4 ), QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:3111" ) ) ) );
+      QVERIFY( validateInputCrs( parameters, context ) );
+
+      // point
+      parameters.clear();
+      parameters.insert( "p1", QVariant::fromValue( layer3111 ) );
+      addParameter( new QgsProcessingParameterPoint( "point" ) );
+      parameters.insert( "point", QgsReferencedPointXY( QgsPointXY( 1, 2 ), QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:4326" ) ) ) );
+      QVERIFY( !validateInputCrs( parameters, context ) );
+      parameters.insert( "point", QgsReferencedPointXY( QgsPointXY( 1, 2 ), QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:3111" ) ) ) );
+      QVERIFY( validateInputCrs( parameters, context ) );
     }
 
     void runAsPythonCommandChecks()

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ bool QgsProcessingAlgorithm::validateInputCrs( const QVariantMap &parameters, Qg`
`167`	`167`	`QgsCoordinateReferenceSystem crs;`
`168`	`168`	`Q_FOREACH ( const QgsProcessingParameterDefinition *def, mParameters )`
`169`	`169`	`{`
`170`		`- if ( def->type() == QStringLiteral( "layer" ) \|\| def->type() == QStringLiteral( "raster" ) )`
	`170`	`+ if ( def->type() == QgsProcessingParameterMapLayer::typeName() \|\| def->type() == QgsProcessingParameterRasterLayer::typeName() )`
`171`	`171`	`{`
`172`	`172`	`QgsMapLayer *layer = QgsProcessingParameters::parameterAsLayer( def, parameters, context );`
`173`	`173`	`if ( layer )`
`@@ -183,7 +183,7 @@ bool QgsProcessingAlgorithm::validateInputCrs( const QVariantMap &parameters, Qg`
`183`	`183`	`}`
`184`	`184`	`}`
`185`	`185`	`}`
`186`		`- else if ( def->type() == QStringLiteral( "source" ) )`
	`186`	`+ else if ( def->type() == QgsProcessingParameterFeatureSource::typeName() )`
`187`	`187`	`{`
`188`	`188`	`std::unique_ptr< QgsFeatureSource > source( QgsProcessingParameters::parameterAsSource( def, parameters, context ) );`
`189`	`189`	`if ( source )`
`@@ -199,7 +199,7 @@ bool QgsProcessingAlgorithm::validateInputCrs( const QVariantMap &parameters, Qg`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`	`}`
`202`		`- else if ( def->type() == QStringLiteral( "multilayer" ) )`
	`202`	`+ else if ( def->type() == QgsProcessingParameterMultipleLayers::typeName() )`
`203`	`203`	`{`
`204`	`204`	`QList< QgsMapLayer *> layers = QgsProcessingParameters::parameterAsLayerList( def, parameters, context );`
`205`	`205`	`Q_FOREACH ( QgsMapLayer *layer, layers )`
`@@ -218,6 +218,32 @@ bool QgsProcessingAlgorithm::validateInputCrs( const QVariantMap &parameters, Qg`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`	`}`
	`221`	`+ else if ( def->type() == QgsProcessingParameterExtent::typeName() )`
	`222`	`+ {`
	`223`	`+ QgsCoordinateReferenceSystem extentCrs = QgsProcessingParameters::parameterAsExtentCrs( def, parameters, context );`
	`224`	`+ if ( foundCrs && extentCrs.isValid() && crs != extentCrs )`
	`225`	`+ {`
	`226`	`+ return false;`
	`227`	`+ }`
	`228`	`+ else if ( !foundCrs && extentCrs.isValid() )`
	`229`	`+ {`
	`230`	`+ foundCrs = true;`
	`231`	`+ crs = extentCrs;`
	`232`	`+ }`
	`233`	`+ }`
	`234`	`+ else if ( def->type() == QgsProcessingParameterPoint::typeName() )`
	`235`	`+ {`
	`236`	`+ QgsCoordinateReferenceSystem pointCrs = QgsProcessingParameters::parameterAsPointCrs( def, parameters, context );`
	`237`	`+ if ( foundCrs && pointCrs.isValid() && crs != pointCrs )`
	`238`	`+ {`
	`239`	`+ return false;`
	`240`	`+ }`
	`241`	`+ else if ( !foundCrs && pointCrs.isValid() )`
	`242`	`+ {`
	`243`	`+ foundCrs = true;`
	`244`	`+ crs = pointCrs;`
	`245`	`+ }`
	`246`	`+ }`
`221`	`247`	`}`
`222`	`248`	`return true;`
`223`	`249`	`}`