sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39673 from elpaso/server-wms-getlegendgraphics-json-symbolscale

Browse Source 
Server wms getlegendgraphics json symbolscale
This commit is contained in:
Alessandro Pasotti 2020-10-29 09:15:11 +01:00 committed by GitHub
commit bda2e100e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/layertree/qgslayertreemodellegendnode.cpp
View File

@ -716,6 +716,15 @@ QJsonObject QgsSymbolLegendNode::exportSymbolToJson( const QgsLegendSettings &se
QJsonObject json; QJsonObject json;
json[ QStringLiteral( "icon" ) ] = base64; json[ QStringLiteral( "icon" ) ] = base64;
if ( mItem.scaleMaxDenom() > 0 )
{
json[ QStringLiteral( "scaleMaxDenom" ) ] = mItem.scaleMaxDenom();
}
if ( mItem.scaleMinDenom() > 0 )
{
json[ QStringLiteral( "scaleMinDenom" ) ] = mItem.scaleMinDenom();
}
mItem.scaleMaxDenom();
return json; return json;
} }

45
tests/src/python/test_qgsserver_wms_getlegendgraphic.py
View File

@ -20,6 +20,7 @@ import os
os.environ['QT_HASH_SEED'] = '1' os.environ['QT_HASH_SEED'] = '1'
import re import re
import json
import urllib.request import urllib.request
import urllib.parse import urllib.parse
import urllib.error import urllib.error
@ -30,7 +31,19 @@ from qgis.PyQt.QtCore import QSize
import osgeo.gdal # NOQA import osgeo.gdal # NOQA
from test_qgsserver_wms import TestQgsServerWMSTestBase from test_qgsserver_wms import TestQgsServerWMSTestBase
from qgis.core import QgsProject from qgis.core import (
QgsProject,
QgsMarkerSymbol,
QgsRuleBasedRenderer,
QgsVectorLayer,
)
from qgis.server import (
QgsBufferServerRequest,
QgsBufferServerResponse,
QgsServer,
QgsServerRequest,
)
# Strip path and content length because path may vary # Strip path and content length because path may vary
RE_STRIP_UNCHECKABLE = br'MAP=[^"]+|Content-Length: \d+' RE_STRIP_UNCHECKABLE = br'MAP=[^"]+|Content-Length: \d+'
@ -1002,6 +1015,36 @@ class TestQgsServerWMSGetLegendGraphic(TestQgsServerWMSTestBase):
"&FORMAT=application/json", "&FORMAT=application/json",
"wms_getlegendgraphic_json_multiple_layers") "wms_getlegendgraphic_json_multiple_layers")
def testJsonSymbolMaxMinScale(self):
"""Test min/max scale in symbol json export"""
project = QgsProject()
layer = QgsVectorLayer("Point?field=fldtxt:string",
"layer1", "memory")
symbol = QgsMarkerSymbol.createSimple(
{'name': 'square', 'color': 'red'})
scale_min = 10000
scale_max = 1000
rule = QgsRuleBasedRenderer.Rule(symbol, scale_min, scale_max, '')
rootrule = QgsRuleBasedRenderer.Rule(None)
rootrule.appendChild(rule)
layer.setRenderer(QgsRuleBasedRenderer(rootrule))
project.addMapLayers([layer])
server = QgsServer()
request = QgsBufferServerRequest("/?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetLegendGraphic" +
"&LAYERS=layer1" +
"&FORMAT=application/json")
response = QgsBufferServerResponse()
server.handleRequest(request, response, project)
j = json.loads(bytes(response.body()))
node = j['nodes'][0]
self.assertEqual(node['scaleMaxDenom'], 1000)
self.assertEqual(node['scaleMinDenom'], 10000)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()