Merge pull request #7959 from m-kuhn/geometryOptions

m-kuhn · web-flow · commit 3cb82a58c84f · 2018-09-19T15:52:38.000+02:00
Add a new QML category "Geometry Options"
diff --git a/python/core/auto_generated/qgsgeometryoptions.sip.in b/python/core/auto_generated/qgsgeometryoptions.sip.in
@@ -1,32 +1,32 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgsgeometryfixes.h                                          *
+ * src/core/qgsgeometryoptions.h                                        *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
 
 
 
 
-class QgsGeometryFixes
+class QgsGeometryOptions
 {
 %Docstring
 
-The QgsGeometryFixes class contains options to automatically adjust geometries to
+The QgsGeometryOptions class contains options to automatically adjust geometries to
 constraints on a layer.
 
 .. versionadded:: 3.4
 %End
 
 %TypeHeaderCode
-#include "qgsgeometryfixes.h"
+#include "qgsgeometryoptions.h"
 %End
   public:
 
-    QgsGeometryFixes();
+    QgsGeometryOptions();
 %Docstring
-Create a new QgsGeometryFixes object.
+Create a new QgsGeometryOptions object.
 %End
 
     bool removeDuplicateNodes() const;
@@ -72,6 +72,20 @@ Determines if at least one fix is enabled.
 %Docstring
 Apply any fixes configured on this class to ``geometry``.
 
+.. versionadded:: 3.4
+%End
+
+    void writeXml( QDomNode &node ) const;
+%Docstring
+Write the geometry options to the ``node``.
+
+.. versionadded:: 3.4
+%End
+
+    void readXml( const QDomNode &node );
+%Docstring
+Read the geometry options from ``node``.
+
 .. versionadded:: 3.4
 %End
 
@@ -80,7 +94,7 @@ Apply any fixes configured on this class to ``geometry``.
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgsgeometryfixes.h                                          *
+ * src/core/qgsgeometryoptions.h                                        *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/python/core/auto_generated/qgsmaplayer.sip.in b/python/core/auto_generated/qgsmaplayer.sip.in
@@ -89,6 +89,7 @@ This is the base class for all map layer types (vector, raster).
       AttributeTable,
       Rendering,
       CustomProperties,
+      GeometryOptions,
       AllStyleCategories
     };
     typedef QFlags<QgsMapLayer::StyleCategory> StyleCategories;
diff --git a/python/core/auto_generated/qgsvectorlayer.sip.in b/python/core/auto_generated/qgsvectorlayer.sip.in
@@ -2230,7 +2230,7 @@ Test if an edit command is active
 .. versionadded:: 3.0
 %End
 
-    QgsGeometryFixes *geometryFixes() const;
+    QgsGeometryOptions *geometryOptions() const;
 %Docstring
 Configuration and logic to apply automatically on any edit happening on this layer.
 
diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -54,7 +54,7 @@
 %Include auto_generated/qgsfields.sip
 %Include auto_generated/qgsfileutils.sip
 %Include auto_generated/qgsfontutils.sip
-%Include auto_generated/qgsgeometryfixes.sip
+%Include auto_generated/qgsgeometryoptions.sip
 %Include auto_generated/qgsgeometrysimplifier.sip
 %Include auto_generated/qgshistogram.sip
 %Include auto_generated/qgshstoreutils.sip
diff --git a/src/app/qgsmaplayerstylecategoriesmodel.cpp b/src/app/qgsmaplayerstylecategoriesmodel.cpp
@@ -208,6 +208,17 @@ QVariant QgsMapLayerStyleCategoriesModel::data( const QModelIndex &index, int ro
           return QgsApplication::getThemeIcon( QStringLiteral( "/mActionOptions.svg" ) );
       }
       break;
