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

fix(QgsMapBoxGlStyleConverter): also handle visibility when it is defined in "layout"

Browse Source
This commit is contained in:
bdm-oslandia 2024-12-19 17:55:07 +01:00 committed by Nyall Dawson
parent 80e56a42cc
commit 149096cdc5
2 changed files with 94 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/vectortile/qgsmapboxglstyleconverter.cpp
View File

@ -149,7 +149,18 @@ void QgsMapBoxGlStyleConverter::parseLayers( const QVariantList &layers, QgsMapB
if ( maxZoom != -1 )
maxZoom--;
const bool enabled = jsonLayer.value( QStringLiteral( "visibility" ) ).toString() != QLatin1String( "none" );
QString visibilyStr;
if ( jsonLayer.contains( QStringLiteral( "visibility" ) ) )
{
visibilyStr = jsonLayer.value( QStringLiteral( "visibility" ) ).toString();
}
else if ( jsonLayer.contains( QStringLiteral( "layout" ) ) && jsonLayer.value( QStringLiteral( "layout" ) ).userType() == QMetaType::Type::QVariantMap )
{
const QVariantMap jsonLayout = jsonLayer.value( QStringLiteral( "layout" ) ).toMap();
visibilyStr = jsonLayout.value( QStringLiteral( "visibility" ) ).toString();
}
const bool enabled = visibilyStr != QLatin1String( "none" );
QString filterExpression;
if ( jsonLayer.contains( QStringLiteral( "filter" ) ) )

82
tests/src/python/test_qgsmapboxglconverter.py
View File

@ -2209,6 +2209,88 @@ class TestQgsMapBoxGlStyleConverter(QgisTestCase):
'"direction"',
)
def test_parse_visibility(self):
context = QgsMapBoxGlStyleConversionContext()
style = {
"sources": {"Basemaps": {"type": "vector", "url": "https://xxxxxx"}},
"layers": [
{
"id": "at-layout-level-true",
"source": "streets",
"source-layer": "water",
"type": "fill",
"paint": {"fill-color": "#00ffff"},
"layout": {
"visibility": "visible",
"text-field": "{substance}",
},
},
{
"id": "at-layout-level-other",
"source": "streets",
"source-layer": "water",
"type": "fill",
"paint": {"fill-color": "#00ffff"},
"layout": {
"visibility": "anOtherText",
"text-field": "{substance}",
},
},
{
"id": "at-layout-level-false",
"source": "streets",
"source-layer": "water",
"type": "fill",
"paint": {"fill-color": "#00ffff"},
"layout": {
"visibility": "none",
"text-field": "{substance}",
},
},
{
"id": "at-root-level-true",
"source": "streets",
"source-layer": "water",
"type": "fill",
"paint": {"fill-color": "#00ffff"},
"visibility": "visible",
},
{
"id": "at-root-level-other",
"source": "streets",
"source-layer": "water",
"type": "fill",
"paint": {"fill-color": "#00ffff"},
"visibility": "anOtherText",
},
{
"id": "at-root-level-false",
"source": "streets",
"source-layer": "water",
"type": "fill",
"paint": {"fill-color": "#00ffff"},
"visibility": "none",
},
],
}
converter = QgsMapBoxGlStyleConverter()
converter.convert(style, context)
renderer = converter.renderer()
style = renderer.style(0)
self.assertEqual(style.isEnabled(), True)
style = renderer.style(1)
self.assertEqual(style.isEnabled(), True)
style = renderer.style(2)
self.assertEqual(style.isEnabled(), False)
style = renderer.style(3)
self.assertEqual(style.isEnabled(), True)
style = renderer.style(4)
self.assertEqual(style.isEnabled(), True)
style = renderer.style(5)
self.assertEqual(style.isEnabled(), False)
def test_parse_zoom_levels(self):
context = QgsMapBoxGlStyleConversionContext()
style = {