-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4034 from rldhont/sld-backport-release-2_18-parsing
SLD parsing: handling ogc:Literal within CssParameter - backport 2.18
- Loading branch information
Showing
4 changed files
with
140 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
# -*- coding: utf-8 -*- | ||
|
||
""" | ||
*************************************************************************** | ||
test_qgssymbollayer_readsld.py | ||
--------------------- | ||
Date : January 2017 | ||
Copyright : (C) 2017, Jorge Gustavo Rocha | ||
Email : jgr at di dot uminho dot pt | ||
*************************************************************************** | ||
* * | ||
* This program is free software; you can redistribute it and/or modify * | ||
* 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__ = 'Jorge Gustavo Rocha' | ||
__date__ = 'January 2017' | ||
__copyright__ = '(C) 2017, Jorge Gustavo Rocha' | ||
# This will get replaced with a git SHA1 when you do a git archive | ||
__revision__ = '$Format:%H$' | ||
|
||
import qgis # NOQA | ||
|
||
import os | ||
from qgis.testing import start_app, unittest | ||
from qgis.core import (QgsVectorLayer, | ||
QgsFeature, | ||
QgsGeometry, | ||
QgsPoint | ||
) | ||
from qgis.testing import unittest | ||
from qgis.testing.mocked import get_iface | ||
from utilities import unitTestDataPath | ||
|
||
start_app() | ||
|
||
TEST_DATA_DIR = unitTestDataPath() | ||
|
||
|
||
def createLayerWithOneLine(): | ||
# create a temporary layer | ||
# linelayer = iface.addVectorLayer("LineString?crs=epsg:4326&field=gid:int&field=name:string", "simple_line", "memory") | ||
linelayer = QgsVectorLayer("LineString?crs=epsg:4326&field=gid:int&field=name:string", "simple_line", "memory") | ||
one = QgsFeature(linelayer.dataProvider().fields(), 0) | ||
one.setAttributes([1, 'one']) | ||
one.setGeometry(QgsGeometry.fromPolyline([QgsPoint(-7, 38), QgsPoint(-8, 42)])) | ||
linelayer.dataProvider().addFeatures([one]) | ||
return linelayer | ||
|
||
|
||
class TestQgsSymbolLayerReadSld(unittest.TestCase): | ||
|
||
""" | ||
This class checks if SLD styles are properly applied | ||
""" | ||
|
||
def setUp(self): | ||
self.iface = get_iface() | ||
|
||
# test <CSSParameter>VALUE<CSSParameter/> | ||
# test <CSSParameter><ogc:Literal>VALUE<ogc:Literal/><CSSParameter/> | ||
def test_Literal_within_CSSParameter(self): | ||
layer = createLayerWithOneLine() | ||
mFilePath = os.path.join(TEST_DATA_DIR, 'symbol_layer/external_sld/simple_streams.sld') | ||
layer.loadSldStyle(mFilePath) | ||
props = layer.rendererV2().symbol().symbolLayers()[0].properties() | ||
|
||
def testLineColor(): | ||
# stroke CSSParameter within ogc:Literal | ||
# expected color is #003EBA, RGB 0,62,186 | ||
self.assertEqual(layer.rendererV2().symbol().symbolLayers()[0].color().name(), '#003eba') | ||
|
||
def testLineWidth(): | ||
# stroke-width CSSParameter within ogc:Literal | ||
self.assertEqual(props['line_width'], '2') | ||
|
||
def testLineOpacity(): | ||
# stroke-opacity CSSParameter NOT within ogc:Literal | ||
# stroke-opacity=0.1 | ||
self.assertEqual(props['line_color'], '0,62,186,25') | ||
|
||
testLineColor() | ||
testLineWidth() | ||
testLineOpacity() | ||
|
||
if __name__ == '__main__': | ||
unittest.main() |
30 changes: 30 additions & 0 deletions
30
tests/testdata/symbol_layer/external_sld/simple_streams.sld
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<StyledLayerDescriptor version="1.0.0" xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc" | ||
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd"> | ||
<NamedLayer> | ||
<Name>Simple Streams</Name> | ||
<UserStyle> | ||
|
||
<Title>Default Styler for streams segments</Title> | ||
<Abstract>Blue lines, 2px wide</Abstract> | ||
<FeatureTypeStyle> | ||
<FeatureTypeName>Feature</FeatureTypeName> | ||
<Rule> | ||
<Title>Streams</Title> | ||
<LineSymbolizer> | ||
<Stroke> | ||
<CssParameter name="stroke"> | ||
<ogc:Literal>#003EBA</ogc:Literal> | ||
</CssParameter> | ||
<CssParameter name="stroke-width"> | ||
<ogc:Literal>2</ogc:Literal> | ||
</CssParameter> | ||
<CssParameter name="stroke-opacity">0.1</CssParameter> | ||
</Stroke> | ||
</LineSymbolizer> | ||
</Rule> | ||
</FeatureTypeStyle> | ||
</UserStyle> | ||
</NamedLayer> | ||
</StyledLayerDescriptor> |