+    case QgsMapLayer::GeometryOptions:
+      switch ( role )
+      {
+        case Qt::DisplayRole:
+          return tr( "Geometry Options" );
+        case Qt::ToolTipRole:
+          return tr( "Geometry constraints and validity checks" );
+        case Qt::DecorationRole:
+          return QgsApplication::getThemeIcon( QStringLiteral( "/propertyicons/digitizing.svg" ) );
+      }
+      break;
     case QgsMapLayer::AllStyleCategories:
       switch ( role )
       {
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -60,7 +60,7 @@
 #include "qgsnewauxiliaryfielddialog.h"
 #include "qgslabelinggui.h"
 #include "qgssymbollayer.h"
-#include "qgsgeometryfixes.h"
+#include "qgsgeometryoptions.h"
 #include "qgsvectorlayersavestyledialog.h"
 #include "qgsvectorlayerloadstyledialog.h"
 
@@ -401,8 +401,8 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
     mRemoveDuplicateNodesCheckbox->setEnabled( true );
     mGeometryPrecisionSpinBox->setEnabled( true );
 
-    mRemoveDuplicateNodesCheckbox->setChecked( mLayer->geometryFixes()->removeDuplicateNodes() );
-    mGeometryPrecisionSpinBox->setValue( mLayer->geometryFixes()->geometryPrecision() );
+    mRemoveDuplicateNodesCheckbox->setChecked( mLayer->geometryOptions()->removeDuplicateNodes() );
+    mGeometryPrecisionSpinBox->setValue( mLayer->geometryOptions()->geometryPrecision() );
 
     mGeometryPrecisionSpinBox->setSuffix( QStringLiteral( " [%1]" ).arg( QgsUnitTypes::toAbbreviatedString( mLayer->crs().mapUnits() ) ) );
   }
@@ -751,8 +751,8 @@ void QgsVectorLayerProperties::apply()
   mVector3DWidget->apply();
 #endif
 
