[mvt] fix opacity incorrectly for low scale

if the opactiy was defined by expression on the lower scale bound, it was incorrectly set to 0
qgis · Sep 26, 2024 · 7068974 · 7068974
1 parent da1f55b
commit 7068974
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/src/core/vectortile/qgsmapboxglstyleconverter.cpp b/src/core/vectortile/qgsmapboxglstyleconverter.cpp
@@ -2432,10 +2432,12 @@ QgsProperty QgsMapBoxGlStyleConverter::parseInterpolateByZoom( const QVariantMap
   QString scaleExpression;
   if ( stops.size() <= 2 )
   {
-    scaleExpression = interpolateExpression( stops.value( 0 ).toList().value( 0 ).toDouble(),
-                      stops.last().toList().value( 0 ).toDouble(),
-                      stops.value( 0 ).toList().value( 1 ),
-                      stops.last().toList().value( 1 ), base, multiplier, &context );
+    scaleExpression = interpolateExpression(
+                        stops.value( 0 ).toList().value( 0 ).toDouble(), // zoomMin
+                        stops.last().toList().value( 0 ).toDouble(), // zoomMax
+                        stops.value( 0 ).toList().value( 1 ), // valueMin
+                        stops.last().toList().value( 1 ), // valueMax
+                        base, multiplier, &context );
   }
   else
   {
@@ -2506,10 +2508,16 @@ QString QgsMapBoxGlStyleConverter::parseOpacityStops( double base, const QVarian
                             base, 1, &context ) );
   }
 
+
+  bool numeric = false;
+  const QVariant vv = stops.last().toList().value( 1 );
+  double dv = vv.toDouble( &numeric );
+
   caseString += QStringLiteral( " WHEN @vector_tile_zoom >= %1 "
-                                "THEN set_color_part(@symbol_color, 'alpha', %2) END" )
-                .arg( stops.last().toList().value( 0 ).toString() )
-                .arg( stops.last().toList().value( 1 ).toDouble() * maxOpacity );
+                                "THEN set_color_part(@symbol_color, 'alpha', %2) END" ).arg(
+                  stops.last().toList().value( 0 ).toString(),
+                  numeric ? QString::number( dv * maxOpacity ) : QString( "(%1) * %2" ).arg( parseValue( vv, context ) ).arg( maxOpacity )
+                );
   return caseString;
 }
 

diff --git a/tests/src/python/test_qgsmapboxglconverter.py b/tests/src/python/test_qgsmapboxglconverter.py
@@ -385,6 +385,16 @@ def testInterpolateOpacityByZoom(self):
                                                                                  conversion_context).expressionString(),
                          "set_color_part(@symbol_color, 'alpha', 25.5)")
 
+        self.assertEqual(QgsMapBoxGlStyleConverter.parseInterpolateOpacityByZoom({'base': 2,
+                                                                                  'stops': [
+                                                                                      10, 0,
+                                                                                      11, ["match", ["get", "class"], ["path"], ["match", ["get", "is_route"], 11, 1, 0], 0],
+                                                                                      12, ["match", ["get", "class"], ["path"], ["match", ["get", "is_route"], 11, 1, ["match", ["get", "sac_scale"], ["hiking", "mountain_hiking", "alpine_hiking"], 1, 0]], 0],
+                                                                                      13, ["match", ["get", "class"], ["path"], 1, 0.5]]
+                                                                                  }, 255,
+                                                                                 conversion_context).expressionString(),
+                         '''CASE WHEN @vector_tile_zoom <  THEN set_color_part(@symbol_color, 'alpha', 0) WHEN @vector_tile_zoom >=  AND @vector_tile_zoom <  THEN set_color_part(@symbol_color, 'alpha', () * 255) WHEN @vector_tile_zoom >=  AND @vector_tile_zoom <  THEN set_color_part(@symbol_color, 'alpha', () * 255) WHEN @vector_tile_zoom >=  AND @vector_tile_zoom < match THEN set_color_part(@symbol_color, 'alpha', (() * 255) + ((2^(@vector_tile_zoom - 0) - 1) / (2^(0 - 0) - 1)) * ((("class") * 255) - (() * 255))) WHEN @vector_tile_zoom >= match AND @vector_tile_zoom <  THEN set_color_part(@symbol_color, 'alpha', (("class") * 255) + ((2^(@vector_tile_zoom - 0) - 1) / (2^(0 - 0) - 1)) * ((() * 255) - (("class") * 255))) WHEN @vector_tile_zoom >=  AND @vector_tile_zoom < match THEN set_color_part(@symbol_color, 'alpha', (() * 255) + ((2^(@vector_tile_zoom - 0) - 1) / (2^(0 - 0) - 1)) * ((("class") * 255) - (() * 255))) WHEN @vector_tile_zoom >= match AND @vector_tile_zoom <  THEN set_color_part(@symbol_color, 'alpha', (("class") * 255) + ((2^(@vector_tile_zoom - 0) - 1) / (2^(0 - 0) - 1)) * ((() * 255) - (("class") * 255))) WHEN @vector_tile_zoom >=  AND @vector_tile_zoom < match THEN set_color_part(@symbol_color, 'alpha', (() * 255) + ((2^(@vector_tile_zoom - 0) - 1) / (2^(0 - 0) - 1)) * ((("class") * 255) - (() * 255))) WHEN @vector_tile_zoom >= match THEN set_color_part(@symbol_color, 'alpha', ("class") * 255) END''')
+
     def testInterpolateListByZoom(self):
         conversion_context = QgsMapBoxGlStyleConversionContext()
         prop, default_color, default_val = QgsMapBoxGlStyleConverter.parseInterpolateListByZoom([