diff options
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK')
2 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 1184baba65..317cfd0bd6 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 @@ -3246,10 +3246,10 @@ public class Expression { * format( * formatEntry( * get("header_property"), - * fontScale(2.0), - * textFont(new String[] {"DIN Offc Pro Regular", "Arial Unicode MS Regular"}) + * formatFontScale(2.0), + * formatTextFont(new String[] {"DIN Offc Pro Regular", "Arial Unicode MS Regular"}) * ), - * formatEntry(concat(literal("\n"), get("description_property")), fontScale(1.5)), + * formatEntry(concat(literal("\n"), get("description_property")), formatFontScale(1.5)), * } * </pre> * @@ -4375,7 +4375,7 @@ public class Expression { * @return format option */ @NonNull - public static FormatOption fontScale(@NonNull Expression expression) { + public static FormatOption formatFontScale(@NonNull Expression expression) { return new FormatOption("font-scale", expression); } @@ -4389,7 +4389,7 @@ public class Expression { * @return format option */ @NonNull - public static FormatOption fontScale(double scale) { + public static FormatOption formatFontScale(double scale) { return new FormatOption("font-scale", literal(scale)); } @@ -4405,7 +4405,7 @@ public class Expression { * @return format option */ @NonNull - public static FormatOption textFont(@NonNull Expression expression) { + public static FormatOption formatTextFont(@NonNull Expression expression) { return new FormatOption("text-font", expression); } @@ -4421,7 +4421,7 @@ public class Expression { * @return format option */ @NonNull - public static FormatOption textFont(@NonNull String[] fontStack) { + public static FormatOption formatTextFont(@NonNull String[] fontStack) { return new FormatOption("text-font", literal(fontStack)); } } diff --git a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java index 3d1bbf5214..13cdadbc97 100644 --- a/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java +++ b/platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/style/expressions/ExpressionTest.java @@ -14,8 +14,8 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import static com.mapbox.mapboxsdk.style.expressions.Expression.FormatOption.fontScale; -import static com.mapbox.mapboxsdk.style.expressions.Expression.FormatOption.textFont; +import static com.mapbox.mapboxsdk.style.expressions.Expression.FormatOption.formatFontScale; +import static com.mapbox.mapboxsdk.style.expressions.Expression.FormatOption.formatTextFont; import static com.mapbox.mapboxsdk.style.expressions.Expression.abs; import static com.mapbox.mapboxsdk.style.expressions.Expression.acos; import static com.mapbox.mapboxsdk.style.expressions.Expression.all; @@ -1420,7 +1420,8 @@ public class ExpressionTest { } }; Object[] actual = format( - formatEntry(literal("test"), fontScale(literal(1.5)), textFont(literal(new String[] {"awesome"}))) + formatEntry( + literal("test"), formatFontScale(literal(1.5)), formatTextFont(literal(new String[] {"awesome"}))) ).toArray(); assertTrue("expression should match", Arrays.deepEquals(expected, actual)); } @@ -1455,10 +1456,11 @@ public class ExpressionTest { } }; Object[] actual = format( - formatEntry(literal("test"), textFont(new String[] {"awesome"})), - formatEntry("test2", fontScale(1.5)), + formatEntry(literal("test"), formatTextFont(new String[] {"awesome"})), + formatEntry("test2", formatFontScale(1.5)), formatEntry(literal("test3")), - formatEntry(literal("test4"), fontScale(literal(1.5)), textFont(new String[] {"awesome"})) + formatEntry( + literal("test4"), formatFontScale(literal(1.5)), formatTextFont(new String[] {"awesome"})) ).toArray(); assertTrue("expression should match", Arrays.deepEquals(expected, actual)); } |