Mapbox GL style converter: allow attribute defined value for icon-rot…

…ate and other properties (fixes #45021)
qgis · Oct 4, 2021 · 5b47d46 · 5b47d46
1 parent a0af938
commit 5b47d46
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/core/vectortile/qgsmapboxglstyleconverter.cpp b/src/core/vectortile/qgsmapboxglstyleconverter.cpp
@@ -2334,8 +2334,7 @@ QgsProperty QgsMapBoxGlStyleConverter::parseValueList( const QVariantList &json,
   }
   else
   {
-    context.pushWarning( QObject::tr( "%1: Could not interpret value list with method %2" ).arg( context.layerId(), method ) );
-    return QgsProperty();
+    return QgsProperty::fromExpression( parseExpression( json, context ) );
   }
 }
 

diff --git a/tests/src/python/test_qgsmapboxglconverter.py b/tests/src/python/test_qgsmapboxglconverter.py
@@ -12,9 +12,11 @@
 
 import qgis  # NOQA
 
-from qgis.PyQt.QtGui import (QColor)
+from qgis.PyQt.QtCore import QSize
+from qgis.PyQt.QtGui import (QColor, QImage)
 from qgis.core import (QgsMapBoxGlStyleConverter,
                        QgsMapBoxGlStyleConversionContext,
+                       QgsSymbolLayer,
                        QgsWkbTypes,
                        QgsEffectStack
                        )
@@ -586,6 +588,30 @@ def testConvertLabels(self):
         self.assertEqual(labeling.labelSettings().fieldName, '''lower(concat(concat("name_en",' - ',"name_fr"),"bar"))''')
         self.assertTrue(labeling.labelSettings().isExpression)
 
+    def testDataDefinedIconRotate(self):
+        """ Test icon-rotate property that depends on a data attribute """
+        context = QgsMapBoxGlStyleConversionContext()
+
+        image = QImage(QSize(1, 1), QImage.Format_ARGB32)
+        context.setSprites(image, {"foo": {"x": 0, "y": 0, "width": 1, "height": 1, "pixelRatio": 1}})
+        style = {
+            "layout": {
+                "icon-image": "{foo}",
+                "icon-rotate": ["get", "ROTATION"],
+                "text-size": 11,
+                "icon-size": 1
+            },
+            "type": "symbol",
+            "id": "poi_label",
+            "source-layer": "poi_label"
+        }
+        renderer, has_renderer, labeling, has_labeling = QgsMapBoxGlStyleConverter.parseSymbolLayer(style, context)
+        self.assertTrue(has_renderer)
+        self.assertFalse(has_labeling)
+        dd_props = renderer.symbol().symbolLayers()[0].dataDefinedProperties()
+        prop = dd_props.property(QgsSymbolLayer.PropertyAngle)
+        self.assertEqual(prop.asExpression(), '"ROTATION"')
+
     def testCircleLayer(self):
         context = QgsMapBoxGlStyleConversionContext()
         style = {