More types support for QgsVectorFileWriter

qgis · Jan 12, 2016 · e351d24 · e351d24 · nirvn · Jan 22, 2016
1 parent e29c7e5
commit e351d24
Show file tree

Hide file tree

Showing 7 changed files with 251 additions and 103 deletions.
diff --git a/python/core/geometry/qgswkbtypes.sip b/python/core/geometry/qgswkbtypes.sip
@@ -183,4 +183,11 @@ class QgsWKBTypes
      * @see addM()
      */
     static Type dropM( Type type );
+
+    /**
+     * Will convert the 25D version of the flat type if supported or Unknown if not supported.
+     * @param type The type to convert
+     * @return the 25D version of the type or Unknown
+     */
+    static Type to25D( Type type );
 };
diff --git a/python/core/qgsvectorfilewriter.sip b/python/core/qgsvectorfilewriter.sip
@@ -194,8 +194,21 @@ class QgsVectorFileWriter
                          const QString& driverName = "ESRI Shapefile",
                          const QStringList &datasourceOptions = QStringList(),
                          const QStringList &layerOptions = QStringList(),
-                         QString *newFilename = 0,
-                         QgsVectorFileWriter::SymbologyExport symbologyExport = QgsVectorFileWriter::NoSymbology
+                         QString *newFilename = nullptr,
+                         SymbologyExport symbologyExport = NoSymbology
+                       );
+
+    /** Create a new vector file writer */
+    QgsVectorFileWriter( const QString& vectorFileName,
+                         const QString& fileEncoding,
+                         const QgsFields& fields,
+                         QgsWKBTypes::Type geometryType,
+                         const QgsCoordinateReferenceSystem* srs,
+                         const QString& driverName = "ESRI Shapefile",
+                         const QStringList &datasourceOptions = QStringList(),
+                         const QStringList &layerOptions = QStringList(),
+                         QString *newFilename = nullptr,
+                         SymbologyExport symbologyExport = NoSymbology
                        );
 
     /** Returns map with format filter string as key and OGR format key as value*/

diff --git a/src/core/geometry/qgswkbtypes.cpp b/src/core/geometry/qgswkbtypes.cpp
@@ -236,6 +236,18 @@ QgsWKBTypes::Type QgsWKBTypes::dropM( QgsWKBTypes::Type type )
   return returnType;
 }
 
+QgsWKBTypes::Type QgsWKBTypes::to25D( QgsWKBTypes::Type type )
+{
+  QgsWKBTypes::Type flat = flatType( type );
+
+  if ( flat >= Point && flat <= MultiPolygon )
+    return static_cast< QgsWKBTypes::Type >( flat + 0x80000000 );
+  else if ( type == QgsWKBTypes::NoGeometry )
+    return QgsWKBTypes::NoGeometry;
+  else
+    return Unknown;
+}
+
 /***************************************************************************
  * This class is considered CRITICAL and any change MUST be accompanied with
  * full unit tests.

diff --git a/src/core/geometry/qgswkbtypes.h b/src/core/geometry/qgswkbtypes.h
@@ -217,6 +217,12 @@ class CORE_EXPORT QgsWKBTypes
      */
     static Type dropM( Type type );
 
+    /**
+     * Will convert the 25D version of the flat type if supported or Unknown if not supported.
+     * @param type The type to convert
+     * @return the 25D version of the type or Unknown
+     */
+    static Type to25D( Type type );
   private:
 
     struct wkbEntry