diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java')
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java | 28 |
1 files changed, 15 insertions, 13 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 c8f848f4d7..6497eb4e17 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 @@ -180,6 +180,8 @@ public class Expression { public static Expression literal(@NonNull Object object) { if (object.getClass().isArray()) { return literal(ExpressionArray.toObjectArray(object)); + } else if(object instanceof Expression){ + throw new RuntimeException("Can't convert an expression to a literal"); } return new ExpressionLiteral(object); } @@ -426,7 +428,7 @@ public class Expression { * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-==">Style specification</a> */ public static Expression eq(@NonNull Expression compareOne, @NonNull String compareTwo) { - return eq(literal(compareOne), literal(compareTwo)); + return eq(compareOne, literal(compareTwo)); } /** @@ -449,7 +451,7 @@ public class Expression { * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-==">Style specification</a> */ public static Expression eq(@NonNull Expression compareOne, @NonNull Number compareTwo) { - return eq(literal(compareOne), literal(compareTwo)); + return eq(compareOne, literal(compareTwo)); } /** @@ -496,7 +498,7 @@ public class Expression { * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-!=">Style specification</a> */ public static Expression neq(Expression compareOne, boolean compareTwo) { - return new Expression("!=", literal(compareOne), literal(compareTwo)); + return new Expression("!=", compareOne, literal(compareTwo)); } /** @@ -519,7 +521,7 @@ public class Expression { * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-!=">Style specification</a> */ public static Expression neq(@NonNull Expression compareOne, @NonNull String compareTwo) { - return new Expression("!=", literal(compareOne), literal(compareTwo)); + return new Expression("!=", compareOne, literal(compareTwo)); } /** @@ -542,7 +544,7 @@ public class Expression { * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-!=">Style specification</a> */ public static Expression neq(@NonNull Expression compareOne, @NonNull Number compareTwo) { - return new Expression("!=", literal(compareOne), literal(compareTwo)); + return new Expression("!=", compareOne, literal(compareTwo)); } /** @@ -589,7 +591,7 @@ public class Expression { * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-%3E">Style specification</a> */ public static Expression gt(@NonNull Expression compareOne, @NonNull Number compareTwo) { - return new Expression(">", literal(compareOne), literal(compareTwo)); + return new Expression(">", compareOne, literal(compareTwo)); } /** @@ -612,7 +614,7 @@ public class Expression { * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-%3E">Style specification</a> */ public static Expression gt(@NonNull Expression compareOne, @NonNull String compareTwo) { - return new Expression(">", literal(compareOne), literal(compareTwo)); + return new Expression(">", compareOne, literal(compareTwo)); } /** @@ -659,7 +661,7 @@ public class Expression { * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-%3C">Style specification</a> */ public static Expression lt(@NonNull Expression compareOne, @NonNull Number compareTwo) { - return new Expression("<", literal(compareOne), literal(compareTwo)); + return new Expression("<", compareOne, literal(compareTwo)); } /** @@ -682,7 +684,7 @@ public class Expression { * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-%3C">Style specification</a> */ public static Expression lt(@NonNull Expression compareOne, @NonNull String compareTwo) { - return new Expression("<", literal(compareOne), literal(compareTwo)); + return new Expression("<", compareOne, literal(compareTwo)); } /** @@ -729,7 +731,7 @@ public class Expression { * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-%3E%3D">Style specification</a> */ public static Expression gte(@NonNull Expression compareOne, @NonNull Number compareTwo) { - return new Expression(">=", literal(compareOne), literal(compareTwo)); + return new Expression(">=", compareOne, literal(compareTwo)); } /** @@ -752,7 +754,7 @@ public class Expression { * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-%3E%3D">Style specification</a> */ public static Expression gte(@NonNull Expression compareOne, @NonNull String compareTwo) { - return new Expression(">=", literal(compareOne), literal(compareTwo)); + return new Expression(">=", compareOne, literal(compareTwo)); } /** @@ -799,7 +801,7 @@ public class Expression { * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-%3C%3D">Style specification</a> */ public static Expression lte(@NonNull Expression compareOne, @NonNull Number compareTwo) { - return new Expression("<=", literal(compareOne), literal(compareTwo)); + return new Expression("<=", compareOne, literal(compareTwo)); } /** @@ -822,7 +824,7 @@ public class Expression { * @see <a href="https://www.mapbox.com/mapbox-gl-js/style-spec/#expressions-%3C%3D">Style specification</a> */ public static Expression lte(@NonNull Expression compareOne, @NonNull String compareTwo) { - return new Expression("<=", literal(compareOne), literal(compareTwo)); + return new Expression("<=", compareOne, literal(compareTwo)); } /** |