Moved GML import/export to a new class: QgsOgcUtils

qgis · Mar 7, 2013 · 969df01 · 969df01
1 parent 290f8fd
commit 969df01
Show file tree

Hide file tree

Showing 17 changed files with 1,166 additions and 1,041 deletions.
diff --git a/python/core/core.sip b/python/core/core.sip
@@ -47,6 +47,7 @@
 %Include qgsmimedatautils.sip
 %Include qgsnetworkaccessmanager.sip
 %Include qgsofflineediting.sip
+%Include qgsogcutils.sip
 %Include qgsoverlayobject.sip
 %Include qgsowsconnection.sip
 %Include qgspaintenginehack.sip

diff --git a/python/core/qgsgeometry.sip b/python/core/qgsgeometry.sip
@@ -41,18 +41,6 @@ class QgsGeometry
     /** static method that creates geometry from Wkt */
     static QgsGeometry* fromWkt( QString wkt ) /Factory/;
 
-    /** static method that creates geometry from GML2
-     @param XML representation of the geometry. GML elements are expected to be
-       in default namespace (<Point>...</Point>) or in "gml" namespace (<gml:Point>...</gml:Point>)
-     @note added in 1.9
-     */
-    static QgsGeometry* fromGML2( const QString& xmlString ) /Factory/;
-
-    /** static method that creates geometry from GML2
-      @note added in 1.9
-      */
-    static QgsGeometry* fromGML2( const QDomNode& geometryNode ) /Factory/;
-
     /** construct geometry from a point */
     static QgsGeometry* fromPoint( const QgsPoint& point ) /Factory/;
     /** construct geometry from a multipoint */

diff --git a/python/core/qgsogcutils.sip b/python/core/qgsogcutils.sip
@@ -0,0 +1,32 @@
+
+
+class QgsOgcUtils
+{
+%TypeHeaderCode
+#include <qgsogcutils.h>
+%End
+
+public:
+
+  /** static method that creates geometry from GML2
+   @param XML representation of the geometry. GML elements are expected to be
+     in default namespace (<Point>...</Point>) or in "gml" namespace (<gml:Point>...</gml:Point>)
+   @note added in 1.9
+   */
+  static QgsGeometry* geometryFromGML2( const QString& xmlString ) /Factory/;
+
+  /** static method that creates geometry from GML2
+    @note added in 1.9
+    */
+  static QgsGeometry* geometryFromGML2( const QDomNode& geometryNode ) /Factory/;
+
+  /** Exports the geometry to mGML2
+      @return true in case of success and false else
+   */
+  static QDomElement geometryToGML2( QgsGeometry* geometry, QDomDocument& doc );
+
+  /** read rectangle from GML2 Box */
+  static QgsRectangle rectangleFromGMLBox( const QDomNode& boxNode );
+
+};
+
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -86,6 +86,7 @@ SET(QGIS_CORE_SRCS
   qgsnetworkreplyparser.cpp
   qgscredentials.cpp
   qgsofflineediting.cpp
+  qgsogcutils.cpp
   qgsoverlayobject.cpp
   qgsowsconnection.cpp
   qgspalgeometry.cpp
@@ -404,6 +405,7 @@ SET(QGIS_CORE_HDRS
   qgsnetworkreplyparser.h
   qgscredentials.h
   qgsofflineediting.h
+  qgsogcutils.h
   qgsoverlayobjectpositionmanager.h
   qgsowsconnection.h
   qgspallabeling.h

diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -28,6 +28,7 @@
 #include "qgsfeature.h"
 #include "qgsgeometry.h"
 #include "qgslogger.h"
+#include "qgsogcutils.h"
 
 // from parser
 extern QgsExpression::Node* parseExpression( const QString& str, QString& parserErrorMsg );
@@ -796,7 +797,7 @@ static QVariant fcnGeomFromWKT( const QVariantList& values, QgsFeature*, QgsExpr
 static QVariant fcnGeomFromGML2( const QVariantList& values, QgsFeature*, QgsExpression* parent )
 {
   QString gml = getStringValue( values.at( 0 ), parent );
-  QgsGeometry* geom = QgsGeometry::fromGML2( gml );
+  QgsGeometry* geom = QgsOgcUtils::geometryFromGML2( gml );
 
   if ( geom )
     return QVariant::fromValue( *geom );
@@ -2268,11 +2269,10 @@ void QgsExpression::NodeFunction::toOgcFilter( QDomDocument &doc, QDomElement &e
         {
           if ( childElem.attribute( "name" ) == "geomFromWKT" )
           {
-            QgsGeometry* geom = 0;
-            geom = QgsGeometry::fromWkt( childElem.firstChildElement().text() );
+            QgsGeometry* geom = QgsGeometry::fromWkt( childElem.firstChildElement().text() );
             if ( geom )
-              funcElem.appendChild( geom->exportToGML2( doc ) );
-
+              funcElem.appendChild( QgsOgcUtils::geometryToGML2( geom, doc ) );
+            delete geom;
           }
           else if ( childElem.attribute( "name" ) == "geomFromGML2" )
           {