Merge pull request #3045 from mhugent/convert_geometry_2

Convert geometry 2

python/core/geometry/qgsabstractgeometryv2.sip

@@ -306,6 +306,12 @@ class QgsAbstractGeometryV2
      */
     virtual QgsAbstractGeometryV2* segmentize() const /Factory/;
 
+    /** Returns the geometry converted to the more generic curve type.
+        E.g. QgsLineStringV2 -> QgsCompoundCurveV2, QgsPolygonV2 -> QgsCurvePolygonV2,
+        QgsMultiLineStringV2 -> QgsMultiCurveV2, QgsMultiPolygonV2 -> QgsMultiSurfaceV2
+        @return the converted geometry. Caller takes ownership*/
+    virtual QgsAbstractGeometryV2* toCurveType() const /Factory/;
+
     /** Returns approximate angle at a vertex. This is usually the average angle between adjacent
      * segments, and can be pictured as the orientation of a line following the curvature of the
      * geometry at the specified vertex.

python/core/geometry/qgslinestringv2.sip

@@ -106,6 +106,10 @@ class QgsLineStringV2: public QgsCurveV2
      */
     QPolygonF asQPolygonF() const;
 
+    /** Returns the geometry converted to the more generic curve type QgsCompoundCurveV2
+        @return the converted geometry. Caller takes ownership*/
+    QgsAbstractGeometryV2* toCurveType() const /Factory/;
+
     //reimplemented methods
 
     virtual QString geometryType() const;

python/core/geometry/qgsmultilinestringv2.sip

@@ -20,6 +20,10 @@ class QgsMultiLineStringV2: public QgsMultiCurveV2
     /** Adds a geometry and takes ownership. Returns true in case of success*/
     virtual bool addGeometry( QgsAbstractGeometryV2* g );
 
+    /** Returns the geometry converted to the more generic curve type QgsMultiCurveV2
+    @return the converted geometry. Caller takes ownership*/
+    QgsAbstractGeometryV2* toCurveType() const /Factory/;
+
   protected:
 
     virtual bool wktOmitChildType() const;

python/core/geometry/qgsmultipolygonv2.sip

@@ -20,6 +20,10 @@ class QgsMultiPolygonV2: public QgsMultiSurfaceV2
     /** Adds a geometry and takes ownership. Returns true in case of success*/
     virtual bool addGeometry( QgsAbstractGeometryV2* g );
 
+    /** Returns the geometry converted to the more generic curve type QgsMultiSurfaceV2
+    @return the converted geometry. Caller takes ownership*/
+    QgsAbstractGeometryV2* toCurveType() const /Factory/;
+
   protected:
 
     virtual bool wktOmitChildType() const;

python/core/geometry/qgspolygonv2.sip

@@ -26,6 +26,10 @@ class QgsPolygonV2: public QgsCurvePolygonV2
 
     QgsPolygonV2* surfaceToPolygon() const;
 
+    /** Returns the geometry converted to the more generic curve type QgsCurvePolygonV2
+     @return the converted geometry. Caller takes ownership*/
+    QgsAbstractGeometryV2* toCurveType() const /Factory/;
+
     void addInteriorRing( QgsCurveV2* ring /Transfer/ );
     //overridden to handle LineString25D rings
     virtual void setExteriorRing( QgsCurveV2* ring /Transfer/ );

python/core/qgsvectordataprovider.sip

@@ -361,4 +361,8 @@ class QgsVectorDataProvider : QgsDataProvider
     void fillMinMaxCache();
 
     void pushError( const QString& msg );
+
+    /** Converts the geometry to the provider type if possible / necessary
+    @return the converted geometry or 0 if no conversion was necessary or possible*/
+    QgsGeometry* convertToProviderType( const QgsGeometry* geom ) const /Factory/;
 };

src/core/geometry/qgsabstractgeometryv2.h

@@ -291,6 +291,12 @@ class CORE_EXPORT QgsAbstractGeometryV2
      */
     virtual QgsAbstractGeometryV2* segmentize() const { return clone(); }
 
