QgsAbstractGeometryV2::wkbType always returns a valid type

qgis · Jun 7, 2016 · c07f02d · c07f02d
1 parent fdb28c0
commit c07f02d
Show file tree

Hide file tree

Showing 41 changed files with 111 additions and 64 deletions.
diff --git a/python/core/geometry/qgsabstractgeometryv2.sip b/python/core/geometry/qgsabstractgeometryv2.sip
@@ -114,11 +114,6 @@ class QgsAbstractGeometryV2
      */
     QgsWKBTypes::Type wkbType() const;
 
-    /** Returns the flat WKB type of the geometry class. Corresponds to information obtained from
-     * geometryType().
-     */
-    virtual QgsWKBTypes::Type flatWkbType() const = 0;
-
     /** Returns the WKT type string of the geometry.
      * @see geometryType
      * @see wkbType

diff --git a/python/core/geometry/qgscircularstringv2.sip b/python/core/geometry/qgscircularstringv2.sip
@@ -12,7 +12,6 @@ class QgsCircularStringV2: public QgsCurveV2
     virtual bool operator!=( const QgsCurveV2& other ) const;
 
     virtual QString geometryType() const;
-    virtual QgsWKBTypes::Type flatWkbType() const;
     virtual int dimension() const;
     virtual QgsCircularStringV2* clone() const;
     virtual void clear();

diff --git a/python/core/geometry/qgscompoundcurvev2.sip b/python/core/geometry/qgscompoundcurvev2.sip
@@ -14,7 +14,6 @@ class QgsCompoundCurveV2: public QgsCurveV2
     virtual bool operator!=( const QgsCurveV2& other ) const;
 
     virtual QString geometryType() const;
-    virtual QgsWKBTypes::Type flatWkbType() const;
     virtual int dimension() const;
     virtual QgsCompoundCurveV2* clone() const;
     virtual void clear();

diff --git a/python/core/geometry/qgscurvepolygonv2.sip b/python/core/geometry/qgscurvepolygonv2.sip
@@ -11,7 +11,6 @@ class QgsCurvePolygonV2: public QgsSurfaceV2
     ~QgsCurvePolygonV2();
 
     virtual QString geometryType() const;
-    virtual QgsWKBTypes::Type flatWkbType() const;
     virtual int dimension() const;
     virtual QgsCurvePolygonV2* clone() const;
     void clear();

diff --git a/python/core/geometry/qgsgeometrycollectionv2.sip b/python/core/geometry/qgsgeometrycollectionv2.sip
@@ -29,7 +29,6 @@ class QgsGeometryCollectionV2: public QgsAbstractGeometryV2
     //methods inherited from QgsAbstractGeometry
     virtual int dimension() const;
     virtual QString geometryType() const;
-    virtual QgsWKBTypes::Type flatWkbType() const;
     virtual void clear();
 
     /** Adds a geometry and takes ownership. Returns true in case of success.*/

diff --git a/python/core/geometry/qgslinestringv2.sip b/python/core/geometry/qgslinestringv2.sip
@@ -113,7 +113,6 @@ class QgsLineStringV2: public QgsCurveV2
     //reimplemented methods
 
     virtual QString geometryType() const;
-    virtual QgsWKBTypes::Type flatWkbType() const;
     virtual int dimension() const;
     virtual QgsLineStringV2* clone() const /Factory/;
     virtual void clear();

diff --git a/python/core/geometry/qgsmulticurvev2.sip b/python/core/geometry/qgsmulticurvev2.sip
@@ -6,7 +6,6 @@ class QgsMultiCurveV2: public QgsGeometryCollectionV2
 
   public:
     virtual QString geometryType() const;
-    virtual QgsWKBTypes::Type flatWkbType() const;
     virtual QgsMultiCurveV2* clone() const;
 
     bool fromWkt( const QString& wkt );

diff --git a/python/core/geometry/qgsmultilinestringv2.sip b/python/core/geometry/qgsmultilinestringv2.sip
@@ -6,7 +6,6 @@ class QgsMultiLineStringV2: public QgsMultiCurveV2
 
   public:
     virtual QString geometryType() const;
-    virtual QgsWKBTypes::Type flatWkbType() const;
     virtual QgsMultiLineStringV2* clone() const;
 
     bool fromWkt( const QString& wkt );

