Skip to content

Commit 2dfb6dc

Browse files
committed
Moved check single value in expressionFromOgcFilter
1 parent 64d1848 commit 2dfb6dc

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

src/core/qgsogcutils.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1603,6 +1603,16 @@ QgsExpression* QgsOgcUtils::expressionFromOgcFilter( const QDomElement& element
16031603

16041604
QgsExpression *expr = new QgsExpression();
16051605

1606+
// check if it is a single string value not having DOM elements
1607+
// that express OGC operators
1608+
if ( element.firstChild().nodeType() == QDomNode::TextNode )
1609+
{
1610+
expr->setExpression( element.firstChild().nodeValue() );
1611+
return expr;
1612+
}
1613+
1614+
// then check OGC DOM elements that contain OGC tags specifying
1615+
// OGC operators.
16061616
QDomElement childElem = element.firstChildElement();
16071617
while ( !childElem.isNull() )
16081618
{

src/core/symbology-ng/qgssymbollayerutils.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2515,14 +2515,6 @@ bool QgsSymbolLayerUtils::functionFromSldElement( QDomElement &element, QString
25152515
return false;
25162516
}
25172517

2518-
// check if it is a single string value
2519-
if ( elem.hasChildNodes() &&
2520-
elem.firstChild().nodeType() == QDomNode::TextNode )
2521-
{
2522-
function = elem.firstChild().nodeValue();
2523-
return true;
2524-
}
2525-
25262518
// parse ogc:Filter
25272519
QgsExpression *expr = QgsOgcUtils::expressionFromOgcFilter( elem );
25282520
if ( !expr )

0 commit comments

Comments
 (0)