Merge pull request #3905 from nextgis/25d_enhancement

vmora · web-flow · commit 77bf999094b1 · 2017-02-13T09:11:27.000+01:00
[FEATURE] QGIS setting to choose default Z value
diff --git a/python/core/geometry/qgsgeometry.sip b/python/core/geometry/qgsgeometry.sip
@@ -207,6 +207,19 @@ class QgsGeometry
      */
     bool insertVertex( double x, double y, int beforeVertex );
 
+    /** Insert a new vertex before the given vertex index,
+     *  ring and item (first number is index 0)
+     *  If the requested vertex number (beforeVertex.back()) is greater
+     *  than the last actual vertex on the requested ring and item,
+     *  it is assumed that the vertex is to be appended instead of inserted.
+     *  Returns false if atVertex does not correspond to a valid vertex
+     *  on this geometry (including if this geometry is a Point).
+     *  It is up to the caller to distinguish between
+     *  these error conditions.  (Or maybe we add another method to this
+     *  object to help make the distinction?)
+     */
+    bool insertVertex( const QgsPointV2& point, int beforeVertex );
+
     /** Moves the vertex at the given position number
      *  and item (first number is index 0)
      *  to the given coordinates.
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -795,6 +795,12 @@ class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator
      */
     bool insertVertex( double x, double y, QgsFeatureId atFeatureId, int beforeVertex );
 
+    /** Insert a new vertex before the given vertex number,
+     *  in the given ring, item (first number is index 0), and feature
+     *  Not meaningful for Point geometries
+     */
+    bool insertVertex( const QgsPointV2& point, QgsFeatureId atFeatureId, int beforeVertex );
+
     /** Moves the vertex at the given position number,
      *  ring and item (first number is index 0), and feature
      *  to the given coordinates
diff --git a/python/core/qgsvectorlayereditutils.sip b/python/core/qgsvectorlayereditutils.sip
@@ -15,6 +15,12 @@ class QgsVectorLayerEditUtils
      */
     bool insertVertex( double x, double y, QgsFeatureId atFeatureId, int beforeVertex );
 