diff --git a/python/core/geometry/qgsmultipointv2.sip b/python/core/geometry/qgsmultipointv2.sip
@@ -5,7 +5,6 @@ class QgsMultiPointV2: public QgsGeometryCollectionV2
 %End
   public:
     virtual QString geometryType() const;
-    virtual QgsWKBTypes::Type flatWkbType() const;
     virtual QgsMultiPointV2* clone() const;
 
     bool fromWkt( const QString& wkt );

diff --git a/python/core/geometry/qgsmultipolygonv2.sip b/python/core/geometry/qgsmultipolygonv2.sip
@@ -5,7 +5,6 @@ class QgsMultiPolygonV2: public QgsMultiSurfaceV2
 %End
   public:
     virtual QString geometryType() const;
-    virtual QgsWKBTypes::Type flatWkbType() const;
     virtual QgsMultiPolygonV2* clone() const;
 
     bool fromWkt( const QString& wkt );

diff --git a/python/core/geometry/qgsmultisurfacev2.sip b/python/core/geometry/qgsmultisurfacev2.sip
@@ -5,7 +5,6 @@ class QgsMultiSurfaceV2: public QgsGeometryCollectionV2
 %End
   public:
     virtual QString geometryType() const;
-    virtual QgsWKBTypes::Type flatWkbType() const;
     virtual QgsMultiSurfaceV2* clone() const;
 
     bool fromWkt( const QString& wkt );

diff --git a/python/core/geometry/qgspointv2.sip b/python/core/geometry/qgspointv2.sip
@@ -141,7 +141,6 @@ class QgsPointV2: public QgsAbstractGeometryV2
     //implementation of inherited methods
     virtual QgsRectangle boundingBox() const;
     virtual QString geometryType() const;
-    virtual QgsWKBTypes::Type flatWkbType() const;
     virtual int dimension() const;
     virtual QgsPointV2* clone() const /Factory/;
     void clear();

diff --git a/python/core/geometry/qgspolygonv2.sip b/python/core/geometry/qgspolygonv2.sip
@@ -11,8 +11,8 @@ class QgsPolygonV2: public QgsCurvePolygonV2
     bool operator!=( const QgsPolygonV2& other ) const;
 
     virtual QString geometryType() const;
-    virtual QgsWKBTypes::Type flatWkbType() const;
     virtual QgsPolygonV2* clone() const;
+    void clear();
 
     virtual bool fromWkb( QgsConstWkbPtr wkb );
 

diff --git a/src/core/geometry/qgsabstractgeometryv2.h b/src/core/geometry/qgsabstractgeometryv2.h
@@ -75,23 +75,18 @@ class CORE_EXPORT QgsAbstractGeometryV2
     virtual int dimension() const = 0;
     //virtual int coordDim() const { return mCoordDimension; }
 
-    /** Returns a unique string representing the geometry class type.
+    /** Returns a unique string representing the geometry type.
      * @see wkbType
      * @see wktTypeStr
      */
     virtual QString geometryType() const = 0;
 
-    /** Returns the WKB type of the saved geometry.
+    /** Returns the WKB type of the geometry.
      * @see geometryType
      * @see wktTypeStr
      */
     QgsWKBTypes::Type wkbType() const { return mWkbType; }
 
