Do not generate a ogc:Filter where a ogc:Expression is expected. Fixes #10076 and #11202

aaime · rldhont · commit b627401336ee · 2016-10-01T15:50:24.000+02:00
diff --git a/python/core/qgsogcutils.sip b/python/core/qgsogcutils.sip
@@ -59,5 +59,11 @@ class QgsOgcUtils
      */
     static QDomElement expressionToOgcFilter( const QgsExpression& exp, QDomDocument& doc, QString* errorMessage /Out/ );
 
+    /** Creates an OGC expression XML element.
+     * @return valid OGC expression QDomElement on success,
+     * otherwise null QDomElement
+     */
+    static QDomElement expressionToOgcExpression( const QgsExpression& exp, QDomDocument& doc, QString* errorMessage = nullptr );
+
 };
 
diff --git a/src/core/qgsogcutils.cpp b/src/core/qgsogcutils.cpp
@@ -2030,6 +2030,12 @@ QDomElement QgsOgcUtils::expressionToOgcFilter( const QgsExpression& exp, QDomDo
                                 "geometry", QString(), false, false, errorMessage );
 }
 
+QDomElement QgsOgcUtils::expressionToOgcExpression( const QgsExpression& exp, QDomDocument& doc, QString* errorMessage )
+{
+  return expressionToOgcExpression( exp, doc, GML_2_1_2, FILTER_OGC_1_0,
+                                    "geometry", QString(), false, false, errorMessage );
+}
+
 QDomElement QgsOgcUtils::expressionToOgcFilter( const QgsExpression& exp,
     QDomDocument& doc,
     GMLVersion gmlVersion,
@@ -2067,6 +2073,44 @@ QDomElement QgsOgcUtils::expressionToOgcFilter( const QgsExpression& exp,
   return filterElem;
 }
 
+QDomElement QgsOgcUtils::expressionToOgcExpression( const QgsExpression& exp,
+    QDomDocument& doc,
+    GMLVersion gmlVersion,
+    FilterVersion filterVersion,
+    const QString& geometryName,
+    const QString& srsName,
+    bool honourAxisOrientation,
+    bool invertAxisOrientation,
+    QString* errorMessage )
+{
+  const QgsExpression::Node* node = exp.rootNode();
+  if ( !node )
+    return QDomElement();
+
+  switch ( node->nodeType() )
+  {
+    case QgsExpression::ntFunction:
+    case QgsExpression::ntLiteral:
+    case QgsExpression::ntColumnRef:
+    {
+      QgsOgcUtilsExprToFilter utils( doc, gmlVersion, filterVersion, geometryName, srsName, honourAxisOrientation, invertAxisOrientation );
+      QDomElement exprRootElem = utils.expressionNodeToOgcFilter( node );
+
+      if ( errorMessage )
+        *errorMessage = utils.errorMessage();
+
+      if ( !exprRootElem.isNull() )
+      {
+        return exprRootElem;
+      }
+      break;
+    }
+    default:
+      *errorMessage = QObject::tr( "Node type not supported in expression translation: %1" ).arg( node->nodeType() );
+  }
+  // got an error
+  return QDomElement();
+}
 
 QDomElement QgsOgcUtilsExprToFilter::expressionNodeToOgcFilter( const QgsExpression::Node* node )
 {
diff --git a/src/core/qgsogcutils.h b/src/core/qgsogcutils.h
@@ -159,6 +159,25 @@ class CORE_EXPORT QgsOgcUtils
         bool invertAxisOrientation,
         QString* errorMessage = nullptr );
 
+    /** Creates an OGC expression XML element.
+     * @return valid OGC expression QDomElement on success,
+     * otherwise null QDomElement
+     */
+    static QDomElement expressionToOgcExpression( const QgsExpression& exp, QDomDocument& doc, QString* errorMessage = nullptr );
+
+    /** Creates an OGC expression XML element.
+     * @return valid OGC expression QDomElement on success,
+     * otherwise null QDomElement
+     */
+    static QDomElement expressionToOgcExpression( const QgsExpression& exp,
+        QDomDocument& doc,
+        GMLVersion gmlVersion,
+        FilterVersion filterVersion,
+        const QString& geometryName,
+        const QString& srsName,
+        bool honourAxisOrientation,
+        bool invertAxisOrientation,
+        QString* errorMessage = nullptr );
   private:
 
     /** Static method that creates geometry from GML Point */
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.cpp b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
@@ -2553,7 +2553,7 @@ bool QgsSymbolLayerV2Utils::createFunctionElement( QDomDocument &doc, QDomElemen
     element.appendChild( doc.createComment( "Parser Error: " + expr.parserErrorString() + " - Expression was: " + function ) );
     return false;
   }
-  QDomElement filterElem = QgsOgcUtils::expressionToOgcFilter( expr, doc );
+  QDomElement filterElem = QgsOgcUtils::expressionToOgcExpression( expr, doc );
   if ( !filterElem.isNull() )
     element.appendChild( filterElem );
   return true;
diff --git a/tests/src/python/CMakeLists.txt b/tests/src/python/CMakeLists.txt
@@ -64,6 +64,7 @@ ADD_PYTHON_TEST(PyQgsOGRProvider test_provider_ogr.py)
 ADD_PYTHON_TEST(PyQgsSpatialIndex test_qgsspatialindex.py)
 ADD_PYTHON_TEST(PyQgsSpatialiteProvider test_provider_spatialite.py)
 ADD_PYTHON_TEST(PyQgsSymbolLayerV2 test_qgssymbollayerv2.py)
+ADD_PYTHON_TEST(PyQgsSymbolLayerCreateSld test_qgssymbollayer_createsld.py)
 ADD_PYTHON_TEST(PyQgsSymbolExpressionVariables test_qgssymbolexpressionvariables.py)
 ADD_PYTHON_TEST(PyQgsSyntacticSugar test_syntactic_sugar.py)
 ADD_PYTHON_TEST(PyQgsSymbolV2 test_qgssymbolv2.py)
diff --git a/tests/src/python/test_qgssymbollayer_createsld.py b/tests/src/python/test_qgssymbollayer_createsld.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+
+"""
+***************************************************************************
+    test_qgssymbollayer_createsld.py
+    ---------------------
+    Date                 : July 2016
+    Copyright            : (C) 2016 by Andrea Aime
+    Email                : andrea dot aime at geosolutions dot it
+***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *less
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************
+"""
+
+__author__ = 'Andrea Aime'
+__date__ = 'July 2016'
+__copyright__ = '(C) 2012, Andrea Aime'
+# This will get replaced with a git SHA1 when you do a git archive
+__revision__ = '$Format:%H$'
+
+import qgis  # NOQA
+
+import os
+
+from qgis.PyQt.QtCore import pyqtWrapperType, Qt, QDir, QFile, QIODevice, QPointF
+from qgis.PyQt.QtXml import (QDomDocument, QDomElement)
+from qgis.PyQt.QtGui import QColor
+
+from qgis.core import QgsSimpleMarkerSymbolLayer
+from qgis.testing import start_app, unittest
+from utilities import unitTestDataPath
+
+# Convenience instances in case you may need them
+# not used in this test
+start_app()
+
+
+class TestQgsSymbolLayerCreateSld(unittest.TestCase):
+
+    """
+     This class tests the creation of SLD from QGis layers
+     """
+
+    def testSimpleMarkerSymbolLayer(self):
+        symbol = QgsSimpleMarkerSymbolLayer(
+            'star', QColor(255, 0, 0), QColor(0, 255, 0), 10)
+        symbol.setAngle(50)
+        dom = QDomDocument()
+        root = dom.createElement("FakeRoot")
+        dom.appendChild(root)
+        symbol.toSld(dom, root, {})
+        # print "This is the dom: " + dom.toString()
+
+        # Check the rotation element is a literal, not a
+        rotation = root.elementsByTagName('se:Rotation').item(0)
+        literal = rotation.firstChild()
+        self.assertEquals("ogc:Literal", literal.nodeName())
+        self.assertEquals('50', literal.firstChild().nodeValue())
+
+
+if __name__ == '__main__':
+    unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -2553,7 +2553,7 @@ bool QgsSymbolLayerV2Utils::createFunctionElement( QDomDocument &doc, QDomElemen`
`2553`	`2553`	`element.appendChild( doc.createComment( "Parser Error: " + expr.parserErrorString() + " - Expression was: " + function ) );`
`2554`	`2554`	`return false;`
`2555`	`2555`	`}`
`2556`		`- QDomElement filterElem = QgsOgcUtils::expressionToOgcFilter( expr, doc );`
	`2556`	`+ QDomElement filterElem = QgsOgcUtils::expressionToOgcExpression( expr, doc );`
`2557`	`2557`	`if ( !filterElem.isNull() )`
`2558`	`2558`	`element.appendChild( filterElem );`
`2559`	`2559`	`return true;`