+    /** Insert a new vertex before the given vertex number,
+     *  in the given ring, item (first number is index 0), and feature
+     *  Not meaningful for Point geometries
+     */
+    bool insertVertex( const QgsPointV2& point, QgsFeatureId atFeatureId, int beforeVertex );
+
     /** Moves the vertex at the given position number,
      *  ring and item (first number is index 0), and feature
      *  to the given coordinates
diff --git a/python/gui/qgsmaptooledit.sip b/python/gui/qgsmaptooledit.sip
@@ -27,6 +27,7 @@ class QgsMapToolEdit: QgsMapTool
 
     virtual Flags flags() const;
 
+    double defaultZValue() const;
   protected:
 
     /** Creates a rubber band with the color/line width from
diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -630,7 +630,9 @@ void QgsMapToolNodeTool::canvasDoubleClickEvent( QgsMapMouseEvent* e )
   vlayer->beginEditCommand( tr( "Inserted vertex" ) );
 
   // add vertex
-  vlayer->insertVertex( layerCoords.x(), layerCoords.y(), mSelectedFeature->featureId(), snapResults.first().afterVertexNr );
+  QgsPointV2 p( layerCoords.x(), layerCoords.y() );
+  p.addZValue( defaultZValue() );
+  vlayer->insertVertex( p, mSelectedFeature->featureId(), snapResults.first().afterVertexNr );
 
   if ( topologicalEditing )
   {
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -146,7 +146,7 @@ void QgsMapToolAddFeature::cadCanvasReleaseEvent( QgsMapMouseEvent* e )
       }
       else if ( layerWKBType == QgsWkbTypes::Point25D )
       {
-        g = QgsGeometry( new QgsPointV2( QgsWkbTypes::PointZ, savePoint.x(), savePoint.y(), 0.0 ) );
+        g = QgsGeometry( new QgsPointV2( QgsWkbTypes::PointZ, savePoint.x(), savePoint.y(), defaultZValue() ) );
       }
       else if ( layerWKBType == QgsWkbTypes::MultiPoint )
       {
@@ -155,7 +155,7 @@ void QgsMapToolAddFeature::cadCanvasReleaseEvent( QgsMapMouseEvent* e )
       else if ( layerWKBType == QgsWkbTypes::MultiPoint25D )
       {
         QgsMultiPointV2* mp = new QgsMultiPointV2();
-        mp->addGeometry( new QgsPointV2( QgsWkbTypes::PointZ, savePoint.x(), savePoint.y(), 0.0 ) );
+        mp->addGeometry( new QgsPointV2( QgsWkbTypes::PointZ, savePoint.x(), savePoint.y(), defaultZValue() ) );
         g = QgsGeometry( mp );
       }
       else
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -856,6 +856,10 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl )
 
   mLineGhostCheckBox->setChecked( mSettings->value( QStringLiteral( "/qgis/digitizing/line_ghost" ), false ).toBool() );
 
+  mDefaultZValueSpinBox->setValue(
+    mSettings->value( QStringLiteral( "/qgis/digitizing/default_z_value" ), Qgis::DEFAULT_Z_COORDINATE ).toDouble()
+  );
+
   //default snap mode
   mSnappingEnabledDefault->setChecked( mSettings->value( QStringLiteral( "/qgis/digitizing/default_snap_enabled" ),  false ).toBool() );
   mDefaultSnapModeComboBox->addItem( tr( "Vertex" ), QgsSnappingConfig::Vertex );
@@ -1362,6 +1366,8 @@ void QgsOptions::saveOptions()
 
   settings.setValue( QStringLiteral( "/qgis/digitizing/line_ghost" ), mLineGhostCheckBox->isChecked() );
 
+  mSettings->setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), mDefaultZValueSpinBox->value() );
+
   //default snap mode
   mSettings->setValue( QStringLiteral( "/qgis/digitizing/default_snap_enabled" ), mSnappingEnabledDefault->isChecked() );
   mSettings->setValue( QStringLiteral( "/qgis/digitizing/default_snap_type" ), mDefaultSnapModeComboBox->currentData().toInt() );
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -519,6 +519,32 @@ bool QgsGeometry::insertVertex( double x, double y, int beforeVertex )
   return d->geometry->insertVertex( id, QgsPointV2( x, y ) );
 }
 
+bool QgsGeometry::insertVertex( const QgsPointV2& point, int beforeVertex )
+{
+  if ( !d->geometry )
+  {
+    return false;
+  }
+
+  //maintain compatibility with < 2.10 API
+  if ( QgsWkbTypes::flatType( d->geometry->wkbType() ) == QgsWkbTypes::MultiPoint )
+  {
+    detach( true );
+    //insert geometry instead of point
+    return static_cast< QgsGeometryCollection* >( d->geometry )->insertGeometry( new QgsPointV2( point ), beforeVertex );
+  }
+
+  QgsVertexId id;
+  if ( !vertexIdFromVertexNr( beforeVertex, id ) )
+  {
+    return false;
+  }
+
+  detach( true );
+
+  return d->geometry->insertVertex( id, point );
+}
+
 QgsPoint QgsGeometry::vertexAt( int atVertex ) const
 {
   if ( !d->geometry )
diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
@@ -273,6 +273,19 @@ class CORE_EXPORT QgsGeometry
      */
     bool insertVertex( double x, double y, int beforeVertex );
 
+    /** Insert a new vertex before the given vertex index,
+     *  ring and item (first number is index 0)
+     *  If the requested vertex number (beforeVertex.back()) is greater
+     *  than the last actual vertex on the requested ring and item,
+     *  it is assumed that the vertex is to be appended instead of inserted.
+     *  Returns false if atVertex does not correspond to a valid vertex
+     *  on this geometry (including if this geometry is a Point).
+     *  It is up to the caller to distinguish between
+     *  these error conditions.  (Or maybe we add another method to this
+     *  object to help make the distinction?)
+     */
+    bool insertVertex( const QgsPointV2& point, int beforeVertex );
+
     /** Moves the vertex at the given position number
      *  and item (first number is index 0)
      *  to the given coordinates.
diff --git a/src/core/qgis.cpp b/src/core/qgis.cpp
@@ -83,6 +83,7 @@ const double Qgis::DEFAULT_HIGHLIGHT_MIN_WIDTH_MM = 1.0;
 
 const double Qgis::SCALE_PRECISION = 0.9999999999;
 
+const double Qgis::DEFAULT_Z_COORDINATE = 0.0;
 
 double qgsPermissiveToDouble( QString string, bool &ok )
 {
diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -114,6 +114,11 @@ class CORE_EXPORT Qgis
      * @note added in 2.15*/
     static const double SCALE_PRECISION;
 
+    /** Default Z coordinate value for 2.5d geometry
+     *  This value have to be assigned to the Z coordinate for the new 2.5d geometry vertex.
+     *  @note added in 3.0 */
+    static const double DEFAULT_Z_COORDINATE;
+
 };
 
 // hack to workaround warnings when casting void pointers
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -1027,6 +1027,19 @@ bool QgsVectorLayer::insertVertex( double x, double y, QgsFeatureId atFeatureId,
 }
 
 