+    /** Returns the geometry converted to the more generic curve type.
+        E.g. QgsLineStringV2 -> QgsCompoundCurveV2, QgsPolygonV2 -> QgsCurvePolygonV2,
+        QgsMultiLineStringV2 -> QgsMultiCurveV2, QgsMultiPolygonV2 -> QgsMultiSurfaceV2
+        @return the converted geometry. Caller takes ownership*/
+    virtual QgsAbstractGeometryV2* toCurveType() const { return 0; }
+
     /** Returns approximate angle at a vertex. This is usually the average angle between adjacent
      * segments, and can be pictured as the orientation of a line following the curvature of the
      * geometry at the specified vertex.

src/core/geometry/qgscompoundcurvev2.cpp

@@ -390,6 +390,15 @@ void QgsCompoundCurveV2::addCurve( QgsCurveV2* c )
     {
       setZMTypeFromSubGeometry( c, QgsWKBTypes::CompoundCurve );
     }
+
+    if ( QgsWKBTypes::hasZ( mWkbType ) && !QgsWKBTypes::hasZ( c->wkbType() ) )
+    {
+      c->addZValue();
+    }
+    if ( QgsWKBTypes::hasM( mWkbType ) && !QgsWKBTypes::hasM( c->wkbType() ) )
+    {
+      c->addMValue();
+    }
     clearCache();
   }
 }

src/core/geometry/qgsgeometry.cpp

@@ -132,6 +132,11 @@ QgsAbstractGeometryV2* QgsGeometry::geometry() const
 
 void QgsGeometry::setGeometry( QgsAbstractGeometryV2* geometry )
 {
+  if ( d->geometry == geometry )
+  {
+    return;
+  }
+
   detach( false );
   if ( d->geometry )
   {

src/core/geometry/qgslinestringv2.cpp

@@ -17,6 +17,7 @@
 
 #include "qgslinestringv2.h"
 #include "qgsapplication.h"
+#include "qgscompoundcurvev2.h"
 #include "qgscoordinatetransform.h"
 #include "qgsgeometryutils.h"
 #include "qgsmaptopixel.h"
@@ -583,6 +584,13 @@ QPolygonF QgsLineStringV2::asQPolygonF() const
   return points;
 }
 
+QgsAbstractGeometryV2* QgsLineStringV2::toCurveType() const
+{
+  QgsCompoundCurveV2* compoundCurve = new QgsCompoundCurveV2();
+  compoundCurve->addCurve( clone() );
+  return compoundCurve;
+}
+
 /***************************************************************************
  * This class is considered CRITICAL and any change MUST be accompanied with
  * full unit tests.

src/core/geometry/qgslinestringv2.h

@@ -132,6 +132,10 @@ class CORE_EXPORT QgsLineStringV2: public QgsCurveV2
      */
     QPolygonF asQPolygonF() const;
 
+    /** Returns the geometry converted to the more generic curve type QgsCompoundCurveV2
+        @return the converted geometry. Caller takes ownership*/
+    QgsAbstractGeometryV2* toCurveType() const override;
+
     //reimplemented methods
 
     virtual QString geometryType() const override { return "LineString"; }

src/core/geometry/qgsmultilinestringv2.cpp

@@ -20,6 +20,7 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgscompoundcurvev2.h"
 #include "qgsgeometryutils.h"
 #include "qgslinestringv2.h"
+#include "qgsmulticurvev2.h"
 
 QgsMultiLineStringV2* QgsMultiLineStringV2::clone() const
 {
@@ -101,3 +102,13 @@ bool QgsMultiLineStringV2::addGeometry( QgsAbstractGeometryV2* g )
   setZMTypeFromSubGeometry( g, QgsWKBTypes::MultiLineString );
   return QgsGeometryCollectionV2::addGeometry( g );
 }
+
+QgsAbstractGeometryV2* QgsMultiLineStringV2::toCurveType() const
+{
+  QgsMultiCurveV2* multiCurve = new QgsMultiCurveV2();
+  for ( int i = 0; i < mGeometries.size(); ++i )
+  {
+    multiCurve->addGeometry( mGeometries.at( i )->clone() );
+  }
+  return multiCurve;
+}

src/core/geometry/qgsmultilinestringv2.h

@@ -42,6 +42,10 @@ class CORE_EXPORT QgsMultiLineStringV2: public QgsMultiCurveV2
     /** Adds a geometry and takes ownership. Returns true in case of success*/
     virtual bool addGeometry( QgsAbstractGeometryV2* g ) override;
 
+    /** Returns the geometry converted to the more generic curve type QgsMultiCurveV2
+    @return the converted geometry. Caller takes ownership*/
+    QgsAbstractGeometryV2* toCurveType() const override;
+
   protected:
 
     virtual bool wktOmitChildType() const override { return true; }

src/core/geometry/qgsmultipolygonv2.cpp

@@ -117,3 +117,13 @@ bool QgsMultiPolygonV2::addGeometry( QgsAbstractGeometryV2* g )
   setZMTypeFromSubGeometry( g, QgsWKBTypes::MultiPolygon );
   return QgsGeometryCollectionV2::addGeometry( g );
 }