-  mLayer->geometryFixes()->setRemoveDuplicateNodes( mRemoveDuplicateNodesCheckbox->isChecked() );
-  mLayer->geometryFixes()->setGeometryPrecision( mGeometryPrecisionSpinBox->value() );
+  mLayer->geometryOptions()->setRemoveDuplicateNodes( mRemoveDuplicateNodesCheckbox->isChecked() );
+  mLayer->geometryOptions()->setGeometryPrecision( mGeometryPrecisionSpinBox->value() );
 
   // update symbology
   emit refreshLegend( mLayer->id() );
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -204,7 +204,7 @@ SET(QGIS_CORE_SRCS
   qgsfontutils.cpp
   qgsgeometrysimplifier.cpp
   qgsgeometryvalidator.cpp
-  qgsgeometryfixes.cpp
+  qgsgeometryoptions.cpp
   qgsgml.cpp
   qgsgmlschema.cpp
   qgshistogram.cpp
@@ -867,7 +867,7 @@ SET(QGIS_CORE_HDRS
   qgsfields.h
   qgsfileutils.h
   qgsfontutils.h
-  qgsgeometryfixes.h
+  qgsgeometryoptions.h
   qgsgeometrysimplifier.h
   qgshistogram.h
   qgshstoreutils.h
diff --git a/src/core/qgsgeometryoptions.cpp b/src/core/qgsgeometryoptions.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          qgsgeometryfixes.cpp
+                          qgsgeometryoptions.cpp
                              -------------------
     begin                : Aug 23, 2018
     copyright            : (C) 2018 by Matthias Kuhn
@@ -15,38 +15,56 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgsgeometryfixes.h"
+#include "qgsgeometryoptions.h"
 
-bool QgsGeometryFixes::removeDuplicateNodes() const
+#include "qgsxmlutils.h"
+
+bool QgsGeometryOptions::removeDuplicateNodes() const
 {
   return mRemoveDuplicateNodes;
 }
 
-void QgsGeometryFixes::setRemoveDuplicateNodes( bool value )
+void QgsGeometryOptions::setRemoveDuplicateNodes( bool value )
 {
   mRemoveDuplicateNodes = value;
 }
 
-double QgsGeometryFixes::geometryPrecision() const
+double QgsGeometryOptions::geometryPrecision() const
 {
   return mGeometryPrecision;
 }
 
-void QgsGeometryFixes::setGeometryPrecision( double value )
+void QgsGeometryOptions::setGeometryPrecision( double value )
 {
   mGeometryPrecision = value;
 }
 
-bool QgsGeometryFixes::isActive() const
+bool QgsGeometryOptions::isActive() const
 {
   return mGeometryPrecision != 0.0 || mRemoveDuplicateNodes;
 }
 
-void QgsGeometryFixes::apply( QgsGeometry &geometry ) const
+void QgsGeometryOptions::apply( QgsGeometry &geometry ) const
 {
   if ( mGeometryPrecision != 0.0 )
     geometry = geometry.snappedToGrid( mGeometryPrecision, mGeometryPrecision );
 
   if ( mRemoveDuplicateNodes )
     geometry.removeDuplicateNodes();
 }
+
+void QgsGeometryOptions::writeXml( QDomNode &node ) const
+{
+  QDomElement geometryOptionsElement = node.ownerDocument().createElement( QStringLiteral( "geometryOptions" ) );
+  node.appendChild( geometryOptionsElement );
+
+  geometryOptionsElement.setAttribute( QStringLiteral( "removeDuplicateNodes" ), mRemoveDuplicateNodes ? 1 : 0 );
+  geometryOptionsElement.setAttribute( QStringLiteral( "geometryPrecision" ), mGeometryPrecision );
+}
+
+void QgsGeometryOptions::readXml( const QDomNode &node )
+{
+  QDomElement geometryOptionsElement = node.toElement();
+  setGeometryPrecision( geometryOptionsElement.attribute( QStringLiteral( "geometryPrecision" ),  QStringLiteral( "0.0" ) ).toDouble() );
+  setRemoveDuplicateNodes( geometryOptionsElement.attribute( QStringLiteral( "removeDuplicateNodes" ),  QStringLiteral( "0" ) ).toInt() == 1 );
+}
diff --git a/src/core/qgsgeometryoptions.h b/src/core/qgsgeometryoptions.h
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          qgsgeometryfixes.h
+                          qgsgeometryoptions.h
                              -------------------
     begin                : Aug 23, 2018
     copyright            : (C) 2018 by Matthias Kuhn
@@ -15,27 +15,29 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QGSGEOMETRYFIXES_H
-#define QGSGEOMETRYFIXES_H
+#ifndef QGSGEOMETRYOPTIONS_H
+#define QGSGEOMETRYOPTIONS_H
 
+#include "qgis_core.h"
+#include "qgis_sip.h"
 #include "qgsgeometry.h"
 
 /**
  * \ingroup core
  *
- * The QgsGeometryFixes class contains options to automatically adjust geometries to
+ * The QgsGeometryOptions class contains options to automatically adjust geometries to
  * constraints on a layer.
  *
  * \since QGIS 3.4
  */
-class CORE_EXPORT QgsGeometryFixes
+class CORE_EXPORT QgsGeometryOptions
 {
   public:
 
     /**
-     * Create a new QgsGeometryFixes object.
+     * Create a new QgsGeometryOptions object.
      */
-    QgsGeometryFixes() = default;
+    QgsGeometryOptions() = default;
 
     /**
      * Automatically remove duplicate nodes on all geometries which are edited on this layer.
@@ -83,6 +85,20 @@ class CORE_EXPORT QgsGeometryFixes
      */
     void apply( QgsGeometry &geometry ) const;
 
+    /**
+     * Write the geometry options to the \a node.
+     *
+     * \since QGIS 3.4
+     */
+    void writeXml( QDomNode &node ) const;
+
+    /**
+     * Read the geometry options from \a node.
+     *
+     * \since QGIS 3.4
+     */
+    void readXml( const QDomNode &node );
+
   private:
 
     /**
@@ -102,4 +118,4 @@ class CORE_EXPORT QgsGeometryFixes
     double mGeometryPrecision = 0.0;
 };
 
-#endif // QGSGEOMETRYFIXES_H
+#endif // QGSGEOMETRYOPTIONS_H
diff --git a/src/core/qgsmaplayer.h b/src/core/qgsmaplayer.h
@@ -153,8 +153,9 @@ class CORE_EXPORT QgsMapLayer : public QObject
       AttributeTable     = 1 << 9,  //!< Attribute table settings: choice and order of columns, conditional styling
       Rendering          = 1 << 10, //!< Rendering: scale visibility, simplify method, opacity
       CustomProperties   = 1 << 11, //!< Custom properties (by plugins for instance)
+      GeometryOptions    = 1 << 12, //!< Geometry validation configuration
       AllStyleCategories = LayerConfiguration | Symbology | Symbology3D | Labeling | Fields | Forms | Actions |
-                           MapTips | Diagrams | AttributeTable | Rendering | CustomProperties,
+                           MapTips | Diagrams | AttributeTable | Rendering | CustomProperties | GeometryOptions,
     };
     Q_ENUM( StyleCategory )
     Q_DECLARE_FLAGS( StyleCategories, StyleCategory )
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
diff --git a/src/gui/qgsmaptooladvanceddigitizing.cpp b/src/gui/qgsmaptooladvanceddigitizing.cpp
diff --git a/tests/src/python/test_qgsvectorlayer.py b/tests/src/python/test_qgsvectorlayer.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/***************************************************************************`
`2`		`- qgsgeometryfixes.cpp`
	`2`	`+ qgsgeometryoptions.cpp`
`3`	`3`	`-------------------`
`4`	`4`	`begin : Aug 23, 2018`
`5`	`5`	`copyright : (C) 2018 by Matthias Kuhn`
`@@ -15,38 +15,56 @@`
`15`	`15`	`* *`
`16`	`16`	`***************************************************************************/`
`17`	`17`
`18`		`-#include "qgsgeometryfixes.h"`
	`18`	`+#include "qgsgeometryoptions.h"`
`19`	`19`
`20`		`-bool QgsGeometryFixes::removeDuplicateNodes() const`
	`20`	`+#include "qgsxmlutils.h"`
	`21`	`+`
	`22`	`+bool QgsGeometryOptions::removeDuplicateNodes() const`
`21`	`23`	`{`
`22`	`24`	`return mRemoveDuplicateNodes;`
`23`	`25`	`}`
`24`	`26`
`25`		`-void QgsGeometryFixes::setRemoveDuplicateNodes( bool value )`
	`27`	`+void QgsGeometryOptions::setRemoveDuplicateNodes( bool value )`
`26`	`28`	`{`
`27`	`29`	`mRemoveDuplicateNodes = value;`
`28`	`30`	`}`
`29`	`31`
`30`		`-double QgsGeometryFixes::geometryPrecision() const`
	`32`	`+double QgsGeometryOptions::geometryPrecision() const`
`31`	`33`	`{`
`32`	`34`	`return mGeometryPrecision;`
`33`	`35`	`}`
`34`	`36`
`35`		`-void QgsGeometryFixes::setGeometryPrecision( double value )`
	`37`	`+void QgsGeometryOptions::setGeometryPrecision( double value )`
`36`	`38`	`{`
`37`	`39`	`mGeometryPrecision = value;`
`38`	`40`	`}`
`39`	`41`
`40`		`-bool QgsGeometryFixes::isActive() const`
	`42`	`+bool QgsGeometryOptions::isActive() const`
`41`	`43`	`{`
`42`	`44`	`return mGeometryPrecision != 0.0 \|\| mRemoveDuplicateNodes;`
`43`	`45`	`}`
`44`	`46`
`45`		`-void QgsGeometryFixes::apply( QgsGeometry &geometry ) const`
	`47`	`+void QgsGeometryOptions::apply( QgsGeometry &geometry ) const`
`46`	`48`	`{`
`47`	`49`	`if ( mGeometryPrecision != 0.0 )`
`48`	`50`	`geometry = geometry.snappedToGrid( mGeometryPrecision, mGeometryPrecision );`
`49`	`51`
`50`	`52`	`if ( mRemoveDuplicateNodes )`
`51`	`53`	`geometry.removeDuplicateNodes();`
`52`	`54`	`}`
	`55`	`+`
	`56`	`+void QgsGeometryOptions::writeXml( QDomNode &node ) const`
	`57`	`+{`
	`58`	`+ QDomElement geometryOptionsElement = node.ownerDocument().createElement( QStringLiteral( "geometryOptions" ) );`
	`59`	`+ node.appendChild( geometryOptionsElement );`
	`60`	`+`
	`61`	`+ geometryOptionsElement.setAttribute( QStringLiteral( "removeDuplicateNodes" ), mRemoveDuplicateNodes ? 1 : 0 );`
	`62`	`+ geometryOptionsElement.setAttribute( QStringLiteral( "geometryPrecision" ), mGeometryPrecision );`
	`63`	`+}`
	`64`	`+`
	`65`	`+void QgsGeometryOptions::readXml( const QDomNode &node )`
	`66`	`+{`
	`67`	`+ QDomElement geometryOptionsElement = node.toElement();`
	`68`	`+ setGeometryPrecision( geometryOptionsElement.attribute( QStringLiteral( "geometryPrecision" ), QStringLiteral( "0.0" ) ).toDouble() );`
	`69`	`+ setRemoveDuplicateNodes( geometryOptionsElement.attribute( QStringLiteral( "removeDuplicateNodes" ), QStringLiteral( "0" ) ).toInt() == 1 );`
	`70`	`+}`
-Original file line number
+Diff line change
 #include "qgstaskmanager.h"
 #include "qgstransaction.h"
 #include "qgsauxiliarystorage.h"
 -#include "qgsgeometryfixes.h"
 +#include "qgsgeometryoptions.h"
 #include "diagram/qgsdiagram.h"
   , mAuxiliaryLayerKey( QString() )
   , mReadExtentFromXml( options.readExtentFromXml )
+{
 -  mGeometryFixes = qgis::make_unique<QgsGeometryFixes>();
 +  mGeometryOptions = qgis::make_unique<QgsGeometryOptions>();
   mActions = new QgsActionManager( this );
   mConditionalStyles = new QgsConditionalLayerStyles();
     return false;
 -  if ( mGeometryFixes->isActive() )
 +  if ( mGeometryOptions->isActive() )
+  {
     QgsGeometry geom = feature.geometry();
 -    mGeometryFixes->apply( geom );
 +    mGeometryOptions->apply( geom );
     feature.setGeometry( geom );
+  }
+    }
+  }
 -  if ( categories.testFlag( LayerConfiguration ) )
 -  {
 -    QDomElement geometryOptionsElement = layerNode.namedItem( QStringLiteral( "geometryOptions" ) ).toElement();
 -    mGeometryFixes->setGeometryPrecision( geometryOptionsElement.attribute( QStringLiteral( "geometryPrecision" ),  QStringLiteral( "0.0" ) ).toDouble() );
 -    mGeometryFixes->setRemoveDuplicateNodes( geometryOptionsElement.attribute( QStringLiteral( "removeDuplicateNodes" ),  QStringLiteral( "0" ) ).toInt() == 1 );
 -  }
 +  if ( categories.testFlag( GeometryOptions ) )
 +    mGeometryOptions->readXml( layerNode.namedItem( QStringLiteral( "geometryOptions" ) ) );
++
   if ( categories.testFlag( Forms ) )
     mEditFormConfig.readXml( layerNode, context );
   ( void )writeStyle( node, doc, errorMessage, context, categories );
 -  if ( categories.testFlag( LayerConfiguration ) )
 -  {
 -    QDomElement geometryOptionsElement = doc.createElement( QStringLiteral( "geometryOptions" ) );
 -    node.appendChild( geometryOptionsElement );
 -    geometryOptionsElement.setAttribute( QStringLiteral( "removeDuplicateNodes" ), mGeometryFixes->removeDuplicateNodes() ? 1 : 0 );
 -    geometryOptionsElement.setAttribute( QStringLiteral( "geometryPrecision" ), mGeometryFixes->geometryPrecision() );
 -  }
 +  if ( categories.testFlag( GeometryOptions ) )
 +    mGeometryOptions->writeXml( node );
   if ( categories.testFlag( Fields ) )
+  {
     return false;
+  }
 -  if ( mGeometryFixes->isActive() )
 -    mGeometryFixes->apply( geom );
 +  if ( mGeometryOptions->isActive() )
 +    mGeometryOptions->apply( geom );
   updateExtents();
   if ( !mEditBuffer || !mDataProvider )
     return false;
 -  if ( mGeometryFixes->isActive() )
 +  if ( mGeometryOptions->isActive() )
+  {
     for ( auto feature = features.begin(); feature != features.end(); ++feature )
+    {
       QgsGeometry geom = feature->geometry();
 -      mGeometryFixes->apply( geom );
 +      mGeometryOptions->apply( geom );
       feature->setGeometry( geom );
+    }
+  }
   return labeling;
+}
 -QgsGeometryFixes *QgsVectorLayer::geometryFixes() const
 +QgsGeometryOptions *QgsVectorLayer::geometryOptions() const
+{
 -  return mGeometryFixes.get();
 +  return mGeometryOptions.get();
+}
 void QgsVectorLayer::setReadExtentFromXml( bool readExtentFromXml )
-Original file line number
+Diff line change
 class QgsFeedback;
 class QgsAuxiliaryStorage;
 class QgsAuxiliaryLayer;
 -class QgsGeometryFixes;
 +class QgsGeometryOptions;
 typedef QList<int> QgsAttributeList;
 typedef QSet<int> QgsAttributeIds;
+     *
      * \since QGIS 3.4
      */
 -    QgsGeometryFixes *geometryFixes() const;
 +    QgsGeometryOptions *geometryOptions() const;
   public slots:
     QgsVectorLayerFeatureCounter *mFeatureCounter = nullptr;
 -    std::unique_ptr<QgsGeometryFixes> mGeometryFixes;
 +    std::unique_ptr<QgsGeometryOptions> mGeometryOptions;
     friend class QgsVectorLayerFeatureSource;
 };
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`#include "qgsmapcanvas.h"`
`19`	`19`	`#include "qgsadvanceddigitizingdockwidget.h"`
`20`	`20`	`#include "qgsvectorlayer.h"`
`21`		`-#include "qgsgeometryfixes.h"`
	`21`	`+#include "qgsgeometryoptions.h"`
