diff options
author | Tobrun <tobrun@mapbox.com> | 2018-04-04 11:33:37 +0200 |
---|---|---|
committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2018-04-04 11:33:37 +0200 |
commit | 1730756e87550b6ca313051c9b87806dac561b18 (patch) | |
tree | 7e0b15ba073ec3020d931e40458eafb83b9ee85d /platform/android/MapboxGLAndroidSDK/src/main/java | |
parent | ddd8fb7a051732cbbfa29c7350f2dc0a06df8893 (diff) | |
download | qtlocation-mapboxgl-1730756e87550b6ca313051c9b87806dac561b18.tar.gz |
[android] - throw illegal argument exception when attempting to convert an PropertyValue as an expression literal (#11572)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java index efb2660da0..79eb2ab32a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java @@ -9,6 +9,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; import com.mapbox.mapboxsdk.style.layers.PropertyFactory; +import com.mapbox.mapboxsdk.style.layers.PropertyValue; import java.util.ArrayList; import java.util.Arrays; @@ -1735,7 +1736,9 @@ public class Expression { */ private Object toValue(ExpressionLiteral expressionValue) { Object value = expressionValue.toValue(); - if (value instanceof Expression.ExpressionLiteral) { + if (value instanceof PropertyValue) { + throw new IllegalArgumentException("PropertyValue are not allowed as an expression literal, use value instead."); + } else if (value instanceof Expression.ExpressionLiteral) { return toValue((ExpressionLiteral) value); } else if (value instanceof Expression) { return ((Expression) value).toArray(); |