+
+QgsAbstractGeometryV2* QgsMultiPolygonV2::toCurveType() const
+{
+  QgsMultiSurfaceV2* multiSurface = new QgsMultiSurfaceV2();
+  for ( int i = 0; i < mGeometries.size(); ++i )
+  {
+    multiSurface->addGeometry( mGeometries.at( i )->clone() );
+  }
+  return multiSurface;
+}

src/core/geometry/qgsmultipolygonv2.h

@@ -43,6 +43,10 @@ class CORE_EXPORT QgsMultiPolygonV2: public QgsMultiSurfaceV2
     /** Adds a geometry and takes ownership. Returns true in case of success*/
     virtual bool addGeometry( QgsAbstractGeometryV2* g ) override;
 
+    /** Returns the geometry converted to the more generic curve type QgsMultiSurfaceV2
+    @return the converted geometry. Caller takes ownership*/
+    QgsAbstractGeometryV2* toCurveType() const override;
+
   protected:
 
     virtual bool wktOmitChildType() const override { return true; }

src/core/geometry/qgspolygonv2.cpp

@@ -240,3 +240,15 @@ QgsPolygonV2* QgsPolygonV2::surfaceToPolygon() const
 {
   return clone();
 }
+
+QgsAbstractGeometryV2* QgsPolygonV2::toCurveType() const
+{
+  QgsCurvePolygonV2* curvePolygon = new QgsCurvePolygonV2();
+  curvePolygon->setExteriorRing( mExteriorRing->clone() );
+  int nInteriorRings = mInteriorRings.size();
+  for ( int i = 0; i < nInteriorRings; ++i )
+  {
+    curvePolygon->addInteriorRing( mInteriorRings.at( i )->clone() );
+  }
+  return curvePolygon;
+}

src/core/geometry/qgspolygonv2.h

@@ -50,6 +50,10 @@ class CORE_EXPORT QgsPolygonV2: public QgsCurvePolygonV2
 
     QgsPolygonV2* surfaceToPolygon() const override;
 
+    /** Returns the geometry converted to the more generic curve type QgsCurvePolygonV2
+     @return the converted geometry. Caller takes ownership*/
+    QgsAbstractGeometryV2* toCurveType() const override;
+
     void addInteriorRing( QgsCurveV2* ring ) override;
     //overridden to handle LineString25D rings
     virtual void setExteriorRing( QgsCurveV2* ring ) override;

src/core/qgsvectordataprovider.cpp

@@ -21,10 +21,15 @@
 #include <limits>
 
 #include "qgsvectordataprovider.h"
+#include "qgscircularstringv2.h"
+#include "qgscompoundcurvev2.h"
 #include "qgsfeature.h"
 #include "qgsfeatureiterator.h"
 #include "qgsfeaturerequest.h"
 #include "qgsfield.h"
+#include "qgsgeometry.h"
+#include "qgsgeometrycollectionv2.h"
+#include "qgsgeometryfactory.h"
 #include "qgslogger.h"
 #include "qgsmessagelog.h"
 
@@ -572,4 +577,103 @@ QSet<QString> QgsVectorDataProvider::layerDependencies() const
   return QSet<QString>();
 }
 