`22`	`22`	`#include "qgssnaptogridcanvasitem.h"`
`23`	`23`
`24`	`24`	`QgsMapToolAdvancedDigitizing::QgsMapToolAdvancedDigitizing( QgsMapCanvas canvas, QgsAdvancedDigitizingDockWidget cadDockWidget )`
`@@ -45,7 +45,7 @@ void QgsMapToolAdvancedDigitizing::canvasPressEvent( QgsMapMouseEvent *e )`
`45`	`45`	`QgsVectorLayer *layer = currentVectorLayer();`
`46`	`46`	`if ( mSnapToLayerGridEnabled && layer )`
`47`	`47`	`{`
`48`		`- e->snapToGrid( layer->geometryFixes()->geometryPrecision(), layer->crs() );`
	`48`	`+ e->snapToGrid( layer->geometryOptions()->geometryPrecision(), layer->crs() );`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`cadCanvasPressEvent( e );`
`@@ -85,7 +85,7 @@ void QgsMapToolAdvancedDigitizing::canvasReleaseEvent( QgsMapMouseEvent *e )`
`85`	`85`	`QgsVectorLayer *layer = currentVectorLayer();`
`86`	`86`	`if ( mSnapToGridCanvasItem && mSnapToLayerGridEnabled && layer )`
`87`	`87`	`{`
`88`		`- e->snapToGrid( layer->geometryFixes()->geometryPrecision(), layer->crs() );`
	`88`	`+ e->snapToGrid( layer->geometryOptions()->geometryPrecision(), layer->crs() );`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`cadCanvasReleaseEvent( e );`
