Fix #8584 (WFS requests with FILTER fails against Geoserver)

wonder-sk · wonder-sk · commit 10c15089d173 · 2014-02-08T01:09:31.000+07:00
diff --git a/src/core/qgsogcutils.cpp b/src/core/qgsogcutils.cpp
@@ -15,6 +15,7 @@
 
 
 static const QString GML_NAMESPACE = "http://www.opengis.net/gml";
+static const QString OGC_NAMESPACE = "http://www.opengis.net/ogc";
 
 QgsGeometry* QgsOgcUtils::geometryFromGML( const QDomNode& geometryNode )
 {
@@ -1879,7 +1880,7 @@ QDomElement QgsOgcUtils::expressionToOgcFilter( const QgsExpression& exp, QDomDo
   if ( exprRootElem.isNull() )
     return QDomElement();
 
-  QDomElement filterElem = doc.createElement( "ogc:Filter" );
+  QDomElement filterElem = doc.createElementNS( OGC_NAMESPACE, "ogc:Filter" );
   filterElem.appendChild( exprRootElem );
   return filterElem;
 }
diff --git a/tests/src/core/testqgsogcutils.cpp b/tests/src/core/testqgsogcutils.cpp
@@ -246,19 +246,21 @@ void TestQgsOgcUtils::testExpressionToOgcFilter_data()
   QTest::addColumn<QString>( "xmlText" );
 
   QTest::newRow( "=" ) << QString( "NAME = 'New York'" ) << QString(
-    "<ogc:Filter><ogc:PropertyIsEqualTo>"
+    "<ogc:Filter xmlns:ogc=\"http://www.opengis.net/ogc\">"
+    "<ogc:PropertyIsEqualTo>"
     "<ogc:PropertyName>NAME</ogc:PropertyName>"
     "<ogc:Literal>New York</ogc:Literal>"
     "</ogc:PropertyIsEqualTo></ogc:Filter>" );
 
   QTest::newRow( ">" ) << QString( "COUNT > 3" ) << QString(
-    "<ogc:Filter><ogc:PropertyIsGreaterThan>"
+    "<ogc:Filter xmlns:ogc=\"http://www.opengis.net/ogc\">"
+    "<ogc:PropertyIsGreaterThan>"
     "<ogc:PropertyName>COUNT</ogc:PropertyName>"
     "<ogc:Literal>3</ogc:Literal>"
     "</ogc:PropertyIsGreaterThan></ogc:Filter>" );
 
   QTest::newRow( "and+or" ) << QString( "(FIELD1 = 10 OR FIELD1 = 20) AND STATUS = 'VALID'" ) << QString(
-    "<ogc:Filter>"
+    "<ogc:Filter xmlns:ogc=\"http://www.opengis.net/ogc\">"
     "<ogc:And>"
     "<ogc:Or>"
     "<ogc:PropertyIsEqualTo>"
@@ -278,14 +280,14 @@ void TestQgsOgcUtils::testExpressionToOgcFilter_data()
     "</ogc:Filter>" );
 
   QTest::newRow( "is null" ) << QString( "X IS NULL" ) << QString(
-    "<ogc:Filter>"
+    "<ogc:Filter xmlns:ogc=\"http://www.opengis.net/ogc\">"
     "<ogc:PropertyIsNull>"
     "<ogc:PropertyName>X</ogc:PropertyName>"
     "</ogc:PropertyIsNull>"
     "</ogc:Filter>" );
 
   QTest::newRow( "is not null" ) << QString( "X IS NOT NULL" ) << QString(
-    "<ogc:Filter>"
+    "<ogc:Filter xmlns:ogc=\"http://www.opengis.net/ogc\">"
     "<ogc:Not>"
     "<ogc:PropertyIsNull>"
     "<ogc:PropertyName>X</ogc:PropertyName>"
@@ -294,7 +296,7 @@ void TestQgsOgcUtils::testExpressionToOgcFilter_data()
     "</ogc:Filter>" );
 
   QTest::newRow( "in" ) << QString( "A IN (10,20,30)" ) << QString(
-    "<ogc:Filter>"
+    "<ogc:Filter xmlns:ogc=\"http://www.opengis.net/ogc\">"
     "<ogc:Or>"
     "<ogc:PropertyIsEqualTo>"
     "<ogc:PropertyName>A</ogc:PropertyName>"
@@ -312,15 +314,15 @@ void TestQgsOgcUtils::testExpressionToOgcFilter_data()
     "</ogc:Filter>" );
 
   QTest::newRow( "intersects + wkt" ) << QString( "intersects($geometry, geomFromWKT('POINT (5 6)'))" ) << QString(
-    "<ogc:Filter>"
+    "<ogc:Filter xmlns:ogc=\"http://www.opengis.net/ogc\">"
     "<ogc:Intersects>"
     "<ogc:PropertyName>geometry</ogc:PropertyName>"
     "<gml:Point><gml:coordinates cs=\",\" ts=\" \">5,6</gml:coordinates></gml:Point>"
     "</ogc:Intersects>"
     "</ogc:Filter>" );
 
   QTest::newRow( "contains + gml" ) << QString( "contains($geometry, geomFromGML('<Point><coordinates cs=\",\" ts=\" \">5,6</coordinates></Point>'))" ) << QString(
-    "<ogc:Filter>"
+    "<ogc:Filter xmlns:ogc=\"http://www.opengis.net/ogc\">"
     "<ogc:Contains>"
     "<ogc:PropertyName>geometry</ogc:PropertyName>"
     "<Point><coordinates cs=\",\" ts=\" \">5,6</coordinates></Point>"

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`
`17`	`17`	`static const QString GML_NAMESPACE = "http://www.opengis.net/gml";`
	`18`	`+static const QString OGC_NAMESPACE = "http://www.opengis.net/ogc";`
`18`	`19`
`19`	`20`	`QgsGeometry* QgsOgcUtils::geometryFromGML( const QDomNode& geometryNode )`
`20`	`21`	`{`
`@@ -1879,7 +1880,7 @@ QDomElement QgsOgcUtils::expressionToOgcFilter( const QgsExpression& exp, QDomDo`
`1879`	`1880`	`if ( exprRootElem.isNull() )`
`1880`	`1881`	`return QDomElement();`
`1881`	`1882`
`1882`		`- QDomElement filterElem = doc.createElement( "ogc:Filter" );`
	`1883`	`+ QDomElement filterElem = doc.createElementNS( OGC_NAMESPACE, "ogc:Filter" );`
`1883`	`1884`	`filterElem.appendChild( exprRootElem );`
`1884`	`1885`	`return filterElem;`
`1885`	`1886`	`}`