[android] Minimal Android wrapper on 'format' expression

For converting to Java types, flatten 'text-field' back to a string.
mapbox · Sep 25, 2018 · c54a3d8 · c54a3d8
1 parent d86741f
commit c54a3d8
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/...d/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java b/...d/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/expressions/Expression.java
@@ -3224,6 +3224,11 @@ public static Expression collator(Expression caseSensitive, Expression diacritic
     return new Expression("collator", new ExpressionMap(map));
   }
 
+  public static Expression format(Expression input) {
+    Map<String, Expression> map = new HashMap<>();
+    return new Expression("format", input, new ExpressionMap(map));
+  }
+
   /**
    * Asserts that the input value is an object. If it is not, the expression is an error
    * The asserted input value is returned as result.
@@ -4441,4 +4446,4 @@ static Object[] toObjectArray(Object object) {
     }
     return objects;
   }
-}
+}
diff --git a/...idSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java b/...idSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java
@@ -477,7 +477,8 @@ public void testTextFieldAsConstant() {
       assertEquals((String) layer.getTextField().getValue(), (String) "");
 
       layer.setProperties(textField("{token}"));
-      assertEquals(layer.getTextField().getExpression(), Expression.toString(Expression.get("token")));
+      assertEquals(layer.getTextField().getExpression(),
+         Expression.format(Expression.toString(Expression.get("token"))));
     });
   }
 
@@ -490,7 +491,7 @@ public void testTextFieldAsExpression() {
       assertNotNull(layer);
 
       // Set and Get
-      Expression expression = string(Expression.get("undefined"));
+      Expression expression = Expression.format(string(Expression.get("undefined")));
       layer.setProperties(textField(expression));
       assertEquals(layer.getTextField().getExpression(), expression);
     });

diff --git a/...AndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs b/...AndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs
@@ -165,7 +165,12 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
 <% if (property.tokens) { -%>
 
       layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>("{token}"));
+<% if (property.type === 'formatted') { -%>
+      assertEquals(layer.get<%- camelize(property.name) %>().getExpression(),
+         Expression.format(Expression.toString(Expression.get("token"))));
+<% } else { -%>
       assertEquals(layer.get<%- camelize(property.name) %>().getExpression(), Expression.toString(Expression.get("token")));
+<% } -%>
 <% } -%>
     });
   }
@@ -181,7 +186,11 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest {
       assertNotNull(layer);
 
       // Set and Get
+<% if (property.type === 'formatted') { -%>
+      Expression expression = Expression.format(<%- defaultExpressionJava(property) %>(Expression.get("undefined")));
+<% } else { -%>
       Expression expression = <%- defaultExpressionJava(property) %>(Expression.get("undefined"));
+<% } -%>
       layer.setProperties(<%- camelizeWithLeadingLowercase(property.name) %>(expression));
       assertEquals(layer.get<%- camelize(property.name) %>().getExpression(), expression);
     });

diff --git a/platform/android/src/conversion/constant.cpp b/platform/android/src/conversion/constant.cpp
@@ -29,6 +29,10 @@ Result<jni::Local<jni::Object<>>> Converter<jni::Local<jni::Object<>>, Color>::o
     return jni::Make<jni::String>(env, sstream.str());
 }
 
+Result<jni::Local<jni::Object<>>> Converter<jni::Local<jni::Object<>>, style::expression::Formatted>::operator()(jni::JNIEnv& env, const style::expression::Formatted& value) const {
+    return jni::Make<jni::String>(env, value.toString());
+}
+
 Result<jni::Local<jni::Object<>>> Converter<jni::Local<jni::Object<>>, std::vector<std::string>>::operator()(jni::JNIEnv& env, const std::vector<std::string>& value) const {
     auto result = jni::Array<jni::String>::New(env, value.size());
 

diff --git a/platform/android/src/conversion/constant.hpp b/platform/android/src/conversion/constant.hpp
@@ -5,6 +5,8 @@
 #include <mbgl/util/color.hpp>
 #include <mbgl/util/enum.hpp>
 
+#include <mbgl/style/expression/formatted.hpp>
+
 #include <jni/jni.hpp>
 
 #include <string>
@@ -53,6 +55,11 @@ struct Converter<jni::Local<jni::Object<>>, Color> {
     Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const Color& value) const;
 };
 
+template <>
+struct Converter<jni::Local<jni::Object<>>, style::expression::Formatted> {
+    Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const style::expression::Formatted& value) const;
+};
+
 template <std::size_t N>
 struct Converter<jni::Local<jni::Object<>>, std::array<float, N>> {
     Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const std::array<float, N>& value) const {