From aa16b90e2b374b27f4458aade536685189bdb1c8 Mon Sep 17 00:00:00 2001 From: tobrun Date: Tue, 12 Jun 2018 00:12:31 +0200 Subject: [android] - move match stops conversion to Stop.toExpressionArray --- .../java/com/mapbox/mapboxsdk/style/expressions/Expression.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'platform/android/MapboxGLAndroidSDK/src') 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 eb9150ecbc..72e8187b96 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 @@ -1017,12 +1017,7 @@ public class Expression { * @see Style specification */ public static Expression match(@NonNull Expression input, @NonNull Expression defaultOutput, @NonNull Stop... stops) { - Expression[] expressionStops = new Expression[stops.length * 2]; - for (int i = 0; i < stops.length; i++) { - expressionStops[i * 2] = literal(stops[i].value); - expressionStops[i * 2 + 1] = literal(stops[i].output); - } - return match(join(join(new Expression[] {input}, expressionStops), new Expression[] {defaultOutput})); + return match(join(join(new Expression[] {input}, Stop.toExpressionArray(stops)), new Expression[] {defaultOutput})); } /** @@ -3449,8 +3444,6 @@ public class Expression { 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(); } return value; } -- cgit v1.2.1