Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mvt] mapbox vector tiles conversion improvements #58154

Merged
merged 9 commits into from
Jul 24, 2024
Merged

[mvt] mapbox vector tiles conversion improvements #58154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6021e6d
[mvt] fix brush when color is data defined
3nids Jul 17, 2024
96ca449
fix match expression when single value is provided
3nids Jul 17, 2024
d723e6b
do not set an invalid color
3nids Jul 18, 2024
4dd28bf
add test for MVT conversion
3nids Jul 19, 2024
0c0b085
fix parseArray stops are open on both ends
3nids Jul 23, 2024
0497c57
fix test
3nids Jul 24, 2024
8848616
set transparent color as fallback
3nids Jul 24, 2024
8547fa5
test for colors
3nids Jul 24, 2024
98924d7
add tolerance
3nids Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 37 additions & 28 deletions src/core/vectortile/qgsmapboxglstyleconverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ bool QgsMapBoxGlStyleConverter::parseFillLayer( const QVariantMap &jsonLayer, Qg
QgsPropertyCollection ddProperties;
QgsPropertyCollection ddRasterProperties;

bool colorIsDataDefined = false;

std::unique_ptr< QgsSymbol > symbol( std::make_unique< QgsFillSymbol >() );

// fill color
Expand All @@ -244,6 +246,7 @@ bool QgsMapBoxGlStyleConverter::parseFillLayer( const QVariantMap &jsonLayer, Qg

case QMetaType::Type::QVariantList:
case QMetaType::Type::QStringList:
colorIsDataDefined = true;
ddProperties.setProperty( QgsSymbolLayer::Property::FillColor, parseValueList( jsonFillColor.toList(), PropertyType::Color, context, 1, 255, &fillColor ) );
break;

Expand Down Expand Up @@ -457,6 +460,10 @@ bool QgsMapBoxGlStyleConverter::parseFillLayer( const QVariantMap &jsonLayer, Qg
{
fillSymbol->setFillColor( fillColor );
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If fillColor isn't valid, then we'll be setting the fill symbol to an invalid QColor here... I don't think we want to do that!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What would you do? Move the check and do an else if?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain what it's trying to do here? I think ideally it'd be set to eg the first colour in the list

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm just trying to avoid to set "no brush" if it's data defined. So not setting it might be sufficient.

}
else if ( colorIsDataDefined )
{
fillSymbol->setFillColor( QColor( Qt::transparent ) );
}
else
{
fillSymbol->setBrushStyle( Qt::NoBrush );
Expand Down Expand Up @@ -2459,43 +2466,40 @@ QString QgsMapBoxGlStyleConverter::parseArrayStops( const QVariantList &stops, Q
if ( stops.length() < 2 )
return QString();

QString caseString = QStringLiteral( "CASE " );
QString caseString = QStringLiteral( "CASE" );

for ( int i = 0; i < stops.length() - 1; ++i )
for ( int i = 0; i < stops.length(); ++i )
{
// bottom zoom and value
const QVariant bz = stops.value( i ).toList().value( 0 );
const QList<QVariant> bv = stops.value( i ).toList().value( 1 ).toList();
QStringList bl;
caseString += QLatin1String( " WHEN " );
QStringList conditions;
if ( i > 0 )
nirvn marked this conversation as resolved.
Show resolved Hide resolved
{
const QVariant bottomZoom = stops.value( i ).toList().value( 0 );
conditions << QStringLiteral( "@vector_tile_zoom > %1" ).arg( bottomZoom.toString() );
}
if ( i < stops.length() - 1 )
{
const QVariant topZoom = stops.value( i + 1 ).toList().value( 0 );
conditions << QStringLiteral( "@vector_tile_zoom <= %1" ).arg( topZoom.toString() );
}

const QVariantList values = stops.value( i ).toList().value( 1 ).toList();
QStringList valuesFixed;
bool ok = false;
for ( const QVariant &value : bv )
for ( const QVariant &value : values )
{
const double number = value.toDouble( &ok );
if ( ok )
bl << QString::number( number * multiplier );
valuesFixed << QString::number( number * multiplier );
}

// top zoom and value
const QVariant tz = stops.value( i + 1 ).toList().value( 0 );
caseString += QStringLiteral( "WHEN @vector_tile_zoom > %1 AND @vector_tile_zoom <= %2 "
"THEN array(%3) " ).arg( bz.toString(),
tz.toString(),
bl.join( ',' ) );
caseString += QStringLiteral( "%1 THEN array(%3)" ).arg(
conditions.join( QStringLiteral( " AND " ) ),
valuesFixed.join( ',' )
);
}
const QVariant lz = stops.value( stops.length() - 1 ).toList().value( 0 );
const QList<QVariant> lv = stops.value( stops.length() - 1 ).toList().value( 1 ).toList();
QStringList ll;
bool ok = false;
for ( const QVariant &value : lv )
{
const double number = value.toDouble( &ok );
if ( ok )
ll << QString::number( number * multiplier );
}
caseString += QStringLiteral( "WHEN @vector_tile_zoom > %1 "
"THEN array(%2) " ).arg( lz.toString(),
ll.join( ',' ) );
caseString += QLatin1String( "END" );
caseString += QLatin1String( " END" );
return caseString;
}

Expand Down Expand Up @@ -2679,7 +2683,12 @@ QgsProperty QgsMapBoxGlStyleConverter::parseMatchList( const QVariantList &json,

for ( int i = 2; i < json.length() - 1; i += 2 )
{
const QVariantList keys = json.value( i ).toList();
QVariantList keys;
QVariant variantKeys = json.value( i );
if ( variantKeys.canConvert< QVariantList >() )
keys = variantKeys.toList();
else
keys = {variantKeys};

QStringList matchString;
for ( const QVariant &key : keys )
Expand Down
116 changes: 113 additions & 3 deletions tests/src/python/test_qgsmapboxglconverter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
)
import unittest
from qgis.testing import start_app, QgisTestCase
from qgis.core import qgsDoubleNear

from utilities import getTestFont, unitTestDataPath

Expand Down Expand Up @@ -179,6 +180,47 @@ def testParseMatchList(self):
'CASE WHEN "type" IN (\'Normal\') THEN 0.625 WHEN "type" IN (\'Index\') THEN 1.25 ELSE 0.5 END')
self.assertEqual(default_number, 0.5)

res, default_color, default_number = QgsMapBoxGlStyleConverter.parseMatchList([
"match",
[
"get",
"luminosity"
],
-15,
"rgb(200,210,213)",
-14,
"rgb(203,213,216)",
-13,
"rgb(207,215,218)",
-12,
"rgb(210,218,221)",
-11,
"rgb(213,221,224)",
-10,
"rgb(217,224,226)",
-9,
"rgb(220,227,229)",
-8,
"rgb(224,230,231)",
-7,
"rgb(227,232,234)",
-6,
"rgb(231,235,237)",
-5,
"rgb(234,238,239)",
-4,
"rgb(238,241,242)",
-3,
"rgb(241,244,245)",
-2,
"rgb(245,247,247)",
-1,
"rgb(248,249,250)",
"rgb(252, 252, 252)"
], QgsMapBoxGlStyleConverter.PropertyType.Color, conversion_context, 2.5, 200)
self.assertEqual(res.asExpression(), 'CASE WHEN "luminosity" IN (-15) THEN \'#c8d2d5\' WHEN "luminosity" IN (-14) THEN \'#cbd5d8\' WHEN "luminosity" IN (-13) THEN \'#cfd7da\' WHEN "luminosity" IN (-12) THEN \'#d2dadd\' WHEN "luminosity" IN (-11) THEN \'#d5dde0\' WHEN "luminosity" IN (-10) THEN \'#d9e0e2\' WHEN "luminosity" IN (-9) THEN \'#dce3e5\' WHEN "luminosity" IN (-8) THEN \'#e0e6e7\' WHEN "luminosity" IN (-7) THEN \'#e3e8ea\' WHEN "luminosity" IN (-6) THEN \'#e7ebed\' WHEN "luminosity" IN (-5) THEN \'#eaeeef\' WHEN "luminosity" IN (-4) THEN \'#eef1f2\' WHEN "luminosity" IN (-3) THEN \'#f1f4f5\' WHEN "luminosity" IN (-2) THEN \'#f5f7f7\' WHEN "luminosity" IN (-1) THEN \'#f8f9fa\' ELSE \'#fcfcfc\' END')
self.assertTrue(qgsDoubleNear(default_number, 0.0))

def testParseValueList(self):
conversion_context = QgsMapBoxGlStyleConversionContext()
res, default_color, default_number = QgsMapBoxGlStyleConverter.parseValueList([
Expand Down Expand Up @@ -749,11 +791,11 @@ def testParseArrayStops(self):

exp = QgsMapBoxGlStyleConverter.parseArrayStops([[0, [0, 1]], [2, [3, 4]]], conversion_context, 1)
self.assertEqual(exp,
'CASE WHEN @vector_tile_zoom > 0 AND @vector_tile_zoom <= 2 THEN array(0,1) WHEN @vector_tile_zoom > 2 THEN array(3,4) END')
'CASE WHEN @vector_tile_zoom <= 2 THEN array(0,1) WHEN @vector_tile_zoom > 2 THEN array(3,4) END')

exp = QgsMapBoxGlStyleConverter.parseArrayStops([[0, [0, 1]], [2, [3, 4]]], conversion_context, 2)
self.assertEqual(exp,
'CASE WHEN @vector_tile_zoom > 0 AND @vector_tile_zoom <= 2 THEN array(0,2) WHEN @vector_tile_zoom > 2 THEN array(6,8) END')
'CASE WHEN @vector_tile_zoom <= 2 THEN array(0,2) WHEN @vector_tile_zoom > 2 THEN array(6,8) END')

def testParseLineDashArray(self):
conversion_context = QgsMapBoxGlStyleConversionContext()
Expand Down Expand Up @@ -786,7 +828,7 @@ def testParseLineDashArray(self):
self.assertEqual(dd_properties.property(QgsSymbolLayer.Property.PropertyStrokeWidth).asExpression(),
"CASE WHEN @vector_tile_zoom >= 10 AND @vector_tile_zoom <= 11 THEN (1.5) + ((1.2^(@vector_tile_zoom - 10) - 1) / (1.2^(11 - 10) - 1)) * ((2) - (1.5)) WHEN @vector_tile_zoom > 11 AND @vector_tile_zoom <= 12 THEN (2) + ((1.2^(@vector_tile_zoom - 11) - 1) / (1.2^(12 - 11) - 1)) * ((3) - (2)) WHEN @vector_tile_zoom > 12 AND @vector_tile_zoom <= 13 THEN (3) + ((1.2^(@vector_tile_zoom - 12) - 1) / (1.2^(13 - 12) - 1)) * ((5) - (3)) WHEN @vector_tile_zoom > 13 AND @vector_tile_zoom <= 14 THEN (5) + ((1.2^(@vector_tile_zoom - 13) - 1) / (1.2^(14 - 13) - 1)) * ((6) - (5)) WHEN @vector_tile_zoom > 14 AND @vector_tile_zoom <= 16 THEN (6) + ((1.2^(@vector_tile_zoom - 14) - 1) / (1.2^(16 - 14) - 1)) * ((10) - (6)) WHEN @vector_tile_zoom > 16 AND @vector_tile_zoom <= 17 THEN (10) + ((1.2^(@vector_tile_zoom - 16) - 1) / (1.2^(17 - 16) - 1)) * ((12) - (10)) WHEN @vector_tile_zoom > 17 THEN 12 END")
self.assertEqual(dd_properties.property(QgsSymbolLayer.Property.PropertyCustomDash).asExpression(),
"array_to_string(array_foreach(CASE WHEN @vector_tile_zoom > 10 AND @vector_tile_zoom <= 17 THEN array(1,1) WHEN @vector_tile_zoom > 17 THEN array(0.3,0.2) END,@element * (CASE WHEN @vector_tile_zoom >= 10 AND @vector_tile_zoom <= 11 THEN (1.5) + ((1.2^(@vector_tile_zoom - 10) - 1) / (1.2^(11 - 10) - 1)) * ((2) - (1.5)) WHEN @vector_tile_zoom > 11 AND @vector_tile_zoom <= 12 THEN (2) + ((1.2^(@vector_tile_zoom - 11) - 1) / (1.2^(12 - 11) - 1)) * ((3) - (2)) WHEN @vector_tile_zoom > 12 AND @vector_tile_zoom <= 13 THEN (3) + ((1.2^(@vector_tile_zoom - 12) - 1) / (1.2^(13 - 12) - 1)) * ((5) - (3)) WHEN @vector_tile_zoom > 13 AND @vector_tile_zoom <= 14 THEN (5) + ((1.2^(@vector_tile_zoom - 13) - 1) / (1.2^(14 - 13) - 1)) * ((6) - (5)) WHEN @vector_tile_zoom > 14 AND @vector_tile_zoom <= 16 THEN (6) + ((1.2^(@vector_tile_zoom - 14) - 1) / (1.2^(16 - 14) - 1)) * ((10) - (6)) WHEN @vector_tile_zoom > 16 AND @vector_tile_zoom <= 17 THEN (10) + ((1.2^(@vector_tile_zoom - 16) - 1) / (1.2^(17 - 16) - 1)) * ((12) - (10)) WHEN @vector_tile_zoom > 17 THEN 12 END)), ';')")
"array_to_string(array_foreach(CASE WHEN @vector_tile_zoom <= 17 THEN array(1,1) WHEN @vector_tile_zoom > 17 THEN array(0.3,0.2) END,@element * (CASE WHEN @vector_tile_zoom >= 10 AND @vector_tile_zoom <= 11 THEN (1.5) + ((1.2^(@vector_tile_zoom - 10) - 1) / (1.2^(11 - 10) - 1)) * ((2) - (1.5)) WHEN @vector_tile_zoom > 11 AND @vector_tile_zoom <= 12 THEN (2) + ((1.2^(@vector_tile_zoom - 11) - 1) / (1.2^(12 - 11) - 1)) * ((3) - (2)) WHEN @vector_tile_zoom > 12 AND @vector_tile_zoom <= 13 THEN (3) + ((1.2^(@vector_tile_zoom - 12) - 1) / (1.2^(13 - 12) - 1)) * ((5) - (3)) WHEN @vector_tile_zoom > 13 AND @vector_tile_zoom <= 14 THEN (5) + ((1.2^(@vector_tile_zoom - 13) - 1) / (1.2^(14 - 13) - 1)) * ((6) - (5)) WHEN @vector_tile_zoom > 14 AND @vector_tile_zoom <= 16 THEN (6) + ((1.2^(@vector_tile_zoom - 14) - 1) / (1.2^(16 - 14) - 1)) * ((10) - (6)) WHEN @vector_tile_zoom > 16 AND @vector_tile_zoom <= 17 THEN (10) + ((1.2^(@vector_tile_zoom - 16) - 1) / (1.2^(17 - 16) - 1)) * ((12) - (10)) WHEN @vector_tile_zoom > 17 THEN 12 END)), ';')")

def testParseLineDashArrayOddNumber(self):
conversion_context = QgsMapBoxGlStyleConversionContext()
Expand Down Expand Up @@ -1293,6 +1335,74 @@ def testFillOpacityWithStops(self):
prop = dd_props.property(QgsSymbolLayer.Property.PropertyFillColor)
self.assertEqual(prop.asExpression(), 'CASE WHEN @vector_tile_zoom < 0 THEN color_hsla(66, 25, 85, 255) WHEN @vector_tile_zoom >= 0 AND @vector_tile_zoom < 8 THEN color_hsla(66, 25, 85, 255) WHEN @vector_tile_zoom >= 8 AND @vector_tile_zoom < 14 THEN color_hsla(66, 25, 85, 255) WHEN @vector_tile_zoom >= 14 AND @vector_tile_zoom < 15 THEN color_hsla(66, scale_linear(@vector_tile_zoom,14,15,25,21), scale_linear(@vector_tile_zoom,14,15,85,90), 255) WHEN @vector_tile_zoom >= 15 AND @vector_tile_zoom < 17 THEN color_hsla(scale_linear(@vector_tile_zoom,15,17,66,67), scale_linear(@vector_tile_zoom,15,17,21,23), scale_linear(@vector_tile_zoom,15,17,90,93), 255) WHEN @vector_tile_zoom >= 17 THEN color_hsla(67, 23, 93, 255) ELSE color_hsla(67, 23, 93, 255) END')

def testFillColorDDHasBrush(self):
context = QgsMapBoxGlStyleConversionContext()
# from https://vectortiles.geo.admin.ch/styles/ch.swisstopo.basemap.vt/style.json
style = {
"id": "building_fill",
"type": "fill",
"source": "base_v1.0.0",
"source-layer": "building",
"minzoom": 14.0,
"layout": {
"visibility": "visible"
},
"paint": {
"fill-color": [
"interpolate",
[
"linear"
],
[
"zoom"
],
14,
[
"match",
[
"get",
"class"
],
[
"roof",
"cooling_tower"
],
"rgb(210, 210, 214)",
"rgba(184, 184, 188, 1)"
],
16,
[
"match",
[
"get",
"class"
],
[
"roof",
"cooling_tower"
],
"rgb(210, 210, 214)",
"rgba(184, 184, 188, 1)"
]
],
"fill-opacity": 1
},
"filter": [
"all",
[
"!=",
"class",
"covered_bridge"
]
]
}
has_renderer, renderer = QgsMapBoxGlStyleConverter.parseFillLayer(style, context)
self.assertTrue(has_renderer)
self.assertEqual(renderer.symbol()[0].brushStyle(), Qt.BrushStyle.SolidPattern)
dd_props = renderer.symbol()[0].dataDefinedProperties()
prop = dd_props.property(QgsSymbolLayer.Property.PropertyFillColor)
self.assertEqual(prop.asExpression(), 'CASE WHEN @vector_tile_zoom >= 14 AND @vector_tile_zoom < 16 THEN color_hsla(color_part(CASE WHEN "class" IN (\'roof\', \'cooling_tower\') THEN color_rgba(210,210,214,255) ELSE color_rgba(184,184,188,255) END,\'hsl_hue\'), color_part(CASE WHEN "class" IN (\'roof\', \'cooling_tower\') THEN color_rgba(210,210,214,255) ELSE color_rgba(184,184,188,255) END,\'hsl_saturation\'), color_part(CASE WHEN "class" IN (\'roof\', \'cooling_tower\') THEN color_rgba(210,210,214,255) ELSE color_rgba(184,184,188,255) END,\'lightness\'), color_part(CASE WHEN "class" IN (\'roof\', \'cooling_tower\') THEN color_rgba(210,210,214,255) ELSE color_rgba(184,184,188,255) END,\'alpha\')) WHEN @vector_tile_zoom >= 16 THEN color_hsla(color_part(CASE WHEN "class" IN (\'roof\', \'cooling_tower\') THEN color_rgba(210,210,214,255) ELSE color_rgba(184,184,188,255) END,\'hsl_hue\'), color_part(CASE WHEN "class" IN (\'roof\', \'cooling_tower\') THEN color_rgba(210,210,214,255) ELSE color_rgba(184,184,188,255) END,\'hsl_saturation\'), color_part(CASE WHEN "class" IN (\'roof\', \'cooling_tower\') THEN color_rgba(210,210,214,255) ELSE color_rgba(184,184,188,255) END,\'lightness\'), color_part(CASE WHEN "class" IN (\'roof\', \'cooling_tower\') THEN color_rgba(210,210,214,255) ELSE color_rgba(184,184,188,255) END,\'alpha\')) ELSE color_hsla(color_part(CASE WHEN "class" IN (\'roof\', \'cooling_tower\') THEN color_rgba(210,210,214,255) ELSE color_rgba(184,184,188,255) END,\'hsl_hue\'), color_part(CASE WHEN "class" IN (\'roof\', \'cooling_tower\') THEN color_rgba(210,210,214,255) ELSE color_rgba(184,184,188,255) END,\'hsl_saturation\'), color_part(CASE WHEN "class" IN (\'roof\', \'cooling_tower\') THEN color_rgba(210,210,214,255) ELSE color_rgba(184,184,188,255) END,\'lightness\'), color_part(CASE WHEN "class" IN (\'roof\', \'cooling_tower\') THEN color_rgba(210,210,214,255) ELSE color_rgba(184,184,188,255) END,\'alpha\')) END')


if __name__ == '__main__':
unittest.main()
Loading