diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk')
3 files changed, 10 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Filter.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Filter.java index 04da4da0cb..a0d065a6e9 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Filter.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Filter.java @@ -2,6 +2,7 @@ package com.mapbox.mapboxsdk.style.layers; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; /** * Utility to build filter expressions more easily: @@ -36,7 +37,7 @@ public class Filter { ArrayList<Object> array = new ArrayList<>(2 + values.length); array.add(operator); array.add(key); - array.addAll(Arrays.asList(values)); + Collections.addAll(array, values); return array.toArray(); } } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Function.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Function.java index c776f9ff23..77454cc704 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Function.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Function.java @@ -27,6 +27,11 @@ public class Function<T> { Object[] toValueObject() { return new Object[]{in, out}; } + + @Override + public String toString() { + return String.format("[%s, %s]", in, out); + } } @SafeVarargs diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java index 9bad3647a3..8c33fc976a 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/Layer.java @@ -26,11 +26,12 @@ public abstract class Layer { boolean updateClasses = false; for (Property<?> property : properties) { + Object converted = convertValue(property.value); if (property instanceof PaintProperty) { updateClasses = true; - nativeSetPaintProperty(property.name, convertValue(property.value)); + nativeSetPaintProperty(property.name, converted); } else { - nativeSetLayoutProperty(property.name, convertValue(property.value)); + nativeSetLayoutProperty(property.name, converted); } } |