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

[mvt] use scale_exponential expression

Browse Source
This commit is contained in:
Denis Rouzaud 2024-09-27 05:21:12 +02:00
parent 2bd635461a
commit edeb2a938d
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2497,10 +2497,11 @@ QgsProperty QgsMapBoxGlStyleConverter::parseInterpolateOpacityByZoom( const QVar
double top = 0.0; double top = 0.0;
const bool numeric = numericArgumentsOnly( bv, tv, bottom, top ); const bool numeric = numericArgumentsOnly( bv, tv, bottom, top );
scaleExpression = QStringLiteral( "set_color_part(@symbol_color, 'alpha', %1)" ) scaleExpression = QStringLiteral( "set_color_part(@symbol_color, 'alpha', %1)" )
.arg( interpolateExpression( stops.value( 0 ).toList().value( 0 ).toDouble(), .arg( interpolateExpression(
stops.last().toList().value( 0 ).toDouble(), stops.value( 0 ).toList().value( 0 ).toDouble(),
numeric ? QString::number( bottom * maxOpacity ) : QString( "(%1) * %2" ).arg( parseValue( bv, context ) ).arg( maxOpacity ), stops.last().toList().value( 0 ).toDouble(),
numeric ? QString::number( top * maxOpacity ) : QString( "(%1) * %2" ).arg( parseValue( tv, context ) ).arg( maxOpacity ), base, 1, &context ) ); numeric ? QString::number( bottom * maxOpacity ) : QString( "(%1) * %2" ).arg( parseValue( bv, context ) ).arg( maxOpacity ),
numeric ? QString::number( top * maxOpacity ) : QString( "(%1) * %2" ).arg( parseValue( tv, context ) ).arg( maxOpacity ), base, 1, &context ) );
} }
else else
{ {
@ -2527,11 +2528,12 @@ QString QgsMapBoxGlStyleConverter::parseOpacityStops( double base, const QVarian
"THEN set_color_part(@symbol_color, 'alpha', %3)" ) "THEN set_color_part(@symbol_color, 'alpha', %3)" )
.arg( stops.value( i ).toList().value( 0 ).toString(), .arg( stops.value( i ).toList().value( 0 ).toString(),
stops.value( i + 1 ).toList().value( 0 ).toString(), stops.value( i + 1 ).toList().value( 0 ).toString(),
interpolateExpression( stops.value( i ).toList().value( 0 ).toDouble(), interpolateExpression(
stops.value( i + 1 ).toList().value( 0 ).toDouble(), stops.value( i ).toList().value( 0 ).toDouble(),
numeric ? QString::number( bottom * maxOpacity ) : QString( "(%1) * %2" ).arg( parseValue( bv, context ) ).arg( maxOpacity ), stops.value( i + 1 ).toList().value( 0 ).toDouble(),
numeric ? QString::number( top * maxOpacity ) : QString( "(%1) * %2" ).arg( parseValue( tv, context ) ).arg( maxOpacity ), numeric ? QString::number( bottom * maxOpacity ) : QString( "(%1) * %2" ).arg( parseValue( bv, context ) ).arg( maxOpacity ),
base, 1, &context ) ); numeric ? QString::number( top * maxOpacity ) : QString( "(%1) * %2" ).arg( parseValue( tv, context ) ).arg( maxOpacity ),
base, 1, &context ) );
} }
@ -3217,23 +3219,11 @@ QString QgsMapBoxGlStyleConverter::interpolateExpression( double zoomMin, double
{ {
if ( base == 1 ) if ( base == 1 )
{ {
expression = QStringLiteral( "scale_linear(@vector_tile_zoom,%1,%2,%3,%4)" ).arg( zoomMin ) expression = QStringLiteral( "scale_linear(@vector_tile_zoom,%1,%2,%3,%4)" ).arg( zoomMin ).arg( zoomMax ).arg( minValueExpr ).arg( maxValueExpr );
.arg( zoomMax )
.arg( minValueExpr )
.arg( maxValueExpr );
} }
else else
{ {
// use formula to scale value exponentially as scale_exp expression function expression = QStringLiteral( "scale_exponential(@vector_tile_zoom,%1,%2,%3,%4,%5)" ).arg( zoomMin ).arg( zoomMax ).arg( minValueExpr ).arg( maxValueExpr ).arg( base );
// gives wrong resutls, see https://github.com/qgis/QGIS/pull/53164
QString ratioExpr = QStringLiteral( "(%1^(@vector_tile_zoom - %2) - 1) / (%1^(%3 - %2) - 1)" ).arg( base ).arg( zoomMin ).arg( zoomMax );
expression = QStringLiteral( "(%1) + (%2) * ((%3) - (%1))" ).arg( minValueExpr ).arg( ratioExpr ).arg( maxValueExpr );
// can be uncommented when scale_exponential expression function gets to the old LTR
//expression = QStringLiteral( "scale_exponential(@vector_tile_zoom,%1,%2,%3,%4,%5)" ).arg( zoomMin )
// .arg( zoomMax )
// .arg( minValueExpr )
// .arg( maxValueExpr )
// .arg( base );
} }
} }