-    /** Returns the flat WKB type of the geometry class. Corresponds to information obtained from
-     * geometryType().
-     */
-    virtual QgsWKBTypes::Type flatWkbType() const = 0;
-
     /** Returns the WKT type string of the geometry.
      * @see geometryType
      * @see wkbType

diff --git a/src/core/geometry/qgscircularstringv2.cpp b/src/core/geometry/qgscircularstringv2.cpp
@@ -28,7 +28,7 @@
 
 QgsCircularStringV2::QgsCircularStringV2(): QgsCurveV2()
 {
-
+  mWkbType = QgsWKBTypes::CircularString;
 }
 
 QgsCircularStringV2::~QgsCircularStringV2()
@@ -57,11 +57,11 @@ QgsCircularStringV2 *QgsCircularStringV2::clone() const
 
 void QgsCircularStringV2::clear()
 {
+  mWkbType = QgsWKBTypes::CircularString;
   mX.clear();
   mY.clear();
   mZ.clear();
   mM.clear();
-  mWkbType = QgsWKBTypes::Unknown;
   clearCache();
 }
 

diff --git a/src/core/geometry/qgscircularstringv2.h b/src/core/geometry/qgscircularstringv2.h
@@ -37,7 +37,6 @@ class CORE_EXPORT QgsCircularStringV2: public QgsCurveV2
     virtual bool operator!=( const QgsCurveV2& other ) const override;
 
     virtual QString geometryType() const override { return "CircularString"; }
-    virtual QgsWKBTypes::Type flatWkbType() const override { return QgsWKBTypes::CircularString; }
     virtual int dimension() const override { return 1; }
     virtual QgsCircularStringV2* clone() const override;
     virtual void clear() override;

diff --git a/src/core/geometry/qgscompoundcurvev2.cpp b/src/core/geometry/qgscompoundcurvev2.cpp
@@ -27,7 +27,7 @@
 
 QgsCompoundCurveV2::QgsCompoundCurveV2(): QgsCurveV2()
 {
-
+  mWkbType = QgsWKBTypes::CompoundCurve;
 }
 
 QgsCompoundCurveV2::~QgsCompoundCurveV2()
@@ -51,6 +51,7 @@ bool QgsCompoundCurveV2::operator!=( const QgsCurveV2& other ) const
 
 QgsCompoundCurveV2::QgsCompoundCurveV2( const QgsCompoundCurveV2& curve ): QgsCurveV2( curve )
 {
+  mWkbType = QgsWKBTypes::CompoundCurve;
   Q_FOREACH ( const QgsCurveV2* c, curve.mCurves )
   {
     mCurves.append( static_cast<QgsCurveV2*>( c->clone() ) );
@@ -78,9 +79,9 @@ QgsCompoundCurveV2 *QgsCompoundCurveV2::clone() const
 
 void QgsCompoundCurveV2::clear()
 {
+  mWkbType = QgsWKBTypes::CompoundCurve;
   qDeleteAll( mCurves );
   mCurves.clear();
-  mWkbType = QgsWKBTypes::Unknown;
   clearCache();
 }
 

diff --git a/src/core/geometry/qgscompoundcurvev2.h b/src/core/geometry/qgscompoundcurvev2.h
@@ -38,7 +38,6 @@ class CORE_EXPORT QgsCompoundCurveV2: public QgsCurveV2
     virtual bool operator!=( const QgsCurveV2& other ) const override;
 
     virtual QString geometryType() const override { return "CompoundCurve"; }
-    virtual QgsWKBTypes::Type flatWkbType() const override { return QgsWKBTypes::CompoundCurve; }
     virtual int dimension() const override { return 1; }
     virtual QgsCompoundCurveV2* clone() const override;
     virtual void clear() override;

diff --git a/src/core/geometry/qgscurvepolygonv2.cpp b/src/core/geometry/qgscurvepolygonv2.cpp
@@ -28,7 +28,7 @@
 
 QgsCurvePolygonV2::QgsCurvePolygonV2(): QgsSurfaceV2(), mExteriorRing( nullptr )
 {
-
+  mWkbType = QgsWKBTypes::CurvePolygon;
 }
 
 QgsCurvePolygonV2::~QgsCurvePolygonV2()
@@ -40,6 +40,7 @@ QgsCurvePolygonV2::QgsCurvePolygonV2( const QgsCurvePolygonV2& p )
     : QgsSurfaceV2( p )
     , mExteriorRing( nullptr )
 {
+  mWkbType = p.mWkbType;
   if ( p.mExteriorRing )
   {
     mExteriorRing = static_cast<QgsCurveV2*>( p.mExteriorRing->clone() );
@@ -77,11 +78,11 @@ QgsCurvePolygonV2* QgsCurvePolygonV2::clone() const
 
 void QgsCurvePolygonV2::clear()
 {
+  mWkbType = QgsWKBTypes::CurvePolygon;
   delete mExteriorRing;
   mExteriorRing = nullptr;
   qDeleteAll( mInteriorRings );
   mInteriorRings.clear();
-  mWkbType = QgsWKBTypes::Unknown;
   clearCache();
 }
 
@@ -149,7 +150,7 @@ bool QgsCurvePolygonV2::fromWkt( const QString& wkt )
 
   QPair<QgsWKBTypes::Type, QString> parts = QgsGeometryUtils::wktReadBlock( wkt );
 
-  if ( QgsWKBTypes::flatType( parts.first ) != QgsWKBTypes::Polygon )
+  if ( QgsWKBTypes::geometryType( parts.first ) != QgsWKBTypes::PolygonGeometry )
     return false;
 
   mWkbType = parts.first;

diff --git a/src/core/geometry/qgscurvepolygonv2.h b/src/core/geometry/qgscurvepolygonv2.h
@@ -37,7 +37,6 @@ class CORE_EXPORT QgsCurvePolygonV2: public QgsSurfaceV2
     ~QgsCurvePolygonV2();
 
     virtual QString geometryType() const override { return "CurvePolygon"; }
-    virtual QgsWKBTypes::Type flatWkbType() const override { return QgsWKBTypes::CurvePolygon; }
     virtual int dimension() const override { return 2; }
     virtual QgsCurvePolygonV2* clone() const override;
     void clear() override;

diff --git a/src/core/geometry/qgsgeometrycollectionv2.cpp b/src/core/geometry/qgsgeometrycollectionv2.cpp
@@ -72,7 +72,6 @@ void QgsGeometryCollectionV2::clear()
 {
   qDeleteAll( mGeometries );
   mGeometries.clear();
-  mWkbType = QgsWKBTypes::Unknown;
   clearCache(); //set bounding box invalid
 }
 
@@ -491,7 +490,7 @@ bool QgsGeometryCollectionV2::fromCollectionWkt( const QString &wkt, const QList
 
   QPair<QgsWKBTypes::Type, QString> parts = QgsGeometryUtils::wktReadBlock( wkt );
 
-  if ( QgsWKBTypes::flatType( parts.first ) != flatWkbType() )
+  if ( QgsWKBTypes::flatType( parts.first ) != QgsWKBTypes::flatType( wkbType() ) )
     return false;
   mWkbType = parts.first;
 
@@ -504,7 +503,7 @@ bool QgsGeometryCollectionV2::fromCollectionWkt( const QString &wkt, const QList
     bool success = false;
     Q_FOREACH ( const QgsAbstractGeometryV2* geom, subtypes )
     {
-      if ( QgsWKBTypes::flatType( childParts.first ) == geom->flatWkbType() )
+      if ( QgsWKBTypes::flatType( childParts.first ) == QgsWKBTypes::flatType( geom->wkbType() ) )
       {
         mGeometries.append( geom->clone() );
         if ( mGeometries.back()->fromWkt( childWkt ) )

diff --git a/src/core/geometry/qgsgeometrycollectionv2.h b/src/core/geometry/qgsgeometrycollectionv2.h
@@ -53,7 +53,6 @@ class CORE_EXPORT QgsGeometryCollectionV2: public QgsAbstractGeometryV2
     //methods inherited from QgsAbstractGeometry
     virtual int dimension() const override;
     virtual QString geometryType() const override { return "GeometryCollection"; }
-    virtual QgsWKBTypes::Type flatWkbType() const override { return QgsWKBTypes::GeometryCollection; }
     virtual void clear() override;
 
     /** Adds a geometry and takes ownership. Returns true in case of success.*/