+bool QgsVectorLayer::insertVertex( const QgsPointV2& point, QgsFeatureId atFeatureId, int beforeVertex )
+{
+  if ( !mValid || !mEditBuffer || !mDataProvider )
+    return false;
+
+  QgsVectorLayerEditUtils utils( this );
+  bool result = utils.insertVertex( point, atFeatureId, beforeVertex );
+  if ( result )
+    updateExtents();
+  return result;
+}
+
+
 bool QgsVectorLayer::moveVertex( double x, double y, QgsFeatureId atFeatureId, int atVertex )
 {
   if ( !mValid || !mEditBuffer || !mDataProvider )
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -901,6 +901,12 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      */
     bool insertVertex( double x, double y, QgsFeatureId atFeatureId, int beforeVertex );
 
+    /** Insert a new vertex before the given vertex number,
+     *  in the given ring, item (first number is index 0), and feature
+     *  Not meaningful for Point geometries
+     */
+    bool insertVertex( const QgsPointV2& point, QgsFeatureId atFeatureId, int beforeVertex );
+
     /** Moves the vertex at the given position number,
      *  ring and item (first number is index 0), and feature
      *  to the given coordinates
diff --git a/src/core/qgsvectorlayereditutils.cpp b/src/core/qgsvectorlayereditutils.cpp
@@ -56,6 +56,27 @@ bool QgsVectorLayerEditUtils::insertVertex( double x, double y, QgsFeatureId atF
   return true;
 }
 
+bool QgsVectorLayerEditUtils::insertVertex( const QgsPointV2& point, QgsFeatureId atFeatureId, int beforeVertex )
+{
+  if ( !L->hasGeometryType() )
+    return false;
+
+  QgsGeometry geometry;
+  if ( !cache()->geometry( atFeatureId, geometry ) )
+  {
+    // it's not in cache: let's fetch it from layer
+    QgsFeature f;
+    if ( !L->getFeatures( QgsFeatureRequest().setFilterFid( atFeatureId ).setSubsetOfAttributes( QgsAttributeList() ) ).nextFeature( f ) || !f.hasGeometry() )
+      return false; // geometry not found
+
+    geometry = f.geometry();
+  }
+
+  geometry.insertVertex( point, beforeVertex );
+
+  L->editBuffer()->changeGeometry( atFeatureId, geometry );
+  return true;
+}
 
 bool QgsVectorLayerEditUtils::moveVertex( double x, double y, QgsFeatureId atFeatureId, int atVertex )
 {
diff --git a/src/core/qgsvectorlayereditutils.h b/src/core/qgsvectorlayereditutils.h
@@ -42,6 +42,12 @@ class CORE_EXPORT QgsVectorLayerEditUtils
      */
     bool insertVertex( double x, double y, QgsFeatureId atFeatureId, int beforeVertex );
 
+    /** Insert a new vertex before the given vertex number,
+     *  in the given ring, item (first number is index 0), and feature
+     *  Not meaningful for Point geometries
+     */
+    bool insertVertex( const QgsPointV2& point, QgsFeatureId atFeatureId, int beforeVertex );
+
     /** Moves the vertex at the given position number,
      *  ring and item (first number is index 0), and feature
      *  to the given coordinates
diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp
@@ -332,7 +332,7 @@ int QgsMapToolCapture::nextPoint( const QgsPointV2& mapPoint, QgsPointV2& layerP
     QgsPoint mapP( mapPoint.x(), mapPoint.y() );  //#spellok
     layerPoint = QgsPointV2( toLayerCoordinates( vlayer, mapP ) ); //transform snapped point back to layer crs  //#spellok
     if ( QgsWkbTypes::hasZ( vlayer->wkbType() ) )
-      layerPoint.addZValue( 0.0 );
+      layerPoint.addZValue( defaultZValue() );
     if ( QgsWkbTypes::hasM( vlayer->wkbType() ) )
       layerPoint.addMValue( 0.0 );
   }
diff --git a/src/gui/qgsmaptooledit.cpp b/src/gui/qgsmaptooledit.cpp
@@ -29,6 +29,11 @@ QgsMapToolEdit::QgsMapToolEdit( QgsMapCanvas* canvas )
 {
 }
 
+double QgsMapToolEdit::defaultZValue() const
+{
+  return QSettings().value( QStringLiteral( "/qgis/digitizing/default_z_value" ), Qgis::DEFAULT_Z_COORDINATE ).toDouble();
+}
+
 QgsRubberBand* QgsMapToolEdit::createRubberBand( QgsWkbTypes::GeometryType geometryType, bool alternativeBand )
 {
   QSettings settings;
diff --git a/src/gui/qgsmaptooledit.h b/src/gui/qgsmaptooledit.h
@@ -37,6 +37,12 @@ class GUI_EXPORT QgsMapToolEdit: public QgsMapTool
 
     virtual Flags flags() const override { return QgsMapTool::EditTool; }
 
+    /**
+     * Return default Z value
+     * Use for set Z coordinate to new vertex for 2.5d geometries
+     */
+    double defaultZValue() const;
+
   protected:
 
     /** Creates a rubber band with the color/line width from
diff --git a/src/gui/qgsnewmemorylayerdialog.cpp b/src/gui/qgsnewmemorylayerdialog.cpp
@@ -40,33 +40,9 @@ QgsVectorLayer *QgsNewMemoryLayerDialog::runAndCreateLayer( QWidget *parent )
 
   QgsWkbTypes::Type geometrytype = dialog.selectedType();
 
-  QString geomType;
-  switch ( geometrytype )
-  {
-    case QgsWkbTypes::Point:
-      geomType = QStringLiteral( "point" );
-      break;
-    case QgsWkbTypes::LineString:
-      geomType = QStringLiteral( "linestring" );
-      break;
-    case QgsWkbTypes::Polygon:
-      geomType = QStringLiteral( "polygon" );
-      break;
-    case QgsWkbTypes::MultiPoint:
-      geomType = QStringLiteral( "multipoint" );
-      break;
-    case QgsWkbTypes::MultiLineString:
-      geomType = QStringLiteral( "multilinestring" );
-      break;
-    case QgsWkbTypes::MultiPolygon:
-      geomType = QStringLiteral( "multipolygon" );
-      break;
-    case QgsWkbTypes::NoGeometry:
-      geomType = QStringLiteral( "none" );
-      break;
-    default:
-      geomType = QStringLiteral( "point" );
-  }
+  QString geomType = QgsWkbTypes::displayString( geometrytype );
+  if ( geomType.isNull() )
+    geomType = "none";
 
   QString layerProperties = QStringLiteral( "%1?" ).arg( geomType );
   if ( QgsWkbTypes::NoGeometry != geometrytype )
@@ -103,35 +79,40 @@ QgsNewMemoryLayerDialog::~QgsNewMemoryLayerDialog()
 
 QgsWkbTypes::Type QgsNewMemoryLayerDialog::selectedType() const
 {
+  QgsWkbTypes::Type wkbType = QgsWkbTypes::Unknown;
   if ( !buttonGroupGeometry->isChecked() )
   {
-    return QgsWkbTypes::NoGeometry;
+    wkbType = QgsWkbTypes::NoGeometry;
   }
   else if ( mPointRadioButton->isChecked() )
   {
-    return QgsWkbTypes::Point;
+    wkbType = QgsWkbTypes::Point;
   }
   else if ( mLineRadioButton->isChecked() )
   {
-    return QgsWkbTypes::LineString;
+    wkbType = QgsWkbTypes::LineString;
   }
   else if ( mPolygonRadioButton->isChecked() )
   {
-    return QgsWkbTypes::Polygon;
+    wkbType = QgsWkbTypes::Polygon;
   }
   else if ( mMultiPointRadioButton->isChecked() )
   {
-    return QgsWkbTypes::MultiPoint;
+    wkbType = QgsWkbTypes::MultiPoint;
   }
   else if ( mMultiLineRadioButton->isChecked() )
   {
-    return QgsWkbTypes::MultiLineString;
+    wkbType = QgsWkbTypes::MultiLineString;
   }
   else if ( mMultiPolygonRadioButton->isChecked() )
   {
-    return QgsWkbTypes::MultiPolygon;
+    wkbType = QgsWkbTypes::MultiPolygon;
   }
-  return QgsWkbTypes::Unknown;
+
+  if ( mGeometryWithZCheckBox->isChecked() && wkbType != QgsWkbTypes::Unknown && wkbType != QgsWkbTypes::NoGeometry )
+    wkbType = QgsWkbTypes::zmType( wkbType, true, true );
+
+  return wkbType;
 }
 
 QgsCoordinateReferenceSystem QgsNewMemoryLayerDialog::crs() const
diff --git a/src/gui/qgsnewvectorlayerdialog.cpp b/src/gui/qgsnewvectorlayerdialog.cpp
@@ -145,19 +145,24 @@ void QgsNewVectorLayerDialog::on_mTypeBox_currentIndexChanged( int index )
 
 QgsWkbTypes::Type QgsNewVectorLayerDialog::selectedType() const
 {
+  QgsWkbTypes::Type wkbType = QgsWkbTypes::Unknown;
   if ( mPointRadioButton->isChecked() )
   {
-    return QgsWkbTypes::Point;
+    wkbType = QgsWkbTypes::Point;
   }
   else if ( mLineRadioButton->isChecked() )
   {
-    return QgsWkbTypes::LineString;
+    wkbType = QgsWkbTypes::LineString;
   }
   else if ( mPolygonRadioButton->isChecked() )
   {
-    return QgsWkbTypes::Polygon;
+    wkbType = QgsWkbTypes::Polygon;
   }
-  return QgsWkbTypes::Unknown;
+
+  if ( mGeometryWithZCheckBox->isChecked() && wkbType != QgsWkbTypes::Unknown )
+    wkbType = QgsWkbTypes::to25D( wkbType );
+
+  return wkbType;
 }
 
 int QgsNewVectorLayerDialog::selectedCrsId() const
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
diff --git a/src/ui/qgsnewmemorylayerdialogbase.ui b/src/ui/qgsnewmemorylayerdialogbase.ui
diff --git a/src/ui/qgsnewvectorlayerdialogbase.ui b/src/ui/qgsnewvectorlayerdialogbase.ui
diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
diff --git a/tests/src/gui/CMakeLists.txt b/tests/src/gui/CMakeLists.txt
diff --git a/tests/src/gui/testqgsmaptooledit.cpp b/tests/src/gui/testqgsmaptooledit.cpp

Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,9 @@ void QgsMapToolNodeTool::canvasDoubleClickEvent( QgsMapMouseEvent* e )`
`630`	`630`	`vlayer->beginEditCommand( tr( "Inserted vertex" ) );`
`631`	`631`
`632`	`632`	`// add vertex`
`633`		`- vlayer->insertVertex( layerCoords.x(), layerCoords.y(), mSelectedFeature->featureId(), snapResults.first().afterVertexNr );`
	`633`	`+ QgsPointV2 p( layerCoords.x(), layerCoords.y() );`
	`634`	`+ p.addZValue( defaultZValue() );`
	`635`	`+ vlayer->insertVertex( p, mSelectedFeature->featureId(), snapResults.first().afterVertexNr );`
`634`	`636`
`635`	`637`	`if ( topologicalEditing )`
`636`	`638`	`{`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ void QgsMapToolAddFeature::cadCanvasReleaseEvent( QgsMapMouseEvent* e )`
`146`	`146`	`}`
`147`	`147`	`else if ( layerWKBType == QgsWkbTypes::Point25D )`
`148`	`148`	`{`
`149`		`- g = QgsGeometry( new QgsPointV2( QgsWkbTypes::PointZ, savePoint.x(), savePoint.y(), 0.0 ) );`
	`149`	`+ g = QgsGeometry( new QgsPointV2( QgsWkbTypes::PointZ, savePoint.x(), savePoint.y(), defaultZValue() ) );`
`150`	`150`	`}`
`151`	`151`	`else if ( layerWKBType == QgsWkbTypes::MultiPoint )`
`152`	`152`	`{`
`@@ -155,7 +155,7 @@ void QgsMapToolAddFeature::cadCanvasReleaseEvent( QgsMapMouseEvent* e )`
`155`	`155`	`else if ( layerWKBType == QgsWkbTypes::MultiPoint25D )`
`156`	`156`	`{`
`157`	`157`	`QgsMultiPointV2* mp = new QgsMultiPointV2();`
`158`		`- mp->addGeometry( new QgsPointV2( QgsWkbTypes::PointZ, savePoint.x(), savePoint.y(), 0.0 ) );`
	`158`	`+ mp->addGeometry( new QgsPointV2( QgsWkbTypes::PointZ, savePoint.x(), savePoint.y(), defaultZValue() ) );`
`159`	`159`	`g = QgsGeometry( mp );`
`160`	`160`	`}`
`161`	`161`	`else`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ const double Qgis::DEFAULT_HIGHLIGHT_MIN_WIDTH_MM = 1.0;`
`83`	`83`
`84`	`84`	`const double Qgis::SCALE_PRECISION = 0.9999999999;`
`85`	`85`
	`86`	`+const double Qgis::DEFAULT_Z_COORDINATE = 0.0;`
`86`	`87`
`87`	`88`	`double qgsPermissiveToDouble( QString string, bool &ok )`
`88`	`89`	`{`