sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-03 00:02:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32340 from rldhont/server-wms-getstyles-textsymbolizer-master

Browse Source 
[Server] Add TextSymbolizer to SLD provided by WMS GetStyles request
This commit is contained in:
rldhont 2019-10-26 10:22:55 +02:00 committed by GitHub
commit 266898b899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 111 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/server/services/wms/qgswmsgetstyles.cpp
View File

@ -29,6 +29,7 @@
#include "qgsrenderer.h"
#include "qgsvectorlayer.h"
#include "qgsmaplayerstylemanager.h"
#include "qgsvectorlayerlabeling.h"
namespace QgsWms
@ -181,11 +182,35 @@ namespace QgsWms
if ( vlayer->isSpatial() )
{
QString currentStyle = vlayer->styleManager()->currentStyle();
QgsStringMap props;
if ( vlayer->hasScaleBasedVisibility() )
{
props[ QStringLiteral( "scaleMinDenom" ) ] = QString::number( vlayer->maximumScale() );
props[ QStringLiteral( "scaleMaxDenom" ) ] = QString::number( vlayer->minimumScale() );
}
for ( const QString &styleName : vlayer->styleManager()->styles() )
{
vlayer->styleManager()->setCurrentStyle( styleName );
QDomElement styleElem = vlayer->renderer()->writeSld( myDocument, styleName );
namedLayerNode.appendChild( styleElem );
QDomElement userStyleElem = myDocument.createElement( QStringLiteral( "UserStyle" ) );
QDomElement styleNameElem = myDocument.createElement( QStringLiteral( "se:Name" ) );
styleNameElem.appendChild( myDocument.createTextNode( styleName ) );
userStyleElem.appendChild( styleNameElem );
QDomElement featureTypeStyleElem = myDocument.createElement( QStringLiteral( "se:FeatureTypeStyle" ) );
userStyleElem.appendChild( featureTypeStyleElem );
vlayer->renderer()->toSld( myDocument, featureTypeStyleElem, props );
if ( vlayer->labelsEnabled() )
{
vlayer->labeling()->toSld( featureTypeStyleElem, props );
}
namedLayerNode.appendChild( userStyleElem );
}
vlayer->styleManager()->setCurrentStyle( currentStyle );
}

9
tests/src/python/test_qgsserver_wms.py
View File

@ -48,7 +48,8 @@ class TestQgsServerWMSTestBase(QgsServerTestBase):
regenerate_reference = False
def wms_request(self, request, extra=None, project='test_project.qgs', version='1.3.0'):
project = os.path.join(self.testdata_path, project)
if not os.path.exists(project):
project = os.path.join(self.testdata_path, project)
assert os.path.exists(project), "Project file not found: " + project
query_string = 'https://www.qgis.org/?MAP=%s&SERVICE=WMS&VERSION=%s&REQUEST=%s' % (urllib.parse.quote(project), version, request)
if extra is not None:
@ -121,6 +122,12 @@ class TestQgsServerWMS(TestQgsServerWMSTestBase):
'&layers=testlayer%20%C3%A8%C3%A9&',
'getstyles')
# Test GetStyles with labeling
self.wms_request_compare('GetStyles',
'&layers=pointlabel',
'getstyles_pointlabel',
project=self.projectPath)
def test_wms_getschemaextension(self):
self.wms_request_compare('GetSchemaExtension',
'',

76
tests/testdata/qgis_server/getstyles_pointlabel.txt vendored Normal file
View File

@ -0,0 +1,76 @@
*****
Content-Type: text/xml; charset=utf-8
<?xml version="1.0" encoding="UTF-8"?>
<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/StyledLayerDescriptor.xsd" xmlns:ogc="http://www.opengis.net/ogc" xmlns:se="http://www.opengis.net/se" version="1.1.0" xmlns:xlink="http://www.w3.org/1999/xlink">
<NamedLayer>
<se:Name>pointlabel</se:Name>
<UserStyle>
<se:Name>default</se:Name>
<se:FeatureTypeStyle>
<se:Rule>
<se:Name></se:Name>
<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">
<ogc:PropertyIsEqualTo>
<ogc:Function name="attribute">
<ogc:Function name="get_feature">
<ogc:Literal>geo_1a4e7b82_a552_467a_b681_c1155fb76f54</ogc:Literal>
<ogc:Literal>fid</ogc:Literal>
<ogc:Add>
<ogc:PropertyName>gid</ogc:PropertyName>
<ogc:Literal>1</ogc:Literal>
</ogc:Add>
</ogc:Function>
<ogc:Literal>val</ogc:Literal>
</ogc:Function>
<ogc:Literal>1.72300000000000009</ogc:Literal>
</ogc:PropertyIsEqualTo>
</ogc:Filter>
<se:PointSymbolizer>
<se:Graphic>
<se:Mark>
<se:WellKnownName>circle</se:WellKnownName>
<se:Fill>
<se:SvgParameter name="fill">#fffb00</se:SvgParameter>
</se:Fill>
<se:Stroke>
<se:SvgParameter name="stroke">#d711da</se:SvgParameter>
<se:SvgParameter name="stroke-width">4</se:SvgParameter>
</se:Stroke>
</se:Mark>
<se:Size>43</se:Size>
</se:Graphic>
</se:PointSymbolizer>
</se:Rule>
<se:Rule>
<se:TextSymbolizer>
<se:Label>
<!--SE Export for 'Level is\n' + to_string(attribute(get_feature('geo_1a4e7b82_a552_467a_b681_c1155fb76f54', 'fid', gid + 1), 'val')) + ' m' + '\nat ' + format_date(attribute(get_feature('geo_1a4e7b82_a552_467a_b681_c1155fb76f54', 'fid', gid + 1), 'data'), 'hh:mm dd.MM.yyyy') not implemented yet-->Placeholder</se:Label>
<se:Font>
<se:SvgParameter name="font-family">QGIS Vera Sans</se:SvgParameter>
<se:SvgParameter name="font-size">18</se:SvgParameter>
<se:SvgParameter name="font-weight">bold</se:SvgParameter>
</se:Font>
<se:LabelPlacement>
<se:PointPlacement>
<se:AnchorPoint>
<se:AnchorPointX>1</se:AnchorPointX>
<se:AnchorPointY>0</se:AnchorPointY>
</se:AnchorPoint>
</se:PointPlacement>
</se:LabelPlacement>
<se:Halo>
<se:Radius>3.5</se:Radius>
<se:Fill>
<se:SvgParameter name="fill">#3ba7a7</se:SvgParameter>
</se:Fill>
</se:Halo>
<se:Fill>
<se:SvgParameter name="fill">#ff0000</se:SvgParameter>
</se:Fill>
</se:TextSymbolizer>
</se:Rule>
</se:FeatureTypeStyle>
</UserStyle>
</NamedLayer>
</StyledLayerDescriptor>