diff --git a/src/core/geometry/qgslinestringv2.cpp b/src/core/geometry/qgslinestringv2.cpp
@@ -87,7 +87,7 @@ void QgsLineStringV2::clear()
   mY.clear();
   mZ.clear();
   mM.clear();
-  mWkbType = QgsWKBTypes::Unknown;
+  mWkbType = QgsWKBTypes::LineString;
   clearCache();
 }
 

diff --git a/src/core/geometry/qgslinestringv2.h b/src/core/geometry/qgslinestringv2.h
@@ -139,7 +139,6 @@ class CORE_EXPORT QgsLineStringV2: public QgsCurveV2
     //reimplemented methods
 
     virtual QString geometryType() const override { return "LineString"; }
-    virtual QgsWKBTypes::Type flatWkbType() const override { return QgsWKBTypes::LineString; }
     virtual int dimension() const override { return 1; }
     virtual QgsLineStringV2* clone() const override;
     virtual void clear() override;

diff --git a/src/core/geometry/qgsmulticurvev2.cpp b/src/core/geometry/qgsmulticurvev2.cpp
@@ -21,6 +21,12 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgsgeometryutils.h"
 #include "qgslinestringv2.h"
 
+QgsMultiCurveV2::QgsMultiCurveV2()
+    : QgsGeometryCollectionV2()
+{
+  mWkbType = QgsWKBTypes::MultiCurve;
+}
+
 QgsMultiCurveV2 *QgsMultiCurveV2::clone() const
 {
   return new QgsMultiCurveV2( *this );

diff --git a/src/core/geometry/qgsmulticurvev2.h b/src/core/geometry/qgsmulticurvev2.h
@@ -27,8 +27,8 @@ email                : marco.hugentobler at sourcepole dot com
 class CORE_EXPORT QgsMultiCurveV2: public QgsGeometryCollectionV2
 {
   public:
+    QgsMultiCurveV2();
     virtual QString geometryType() const override { return "MultiCurve"; }
-    virtual QgsWKBTypes::Type flatWkbType() const override { return QgsWKBTypes::MultiCurve; }
     QgsMultiCurveV2* clone() const override;
 
     bool fromWkt( const QString& wkt ) override;

diff --git a/src/core/geometry/qgsmultilinestringv2.cpp b/src/core/geometry/qgsmultilinestringv2.cpp
@@ -22,6 +22,12 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgslinestringv2.h"
 #include "qgsmulticurvev2.h"
 
+QgsMultiLineStringV2::QgsMultiLineStringV2()
+    : QgsMultiCurveV2()
+{
+  mWkbType = QgsWKBTypes::MultiLineString;
+}
+
 QgsMultiLineStringV2* QgsMultiLineStringV2::clone() const
 {
   return new QgsMultiLineStringV2( *this );

diff --git a/src/core/geometry/qgsmultilinestringv2.h b/src/core/geometry/qgsmultilinestringv2.h
@@ -27,8 +27,8 @@ email                : marco.hugentobler at sourcepole dot com
 class CORE_EXPORT QgsMultiLineStringV2: public QgsMultiCurveV2
 {
   public:
+    QgsMultiLineStringV2();
     virtual QString geometryType() const override { return "MultiLineString"; }
-    virtual QgsWKBTypes::Type flatWkbType() const override { return QgsWKBTypes::MultiLineString; }
     QgsMultiLineStringV2* clone() const override;
 
     bool fromWkt( const QString& wkt ) override;

diff --git a/src/core/geometry/qgsmultipointv2.cpp b/src/core/geometry/qgsmultipointv2.cpp
@@ -19,6 +19,12 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgspointv2.h"
 #include "qgswkbptr.h"
 
+QgsMultiPointV2::QgsMultiPointV2()
+    : QgsGeometryCollectionV2()
+{
+  mWkbType = QgsWKBTypes::MultiPoint;
+}
+
 QgsMultiPointV2 *QgsMultiPointV2::clone() const
 {
   return new QgsMultiPointV2( *this );

diff --git a/src/core/geometry/qgsmultipointv2.h b/src/core/geometry/qgsmultipointv2.h
@@ -27,8 +27,8 @@ email                : marco.hugentobler at sourcepole dot com
 class CORE_EXPORT QgsMultiPointV2: public QgsGeometryCollectionV2
 {
   public:
+    QgsMultiPointV2();
     virtual QString geometryType() const override { return "MultiPoint"; }
-    virtual QgsWKBTypes::Type flatWkbType() const override { return QgsWKBTypes::MultiPoint; }
     QgsMultiPointV2* clone() const override;
 
     bool fromWkt( const QString& wkt ) override;

diff --git a/src/core/geometry/qgsmultipolygonv2.cpp b/src/core/geometry/qgsmultipolygonv2.cpp
@@ -21,6 +21,12 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgspolygonv2.h"
 #include "qgscurvepolygonv2.h"
 
+QgsMultiPolygonV2::QgsMultiPolygonV2()
+    : QgsMultiSurfaceV2()
+{
+  mWkbType = QgsWKBTypes::MultiPolygon;
+}
+
 QgsMultiPolygonV2 *QgsMultiPolygonV2::clone() const
 {
   return new QgsMultiPolygonV2( *this );

diff --git a/src/core/geometry/qgsmultipolygonv2.h b/src/core/geometry/qgsmultipolygonv2.h
@@ -27,8 +27,8 @@ email                : marco.hugentobler at sourcepole dot com
 class CORE_EXPORT QgsMultiPolygonV2: public QgsMultiSurfaceV2
 {
   public:
+    QgsMultiPolygonV2();
     virtual QString geometryType() const override { return "MultiPolygon"; }
-    virtual QgsWKBTypes::Type flatWkbType() const override { return QgsWKBTypes::MultiPolygon; }
     QgsMultiPolygonV2* clone() const override;
 
     bool fromWkt( const QString& wkt ) override;