Don't show crs accuracy warnings when saving a vector/raster layer

from an ensemble based crs to another crs with the same ensemble datum
qgis · May 11, 2021 · b81ece4 · b81ece4
1 parent a2e369f
commit b81ece4
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 3 deletions.
diff --git a/python/gui/auto_generated/qgsprojectionselectionwidget.sip.in b/python/gui/auto_generated/qgsprojectionselectionwidget.sip.in
@@ -100,6 +100,30 @@ low accuracy.
 
 .. seealso:: :py:func:`showAccuracyWarnings`
 
+.. versionadded:: 3.20
+%End
+
+    void setSourceEnsemble( const QString &ensemble );
+%Docstring
+Sets the original source ``ensemble`` datum name.
+
+If set, CRS accuracy warnings will not be shown when the selected CRS in the widget has a matching
+ensemble datum, regardless of the ensemble's accuracy.
+
+.. seealso:: :py:func:`sourceEnsemble`
+
+.. versionadded:: 3.20
+%End
+
+    QString sourceEnsemble() const;
+%Docstring
+Returns the original source ensemble datum name.
+
+If set, CRS accuracy warnings will not be shown when the selected CRS in the widget has a matching
+ensemble datum, regardless of the ensemble's accuracy.
+
+.. seealso:: :py:func:`setSourceEnsemble`
+
 .. versionadded:: 3.20
 %End
 

diff --git a/src/gui/ogr/qgsvectorlayersaveasdialog.cpp b/src/gui/ogr/qgsvectorlayersaveasdialog.cpp
@@ -34,6 +34,7 @@
 #include <QSpinBox>
 #include <QRegularExpression>
 #include "gdal.h"
+#include "qgsdatums.h"
 
 static const int COLUMN_IDX_NAME = 0;
 static const int COLUMN_IDX_TYPE = 1;
@@ -201,7 +202,19 @@ void QgsVectorLayerSaveAsDialog::setup()
     mButtonBox->button( QDialogButtonBox::Ok )->setEnabled( !filePath.isEmpty() );
   } );
 
-  mCrsSelector->showAccuracyWarnings( true );
+  try
+  {
+    const QgsDatumEnsemble ensemble = mSelectedCrs.datumEnsemble();
+    if ( ensemble.isValid() )
+    {
+      mCrsSelector->setSourceEnsemble( ensemble.name() );
+    }
+  }
+  catch ( QgsNotSupportedException & )
+  {
+  }
+
+  mCrsSelector->setShowAccuracyWarnings( true );
 }
 
 QList<QPair<QLabel *, QWidget *> > QgsVectorLayerSaveAsDialog::createControls( const QMap<QString, QgsVectorFileWriter::Option *> &options )

diff --git a/src/gui/qgsprojectionselectionwidget.cpp b/src/gui/qgsprojectionselectionwidget.cpp
@@ -289,6 +289,20 @@ void QgsProjectionSelectionWidget::dropEvent( QDropEvent *event )
   update();
 }
 
+QString QgsProjectionSelectionWidget::sourceEnsemble() const
+{
+  return mSourceEnsemble;
+}
+
+void QgsProjectionSelectionWidget::setSourceEnsemble( const QString &ensemble )
+{
+  if ( mSourceEnsemble == ensemble )
+    return;
+
+  mSourceEnsemble = ensemble;
+  updateWarning();
+}
+
 bool QgsProjectionSelectionWidget::showAccuracyWarnings() const
 {
   return mShowAccuracyWarnings;
@@ -353,7 +367,7 @@ void QgsProjectionSelectionWidget::updateWarning()
   try
   {
     const QgsDatumEnsemble ensemble = crs().datumEnsemble();
-    if ( !ensemble.isValid() )
+    if ( !ensemble.isValid() || ensemble.name() == mSourceEnsemble )
     {
       mWarningLabelContainer->hide();
     }

diff --git a/src/gui/qgsprojectionselectionwidget.h b/src/gui/qgsprojectionselectionwidget.h
@@ -119,6 +119,28 @@ class GUI_EXPORT QgsProjectionSelectionWidget : public QWidget
      */
     void setShowAccuracyWarnings( bool show );
 
+    /**
+     * Sets the original source \a ensemble datum name.
+     *
+     * If set, CRS accuracy warnings will not be shown when the selected CRS in the widget has a matching
+     * ensemble datum, regardless of the ensemble's accuracy.
+     *
+     * \see sourceEnsemble()
+     * \since QGIS 3.20
+     */
+    void setSourceEnsemble( const QString &ensemble );
+
+    /**
+     * Returns the original source ensemble datum name.
+     *
+     * If set, CRS accuracy warnings will not be shown when the selected CRS in the widget has a matching
+     * ensemble datum, regardless of the ensemble's accuracy.
+     *
+     * \see setSourceEnsemble()
+     * \since QGIS 3.20
+     */
+    QString sourceEnsemble() const;
+
   signals:
 
     /**
@@ -171,6 +193,8 @@ class GUI_EXPORT QgsProjectionSelectionWidget : public QWidget
     QString mMessage;
 
     bool mShowAccuracyWarnings = false;
+    QString mSourceEnsemble;
+
     QWidget *mWarningLabelContainer = nullptr;
     QLabel *mWarningLabel = nullptr;
 

diff --git a/src/gui/qgsrasterlayersaveasdialog.cpp b/src/gui/qgsrasterlayersaveasdialog.cpp
@@ -32,6 +32,7 @@
 #include "qgsmessagelog.h"
 #include "qgsgui.h"
 #include "qgsdoublevalidator.h"
+#include "qgsdatums.h"
 
 #include <QFileDialog>
 #include <QMessageBox>
@@ -140,7 +141,18 @@ QgsRasterLayerSaveAsDialog::QgsRasterLayerSaveAsDialog( QgsRasterLayer *rasterLa
   // don't restore nodata, it needs user input
   // pyramids are not necessarily built every time
 
-  mCrsSelector->showAccuracyWarnings( true );
+  try
+  {
+    const QgsDatumEnsemble ensemble = mLayerCrs.datumEnsemble();
+    if ( ensemble.isValid() )
+    {
+      mCrsSelector->setSourceEnsemble( ensemble.name() );
+    }
+  }
+  catch ( QgsNotSupportedException & )
+  {
+  }
+  mCrsSelector->setShowAccuracyWarnings( true );
 
   mCrsSelector->setLayerCrs( mLayerCrs );
   //default to layer CRS - see https://github.com/qgis/QGIS/issues/22211 for discussion