`@@ -110,7 +110,7 @@ void QgsMapToolAdvancedDigitizing::canvasMoveEvent( QgsMapMouseEvent *e )`
`110`	`110`	`QgsVectorLayer *layer = currentVectorLayer();`
`111`	`111`	`if ( mSnapToGridCanvasItem && mSnapToLayerGridEnabled && layer )`
`112`	`112`	`{`
`113`		`- e->snapToGrid( layer->geometryFixes()->geometryPrecision(), layer->crs() );`
	`113`	`+ e->snapToGrid( layer->geometryOptions()->geometryPrecision(), layer->crs() );`
`114`	`114`	`mSnapToGridCanvasItem->setPoint( e->mapPoint() );`
`115`	`115`	`}`
`116`	`116`
`@@ -127,7 +127,7 @@ void QgsMapToolAdvancedDigitizing::activate()`
`127`	`127`	`if ( layer )`
`128`	`128`	`{`
`129`	`129`	`mSnapToGridCanvasItem->setCrs( currentVectorLayer()->crs() );`
`130`		`- mSnapToGridCanvasItem->setPrecision( currentVectorLayer()->geometryFixes()->geometryPrecision() );`
	`130`	`+ mSnapToGridCanvasItem->setPrecision( currentVectorLayer()->geometryOptions()->geometryPrecision() );`
