Skip to content

Commit 190c31d

Browse files
m-kuhnm-kuhn
authoredFeb 16, 2017
Merge pull request #4051 from boundlessgeo/release-2_14-SldRotationFix
Tests and fix to read sld:Rotation when does not have ogc sub tags
·
final-2_14_22final-2_14_12
2 parents 70f51ae + e05a8ca commit 190c31d

File tree

5 files changed

+104
-1
lines changed

5 files changed

+104
-1
lines changed
 

‎src/core/qgsogcutils.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "qgsgeometry.h"
2020
#include "qgswkbptr.h"
2121
#include "qgscoordinatereferencesystem.h"
22+
#include "qgslogger.h"
2223

2324
#include <QColor>
2425
#include <QStringList>
@@ -1584,6 +1585,16 @@ QgsExpression* QgsOgcUtils::expressionFromOgcFilter( const QDomElement& element
15841585
if ( element.isNull() || !element.hasChildNodes() )
15851586
return nullptr;
15861587

1588+
// check if it is a single string value => no DomElement
1589+
if ( element.firstChild().nodeType() == QDomNode::TextNode )
1590+
{
1591+
QgsExpression *expr = new QgsExpression( element.firstChild().nodeValue() );
1592+
expr->d->mParserErrorString = QString();
1593+
return expr;
1594+
}
1595+
1596+
// now parse OGC operators. OGC operator does not have a only text value
1597+
// but only sub element operators
15871598
QgsExpression *expr = new QgsExpression();
15881599

15891600
QDomElement childElem = element.firstChildElement();

‎src/core/symbology-ng/qgssymbollayerv2utils.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2576,6 +2576,7 @@ bool QgsSymbolLayerV2Utils::createFunctionElement( QDomDocument &doc, QDomElemen
25762576

25772577
bool QgsSymbolLayerV2Utils::functionFromSldElement( QDomElement &element, QString &function )
25782578
{
2579+
// check if ogc:Filter or containe ogc:Filters
25792580
QDomElement elem = element;
25802581
if ( element.tagName() != "Filter" )
25812582
{
@@ -2591,7 +2592,7 @@ bool QgsSymbolLayerV2Utils::functionFromSldElement( QDomElement &element, QStrin
25912592
return false;
25922593
}
25932594

2594-
2595+
// parse ogc:Filter
25952596
QgsExpression *expr = QgsOgcUtils::expressionFromOgcFilter( elem );
25962597
if ( !expr )
25972598
return false;

‎tests/src/python/test_qgssymbollayerv2_readsld.py

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
"""
44
***************************************************************************
5+
<<<<<<< bee5f8063794cb7e5fc48b5e0562c20de3249d74
56
test_qgssymbollayer_readsld.py
7+
=======
8+
test_qgssymbollayerv2_readsld.py
9+
>>>>>>> Tests and fix to read sld:Rotation when does not have ogc sub tags
610
---------------------
711
Date : January 2017
812
Copyright : (C) 2017, Jorge Gustavo Rocha
@@ -87,5 +91,31 @@ def testLineOpacity():
8791
testLineWidth()
8892
testLineOpacity()
8993

94+
def testSimpleMarkerRotation(self):
95+
"""
96+
Test if pointMarker property sld:Rotation value can be read if format is:
97+
<sld:Rotation>50.0</sld:Rotation>
98+
or
99+
<se:Rotation><ogc:Literal>50</ogc:Literal></se:Rotation>
100+
"""
101+
# technically it's not necessary to use a real shape, but a empty memory
102+
# layer. In case these tests will upgrate to a rendering where to
103+
# compare also rendering not only properties
104+
#myShpFile = os.path.join(unitTestDataPath(), 'points.shp')
105+
#layer = QgsVectorLayer(myShpFile, 'points', 'ogr')
106+
layer = QgsVectorLayer("Point", "addfeat", "memory")
107+
assert(layer.isValid())
108+
# test if able to read <sld:Rotation>50.0</sld:Rotation>
109+
mFilePath = os.path.join(unitTestDataPath(), 'symbol_layer/external_sld/testSimpleMarkerRotation-directValue.sld')
110+
layer.loadSldStyle(mFilePath)
111+
props = layer.rendererV2().symbol().symbolLayers()[0].properties()
112+
self.assertEqual(props['angle'], '50')
113+
# test if able to read <se:Rotation><ogc:Literal>50</ogc:Literal></se:Rotation>
114+
mFilePath = os.path.join(unitTestDataPath(), 'symbol_layer/external_sld/testSimpleMarkerRotation-ogcLiteral.sld')
115+
layer.loadSldStyle(mFilePath)
116+
props = layer.rendererV2().symbol().symbolLayers()[0].properties()
117+
self.assertEqual(props['angle'], '50')
118+
119+
90120
if __name__ == '__main__':
91121
unittest.main()

‎tests/testdata/symbol_layer/external_sld/testSimpleMarkerRotation-directValue.sld

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" ?>
2+
<sld:StyledLayerDescriptor version="1.0.0" xmlns="http://www.opengis.net/sld" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" xmlns:sld="http://www.opengis.net/sld">
3+
<sld:NamedLayer>
4+
<sld:Name>testSimpleMarkerRotation</sld:Name>
5+
<sld:UserStyle>
6+
<sld:Name>testSimpleMarkerRotation</sld:Name>
7+
<sld:FeatureTypeStyle>
8+
<sld:Name>name</sld:Name>
9+
<sld:Rule>
10+
<sld:Name>Single symbol</sld:Name>
11+
<sld:PointSymbolizer>
12+
<sld:Graphic>
13+
<sld:Mark>
14+
<sld:WellKnownName>star</sld:WellKnownName>
15+
<sld:Fill>
16+
<sld:CssParameter name="fill">#ff0000</sld:CssParameter>
17+
</sld:Fill>
18+
<sld:Stroke>
19+
<sld:CssParameter name="stroke">#00ff00</sld:CssParameter>
20+
</sld:Stroke>
21+
</sld:Mark>
22+
<sld:Size>36</sld:Size>
23+
<sld:Rotation>50.0</sld:Rotation>
24+
</sld:Graphic>
25+
</sld:PointSymbolizer>
26+
</sld:Rule>
27+
</sld:FeatureTypeStyle>
28+
</sld:UserStyle>
29+
</sld:NamedLayer>
30+
</sld:StyledLayerDescriptor>

‎tests/testdata/symbol_layer/external_sld/testSimpleMarkerRotation-ogcLiteral.sld

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns:se="http://www.opengis.net/se">
3+
<NamedLayer>
4+
<se:Name>points</se:Name>
5+
<UserStyle>
6+
<se:Name>points</se:Name>
7+
<se:FeatureTypeStyle>
8+
<se:Rule>
9+
<se:Name>Single symbol</se:Name>
10+
<se:PointSymbolizer>
11+
<se:Graphic>
12+
<se:Mark>
13+
<se:WellKnownName>regular_star</se:WellKnownName>
14+
<se:Fill>
15+
<se:SvgParameter name="fill">#ff0000</se:SvgParameter>
16+
</se:Fill>
17+
<se:Stroke>
18+
<se:SvgParameter name="stroke">#00ff00</se:SvgParameter>
19+
</se:Stroke>
20+
</se:Mark>
21+
<se:Size>10</se:Size>
22+
<se:Rotation>
23+
<ogc:Literal>50</ogc:Literal>
24+
</se:Rotation>
25+
</se:Graphic>
26+
</se:PointSymbolizer>
27+
</se:Rule>
28+
</se:FeatureTypeStyle>
29+
</UserStyle>
30+
</NamedLayer>
31+
</StyledLayerDescriptor>

0 commit comments

Comments
 (0)
Please sign in to comment.