Fix raw expression parsing for list literal. (#1629) (#1632)

* Fix raw expression parsing for list literal. (#1629) * Update CHANGELOG.md
mapbox · Apr 17, 2023 · 9a297ca · 9a297ca
1 parent 8cf3052
commit 9a297ca
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ Mapbox welcomes participation and contributions from everyone.
 
 ## Bug fixes 🐞
 * Fix 3d location layer properties `model-scale-transition` and `model-rotation-transition`, made them non-transitionable.
+* Fix raw expression parsing for list literal.
 
 
 # 10.13.0-beta.1 April 05, 2023

diff --git a/...pp/src/androidTestPublic/java/com/mapbox/maps/testapp/style/expressions/ExpressionTest.kt b/...pp/src/androidTestPublic/java/com/mapbox/maps/testapp/style/expressions/ExpressionTest.kt
@@ -1874,6 +1874,23 @@ class ExpressionTest : BaseStyleTest() {
     assertEquals(expression.toString(), layer.textColorAsExpression.toString())
   }
 
+  /**
+   * Test constructing an match Expression from raw string.
+   */
+  @Test
+  @UiThreadTest
+  fun rawMatchExpressionTest() {
+    val expressionString = """
+      ["match",["get","data_property"],[0,1],true,false]
+    """.trimIndent()
+    val expression = Expression.fromRaw(expressionString)
+    val layer = symbolLayer("id", "source") {
+      filter(expression)
+    }
+    setupLayer(layer)
+    assertEquals(expressionString, layer.filter!!.toJson())
+  }
+
   /**
    * Returns the shortest distance in meters between the evaluated feature and the input geometry. The input value can be a valid GeoJSON of type Point, MultiPoint, LineString, MultiLineString, Polygon, MultiPolygon, Feature, or FeatureCollection. Distance values returned may vary in precision due to loss in precision from encoding geometries, particularly below zoom level 13.
    */

diff --git a/extension-style/src/main/java/com/mapbox/maps/extension/style/utils/TypeUtils.kt b/extension-style/src/main/java/com/mapbox/maps/extension/style/utils/TypeUtils.kt
@@ -232,7 +232,7 @@ fun Value.unwrapToExpression(): Expression {
     is List<*> -> {
       @Suppress("UNCHECKED_CAST")
       val listValue = input as List<Value>
-      val operator = listValue.first().contents as String
+      val operator = listValue.first().contents as? String ?: return Expression(input)
       if ("literal" == operator) {
         when (val literalValue = listValue.last().contents) {
           is List<*> -> {

diff --git a/extension-style/src/test/java/com/mapbox/maps/extension/style/utils/TypeUtilsTest.kt b/extension-style/src/test/java/com/mapbox/maps/extension/style/utils/TypeUtilsTest.kt
@@ -632,5 +632,15 @@ class TypeUtilsTest {
     assertEquals(Value.valueOf(featureString), actual)
   }
 
+  @Test
+  fun unwrapRawExpression() {
+    val expressionString = """
+      ["match",["get","data_property"],[0],true,false]
+    """.trimIndent()
+    val value = Value.fromJson(expressionString)
+    val expression = value.value!!.unwrapToExpression()
+    assertEquals(expressionString, expression.toJson())
+  }
+
   internal data class MockData(val a: Int, val b: String)
 }