summaryrefslogtreecommitdiff
path: root/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java
diff options
context:
space:
mode:
authorŁukasz Paczos <lukas.paczos@gmail.com>2018-10-23 19:37:32 +0200
committerŁukasz Paczos <lukasz.paczos@mapbox.com>2018-10-24 13:35:36 +0200
commitd5b66e56e9bc3c01252cd4b3948dea6cf11307f2 (patch)
tree714407ceb8cf7a6c3e6770b2af8ca3543624de9a /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java
parent3d67c7813bf0fc7fee953e4aa177472d84f9b6a2 (diff)
downloadqtlocation-mapboxgl-d5b66e56e9bc3c01252cd4b3948dea6cf11307f2.tar.gz
[android] renamed format expression options, added format expression example
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.java17
1 files changed, 10 insertions, 7 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..9ec8d8bc2a 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,13 @@ 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 +4378,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 +4392,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 +4408,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 +4424,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));
}
}