Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #45037 from mhugent/mvt_expressions_interpolate
Mvt expressions interpolate
  • Loading branch information
mhugent committed Sep 28, 2021
2 parents 95320d2 + abbdbe2 commit de5ab29
Show file tree
Hide file tree
Showing 4 changed files with 274 additions and 79 deletions.
Expand Up @@ -347,7 +347,7 @@ Parses a numeric value which is interpolated by zoom range.
- defaultNumber: storage for a reasonable "default" number representing the overall property.
%End

static QgsProperty parseInterpolateOpacityByZoom( const QVariantMap &json, int maxOpacity );
static QgsProperty parseInterpolateOpacityByZoom( const QVariantMap &json, int maxOpacity, QgsMapBoxGlStyleConversionContext *contextPtr = 0 );
%Docstring
Interpolates opacity with either :py:func:`~QgsMapBoxGlStyleConverter.scale_linear` or :py:func:`~QgsMapBoxGlStyleConverter.scale_exp` (depending on base value).
For ``json`` with intermediate stops it uses :py:func:`~QgsMapBoxGlStyleConverter.parseOpacityStops` function.
Expand All @@ -358,7 +358,7 @@ It uses QGIS :py:func:`~QgsMapBoxGlStyleConverter.set_color_part` function to se
This is private API only, and may change in future QGIS versions
%End

static QString parseOpacityStops( double base, const QVariantList &stops, int maxOpacity );
static QString parseOpacityStops( double base, const QVariantList &stops, int maxOpacity, QgsMapBoxGlStyleConversionContext &context );
%Docstring
Takes values from stops and uses either :py:func:`~QgsMapBoxGlStyleConverter.scale_linear` or :py:func:`~QgsMapBoxGlStyleConverter.scale_exp` functions
to interpolate alpha component of color.
Expand Down Expand Up @@ -457,6 +457,17 @@ Interpolates a list which starts with the interpolate function.
This is private API only, and may change in future QGIS versions
%End

static QString parseColorExpression( const QVariant &colorExpression, QgsMapBoxGlStyleConversionContext &context );
%Docstring
Converts an expression representing a color to a string (can be color string or an expression where a color is expected)

:param colorExpression: the color expression
:param context: the style conversion context

:return: the QGIS expression string
since QGIS 3.22
%End

static QColor parseColor( const QVariant &color, QgsMapBoxGlStyleConversionContext &context );
%Docstring
Parses a ``color`` in one of these supported formats:
Expand Down Expand Up @@ -487,7 +498,7 @@ Takes a QColor object and returns HSLA components in required format for QGIS :p
This is private API only, and may change in future QGIS versions
%End

static QString interpolateExpression( double zoomMin, double zoomMax, double valueMin, double valueMax, double base, double multiplier = 1 );
static QString interpolateExpression( double zoomMin, double zoomMax, QVariant valueMin, QVariant valueMax, double base, double multiplier = 1, QgsMapBoxGlStyleConversionContext *contextPtr = 0 );
%Docstring
Generates an interpolation for values between ``valueMin`` and ``valueMax``, scaled between the
ranges ``zoomMin`` to ``zoomMax``.
Expand Down Expand Up @@ -515,7 +526,7 @@ Converts a value to Qt.PenJoinStyle enum from JSON value.
This is private API only, and may change in future QGIS versions
%End

static QString parseExpression( const QVariantList &expression, QgsMapBoxGlStyleConversionContext &context );
static QString parseExpression( const QVariantList &expression, QgsMapBoxGlStyleConversionContext &context, bool colorExpected = false );
%Docstring
Converts a MapBox GL expression to a QGIS expression.

Expand Down

0 comments on commit de5ab29

Please sign in to comment.