Support % and to-number and keys which are expressions

qgis · Dec 23, 2021 · 2018b40 · 2018b40
1 parent f776cf8
commit 2018b40
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/src/core/vectortile/qgsmapboxglstyleconverter.cpp b/src/core/vectortile/qgsmapboxglstyleconverter.cpp
@@ -2760,6 +2760,14 @@ Qt::PenJoinStyle QgsMapBoxGlStyleConverter::parseJoinStyle( const QString &style
 QString QgsMapBoxGlStyleConverter::parseExpression( const QVariantList &expression, QgsMapBoxGlStyleConversionContext &context, bool colorExpected )
 {
   QString op = expression.value( 0 ).toString();
+  if ( op == QLatin1String( "%" ) && expression.size() >= 3 )
+  {
+    return QStringLiteral( "%1 %2 %3" ).arg( parseValue( expression.value( 1 ), context ) ).arg( op ).arg( parseValue( expression.value( 2 ), context ) );
+  }
+  else if ( op == QLatin1String( "to-number" ) )
+  {
+    return QStringLiteral( "to_real(%1)" ).arg( parseValue( expression.value( 1 ), context ) );
+  }
   if ( op == QLatin1String( "literal" ) )
   {
     return expression.value( 1 ).toString();
@@ -2797,7 +2805,7 @@ QString QgsMapBoxGlStyleConverter::parseExpression( const QVariantList &expressi
     QVariantList contraJsonExpr = expression.value( 1 ).toList();
     contraJsonExpr[0] = QString( op + contraJsonExpr[0].toString() );
     // ['!', ['has', 'level']] -> ['!has', 'level']
-    return parseKey( contraJsonExpr );
+    return parseKey( contraJsonExpr, context );
   }
   else if ( op == QLatin1String( "==" )
             || op == QLatin1String( "!=" )
@@ -2811,20 +2819,20 @@ QString QgsMapBoxGlStyleConverter::parseExpression( const QVariantList &expressi
       op = QStringLiteral( "IS" );
     else if ( op == QLatin1String( "!=" ) )
       op = QStringLiteral( "IS NOT" );
-    return QStringLiteral( "%1 %2 %3" ).arg( parseKey( expression.value( 1 ) ),
+    return QStringLiteral( "%1 %2 %3" ).arg( parseKey( expression.value( 1 ), context ),
            op, parseValue( expression.value( 2 ), context ) );
   }
   else if ( op == QLatin1String( "has" ) )
   {
-    return parseKey( expression.value( 1 ) ) + QStringLiteral( " IS NOT NULL" );
+    return parseKey( expression.value( 1 ), context ) + QStringLiteral( " IS NOT NULL" );
   }
   else if ( op == QLatin1String( "!has" ) )
   {
-    return parseKey( expression.value( 1 ) ) + QStringLiteral( " IS NULL" );
+    return parseKey( expression.value( 1 ), context ) + QStringLiteral( " IS NULL" );
   }
   else if ( op == QLatin1String( "in" ) || op == QLatin1String( "!in" ) )
   {
-    const QString key = parseKey( expression.value( 1 ) );
+    const QString key = parseKey( expression.value( 1 ), context );
     QStringList parts;
     for ( int i = 2; i < expression.size(); ++i )
     {
@@ -2843,7 +2851,7 @@ QString QgsMapBoxGlStyleConverter::parseExpression( const QVariantList &expressi
   }
   else if ( op == QLatin1String( "get" ) )
   {
-    return parseKey( expression.value( 1 ) );
+    return parseKey( expression.value( 1 ), context );
   }
   else if ( op == QLatin1String( "match" ) )
   {
@@ -3173,11 +3181,17 @@ QString QgsMapBoxGlStyleConverter::parseValueCheckColor( const QVariant &value,
   return parseValue( value, context );
 }
 
-QString QgsMapBoxGlStyleConverter::parseKey( const QVariant &value )
+QString QgsMapBoxGlStyleConverter::parseKey( const QVariant &value, QgsMapBoxGlStyleConversionContext &context )
 {
   if ( value.toString() == QLatin1String( "$type" ) )
+  {
     return QStringLiteral( "_geom_type" );
-  else if ( value.type() == QVariant::List || value.type() == QVariant::StringList )
+  }
+  if ( value.toString() == QLatin1String( "level" ) )
+  {
+    return QStringLiteral( "level" );
+  }
+  else if ( ( value.type() == QVariant::List && value.toList().size() == 1 ) || value.type() == QVariant::StringList )
   {
     if ( value.toList().size() > 1 )
       return value.toList().at( 1 ).toString();
@@ -3191,6 +3205,10 @@ QString QgsMapBoxGlStyleConverter::parseKey( const QVariant &value )
       return valueString;
     }
   }
+  else if ( value.type() == QVariant::List && value.toList().size() > 1 )
+  {
+    return parseExpression( value.toList(), context );
+  }
   return QgsExpression::quotedColumnRef( value.toString() );
 }
 

diff --git a/src/core/vectortile/qgsmapboxglstyleconverter.h b/src/core/vectortile/qgsmapboxglstyleconverter.h
@@ -550,7 +550,7 @@ class CORE_EXPORT QgsMapBoxGlStyleConverter
      * Checks if value is a color before calling parseValue
      */
     static QString parseValueCheckColor( const QVariant &value, QgsMapBoxGlStyleConversionContext &context );
-    static QString parseKey( const QVariant &value );
+    static QString parseKey( const QVariant &value, QgsMapBoxGlStyleConversionContext &context );
 
     /**
      * Checks if interpolation bottom/top values are numeric values

diff --git a/tests/src/python/test_qgsmapboxglconverter.py b/tests/src/python/test_qgsmapboxglconverter.py
@@ -353,6 +353,12 @@ def testParseExpression(self):
         self.assertEqual(QgsMapBoxGlStyleConverter.parseExpression(["to-string", ["get", "name"]],
                                                                    conversion_context),
                          '''to_string("name")''')
+        self.assertEqual(QgsMapBoxGlStyleConverter.parseExpression(["to-number", ["get", "elevation"]],
+                                                                   conversion_context),
+                         '''to_real("elevation")''')
+        self.assertEqual(QgsMapBoxGlStyleConverter.parseExpression(["%", 100, 20],
+                                                                   conversion_context),
+                         '''100 % 20''')
 
     def testConvertLabels(self):
         context = QgsMapBoxGlStyleConversionContext()