`131`	`131`	`}`
`132`	`132`	`mSnapToGridCanvasItem->setEnabled( mSnapToLayerGridEnabled );`
`133`	`133`	`}`
`@@ -155,7 +155,7 @@ void QgsMapToolAdvancedDigitizing::onCurrentLayerChanged()`
`155`	`155`	`QgsVectorLayer *layer = currentVectorLayer();`
`156`	`156`	`if ( layer && mSnapToLayerGridEnabled )`
`157`	`157`	`{`
`158`		`- mSnapToGridCanvasItem->setPrecision( layer->geometryFixes()->geometryPrecision() );`
	`158`	`+ mSnapToGridCanvasItem->setPrecision( layer->geometryOptions()->geometryPrecision() );`
`159`	`159`	`mSnapToGridCanvasItem->setCrs( layer->crs() );`
`160`	`160`	`}`
`161`	`161`
-Original file line number
+Diff line change
     def testPrecision(self):
         layer = QgsVectorLayer("Polygon?crs=epsg:2056&field=pk:int", "vl", "memory")
 -        layer.geometryFixes().setGeometryPrecision(10)
 +        layer.geometryOptions().setGeometryPrecision(10)
         geom = QgsGeometry.fromWkt('Polygon ((2596411 1224654, 2596400 1224652, 2596405 1224640, 2596410 1224641, 2596411 1224654))')
         feature = QgsFeature(layer.fields())
         feature.setGeometry(geom)
         layer.startEditing()
         layer.addFeature(feature)
         self.assertGeometriesEqual(QgsGeometry.fromWkt('Polygon ((2596410 1224650, 2596400 1224650, 2596410 1224640, 2596410 1224650))'), feature.geometry(), 'geometry with unsnapped nodes', 'fixed geometry')
 -        layer.geometryFixes().setGeometryPrecision(0.0)
 +        layer.geometryOptions().setGeometryPrecision(0.0)
         feature.setGeometry(QgsGeometry.fromWkt('Polygon ((2596411 1224654, 2596400 1224652, 2596405 1224640, 2596410 1224641, 2596411 1224654))'))
         layer.addFeature(feature)
         self.assertGeometriesEqual(QgsGeometry.fromWkt('Polygon ((2596411 1224654, 2596400 1224652, 2596405 1224640, 2596410 1224641, 2596411 1224654))'), feature.geometry(), 'geometry with duplicates', 'unchanged geometry')
     def testRemoveDuplicateNodes(self):
         layer = QgsVectorLayer("Polygon?crs=epsg:2056&field=pk:int", "vl", "memory")
 -        layer.geometryFixes().setRemoveDuplicateNodes(True)
 +        layer.geometryOptions().setRemoveDuplicateNodes(True)
         geom = QgsGeometry.fromWkt('Polygon ((70 80, 80 90, 80 90, 60 50, 70 80))')
         feature = QgsFeature(layer.fields())
         feature.setGeometry(geom)
         layer.startEditing()
         layer.addFeature(feature)
         self.assertGeometriesEqual(feature.geometry(), QgsGeometry.fromWkt('Polygon ((70 80, 80 90, 60 50, 70 80))'), 'fixed geometry', 'geometry with duplicates')
 -        layer.geometryFixes().setRemoveDuplicateNodes(False)
 +        layer.geometryOptions().setRemoveDuplicateNodes(False)
         feature.setGeometry(QgsGeometry.fromWkt('Polygon ((70 80, 80 90, 80 90, 60 50, 70 80))'))
         layer.addFeature(feature)
         self.assertGeometriesEqual(feature.geometry(), QgsGeometry.fromWkt('Polygon ((70 80, 80 90, 80 90, 60 50, 70 80))'), 'unchanged geometry', 'geometry with duplicates')
     def testPrecisionAndDuplicateNodes(self):
         layer = QgsVectorLayer("Polygon?crs=epsg:2056&field=pk:int", "vl", "memory")
 -        layer.geometryFixes().setGeometryPrecision(10)
 -        layer.geometryFixes().setRemoveDuplicateNodes(True)
 +        layer.geometryOptions().setGeometryPrecision(10)
 +        layer.geometryOptions().setRemoveDuplicateNodes(True)
         geom = QgsGeometry.fromWkt('Polygon ((2596411 1224654, 2596400 1224652, 2596402 1224653, 2596405 1224640, 2596410 1224641, 2596411 1224654))')
         feature = QgsFeature(layer.fields())
         feature.setGeometry(geom)