summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2018-11-19 16:45:05 +0100
committerŁukasz Paczos <lukasz.paczos@mapbox.com>2018-11-20 12:20:50 +0100
commite08e143c123c0fd542f1a1a1a615d284ecd2db45 (patch)
tree34819dda7a0184b914e36e052381a533d0d29440 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
parentd0520d02f123557c7c7361053ab1e56318912fa3 (diff)
downloadqtlocation-mapboxgl-e08e143c123c0fd542f1a1a1a615d284ecd2db45.tar.gz
[android] getting a constant layer filter fix
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
index 864d1d5a20..fada0c483c 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/FillExtrusionLayer.java
@@ -11,6 +11,7 @@ import android.support.annotation.UiThread;
import static com.mapbox.mapboxsdk.utils.ColorUtils.rgbaToColor;
import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
import com.mapbox.mapboxsdk.style.expressions.Expression;
import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
@@ -120,12 +121,12 @@ public class FillExtrusionLayer extends Layer {
@Nullable
public Expression getFilter() {
checkThread();
- Expression expression = null;
- JsonArray array = (JsonArray) nativeGetFilter();
- if (array != null) {
- expression = Expression.Converter.convert(array);
+ JsonElement jsonElement = nativeGetFilter();
+ if (jsonElement != null) {
+ return Expression.Converter.convert(jsonElement);
+ } else {
+ return null;
}
- return expression;
}
/**