+QgsGeometry* QgsVectorDataProvider::convertToProviderType( const QgsGeometry* geom ) const
+{
+  if ( !geom )
+  {
+    return 0;
+  }
+
+  QgsAbstractGeometryV2* geometry = geom->geometry();
+  if ( !geometry )
+  {
+    return 0;
+  }
+
+  QgsWKBTypes::Type providerGeomType = QgsWKBTypes::Type( geometryType() );
+
+  //geom is already in the provider geometry type
+  if ( geometry->wkbType() == providerGeomType )
+  {
+    return 0;
+  }
+
+  QgsAbstractGeometryV2* outputGeom = 0;
+
+  //convert compoundcurve to circularstring (possible if compoundcurve consists of one circular string)
+  if ( QgsWKBTypes::flatType( providerGeomType ) == QgsWKBTypes::CircularString && QgsWKBTypes::flatType( geometry->wkbType() ) == QgsWKBTypes::CompoundCurve )
+  {
+    QgsCompoundCurveV2* compoundCurve = static_cast<QgsCompoundCurveV2*>( geometry );
+    if ( compoundCurve )
+    {
+      if ( compoundCurve->nCurves() == 1 )
+      {
+        const QgsCircularStringV2* circularString = dynamic_cast<const QgsCircularStringV2*>( compoundCurve->curveAt( 0 ) );
+        if ( circularString )
+        {
+          outputGeom = circularString->clone();
+        }
+      }
+    }
+  }
+
+  //convert to multitype if necessary
+  if ( QgsWKBTypes::isMultiType( providerGeomType ) && !QgsWKBTypes::isMultiType( geometry->wkbType() ) )
+  {
+    outputGeom = QgsGeometryFactory::geomFromWkbType( providerGeomType );
+    QgsGeometryCollectionV2* geomCollection = dynamic_cast<QgsGeometryCollectionV2*>( outputGeom );
+    if ( geomCollection )
+    {
+      geomCollection->addGeometry( geometry->clone() );
+    }
+  }
+
+  //convert to curved type if necessary
+  if ( !QgsWKBTypes::isCurvedType( geometry->wkbType() ) && QgsWKBTypes::isCurvedType( providerGeomType ) )
+  {
+    QgsAbstractGeometryV2* curveGeom = outputGeom ? outputGeom->toCurveType() : geometry->toCurveType();
+    if ( curveGeom )
+    {
+      delete outputGeom;
+      outputGeom = curveGeom;
+    }
+  }
+
+  //convert to linear type from curved type
+  if ( QgsWKBTypes::isCurvedType( geometry->wkbType() ) && !QgsWKBTypes::isCurvedType( providerGeomType ) )
+  {
+    QgsAbstractGeometryV2* segmentizedGeom = 0;
+    segmentizedGeom = outputGeom ? outputGeom->segmentize() : geometry->segmentize();
+    if ( segmentizedGeom )
+    {
+      delete outputGeom;
+      outputGeom = segmentizedGeom;
+    }
+  }
+
+  //set z/m types
+  if ( QgsWKBTypes::hasZ( providerGeomType ) )
+  {
+    if ( !outputGeom )
+    {
+      outputGeom = geometry->clone();
+    }
+    outputGeom->addZValue();
+  }
+  if ( QgsWKBTypes::hasM( providerGeomType ) )
+  {
+    if ( !outputGeom )
+    {
+      outputGeom = geometry->clone();
+    }
+    outputGeom->addMValue();
+  }
+
+  if ( outputGeom )
+  {
+    return new QgsGeometry( outputGeom );
+  }
+  return 0;
+}
+
 QStringList QgsVectorDataProvider::smEncodings;

src/core/qgsvectordataprovider.h

@@ -436,6 +436,10 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
     /** Old-style mapping of index to name for QgsPalLabeling fix */
     QgsAttrPalIndexNameHash mAttrPalIndexName;
 
+    /** Converts the geometry to the provider type if possible / necessary
+    @return the converted geometry or 0 if no conversion was necessary or possible*/
+    QgsGeometry* convertToProviderType( const QgsGeometry* geom ) const;
+
   private:
     /** Old notation **/
     QMap<QString, QVariant::Type> mOldTypeList;

src/core/qgsvectorlayereditbuffer.cpp

@@ -15,7 +15,13 @@
 #include "qgsvectorlayereditbuffer.h"
 
 #include "qgsgeometry.h"
+#include "qgscurvepolygonv2.h"
+#include "qgscurvev2.h"
+#include "qgsgeometrycollectionv2.h"
+#include "qgsgeometryfactory.h"
+#include "qgsgeometryutils.h"
 #include "qgslogger.h"
+#include "qgspolygonv2.h"
 #include "qgsvectorlayerundocommand.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"

src/core/qgsvectorlayereditbuffer.h

@@ -188,7 +188,6 @@ class CORE_EXPORT QgsVectorLayerEditBuffer : public QObject
 
     /** Changed geometries which are not commited. */
     QgsGeometryMap mChangedGeometries;
-
 };
 
 #endif // QGSVECTORLAYEREDITBUFFER_H

src/providers/postgres/qgspostgresprovider.cpp

@@ -2371,14 +2371,19 @@ void QgsPostgresProvider::appendGeomParam( const QgsGeometry *geom, QStringList
   }
 
   QString param;
-  const unsigned char *buf = geom->asWkb();
+
-  for ( int i = 0; i < geom->wkbSize(); ++i )
+  QgsGeometry* convertedGeom = convertToProviderType( geom );
+  const unsigned char *buf = convertedGeom ? convertedGeom->asWkb() : geom->asWkb();
+  size_t wkbSize = convertedGeom ? convertedGeom->wkbSize() : geom->wkbSize();
+
+  for ( size_t i = 0; i < wkbSize; ++i )
   {
     if ( connectionRO()->useWkbHex() )
       param += QString( "%1" ).arg(( int ) buf[i], 2, 16, QChar( '0' ) );
     else
       param += QString( "\\%1" ).arg(( int ) buf[i], 3, 8, QChar( '0' ) );
   }
+  delete convertedGeom;
   params << param;
 }