Fix vertex editor and fill ring editor not returning multi geometry w…

…hen needed
opengisch · May 4, 2024 · 394fc3d · 394fc3d
1 parent c0771bd
commit 394fc3d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/src/core/utils/geometryutils.cpp b/src/core/utils/geometryutils.cpp
@@ -28,21 +28,31 @@ GeometryUtils::GeometryUtils( QObject *parent )
 {
 }
 
-QgsGeometry GeometryUtils::polygonFromRubberband( RubberbandModel *rubberBandModel, const QgsCoordinateReferenceSystem &crs )
+QgsGeometry GeometryUtils::polygonFromRubberband( RubberbandModel *rubberBandModel, const QgsCoordinateReferenceSystem &crs, Qgis::WkbType wkbType )
 {
   QgsPointSequence ring = rubberBandModel->pointSequence( crs, Qgis::WkbType::Point, true );
   QgsLineString ext( ring );
   std::unique_ptr<QgsPolygon> polygon = std::make_unique<QgsPolygon>();
   polygon->setExteriorRing( ext.clone() );
+
   QgsGeometry g( std::move( polygon ) );
+  if ( QgsWkbTypes::isMultiType( wkbType ) )
+  {
+    g.convertToMultiType();
+  }
   return g;
 }
 
-QgsGeometry GeometryUtils::lineFromRubberband( RubberbandModel *rubberBandModel, const QgsCoordinateReferenceSystem &crs )
+QgsGeometry GeometryUtils::lineFromRubberband( RubberbandModel *rubberBandModel, const QgsCoordinateReferenceSystem &crs, Qgis::WkbType wkbType )
 {
   QgsPointSequence points = rubberBandModel->pointSequence( crs, Qgis::WkbType::Point, false );
   std::unique_ptr<QgsLineString> line = std::make_unique<QgsLineString>( points );
+
   QgsGeometry g( std::move( line ) );
+  if ( QgsWkbTypes::isMultiType( wkbType ) )
+  {
+    g.convertToMultiType();
+  }
   return g;
 }
 

diff --git a/src/core/utils/geometryutils.h b/src/core/utils/geometryutils.h
@@ -59,10 +59,10 @@ class QFIELD_CORE_EXPORT GeometryUtils : public QObject
     explicit GeometryUtils( QObject *parent = nullptr );
 
     //! Returns a QgsGeometry with a polygon by using the point sequence in the rubberband model.
-    static Q_INVOKABLE QgsGeometry polygonFromRubberband( RubberbandModel *rubberBandModel, const QgsCoordinateReferenceSystem &crs );
+    static Q_INVOKABLE QgsGeometry polygonFromRubberband( RubberbandModel *rubberBandModel, const QgsCoordinateReferenceSystem &crs, Qgis::WkbType wkbType = Qgis::WkbType::Unknown );
 
     //! Returns a QgsGeometry with a line by using the point sequence in the rubberband model.
-    static Q_INVOKABLE QgsGeometry lineFromRubberband( RubberbandModel *rubberBandModel, const QgsCoordinateReferenceSystem &crs );
+    static Q_INVOKABLE QgsGeometry lineFromRubberband( RubberbandModel *rubberBandModel, const QgsCoordinateReferenceSystem &crs, Qgis::WkbType wkbType = Qgis::WkbType::Unknown );
 
     //! Creates a variable width buffer polygon using M values from a rubberband model
     static Q_INVOKABLE QgsGeometry variableWidthBufferByMFromRubberband( RubberbandModel *rubberBandModel, const QgsCoordinateReferenceSystem &crs );

diff --git a/src/core/vertexmodel.cpp b/src/core/vertexmodel.cpp
@@ -469,7 +469,14 @@ QgsGeometry VertexModel::geometry() const
   }
 
   if ( mTransform.isValid() )
+  {
     geometry.transform( mTransform, Qgis::TransformDirection::Reverse );
+  }
+
+  if ( QgsWkbTypes::isMultiType( mGeometryWkbType ) )
+  {
+    geometry.convertToMultiType();
+  }
 
   return geometry;
 }

diff --git a/src/qml/geometryeditors/FillRing.qml b/src/qml/geometryeditors/FillRing.qml
@@ -143,7 +143,7 @@ VisibilityFadingRow {
 
   function fillWithPolygon()
   {
-    var polygonGeometry = GeometryUtils.polygonFromRubberband(drawPolygonToolbar.rubberbandModel, featureModel.currentLayer.crs)
+    var polygonGeometry = GeometryUtils.polygonFromRubberband(drawPolygonToolbar.rubberbandModel, featureModel.currentLayer.crs, featureModel.currentLayer.wkbType())
     var feature = FeatureUtils.createBlankFeature(featureModel.currentLayer.fields, polygonGeometry)
 
     // Show form