[android] Android bindings for new 'text-placement-mode' layout property

mapbox · Jun 18, 2019 · 59983ee · 59983ee
1 parent 79fac75
commit 59983ee
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 0 deletions.
diff --git a/...d/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java b/...d/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
@@ -2375,6 +2375,26 @@ public static PropertyValue<Expression> textMaxAngle(Expression value) {
     return new LayoutPropertyValue<>("text-max-angle", value);
   }
 
+  /**
+   * Hint for an orientation of a symbol with point placement. Symbols whose language does not support provided hint, will be laid out in their natural orientation. The order of elements in an array define priority order for the placement.
+   *
+   * @param value a String[] value
+   * @return property wrapper around String[]
+   */
+  public static PropertyValue<String[]> textPlacementMode(String[] value) {
+    return new LayoutPropertyValue<>("text-placement-mode", value);
+  }
+
+  /**
+   * Hint for an orientation of a symbol with point placement. Symbols whose language does not support provided hint, will be laid out in their natural orientation. The order of elements in an array define priority order for the placement.
+   *
+   * @param value a String[] value
+   * @return property wrapper around String[]
+   */
+  public static PropertyValue<Expression> textPlacementMode(Expression value) {
+    return new LayoutPropertyValue<>("text-placement-mode", value);
+  }
+
   /**
    * Rotates the text clockwise.
    *

diff --git a/...droid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java b/...droid/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java
@@ -529,6 +529,18 @@ public PropertyValue<Float> getTextMaxAngle() {
     return (PropertyValue<Float>) new PropertyValue("text-max-angle", nativeGetTextMaxAngle());
   }
 
+  /**
+   * Get the TextPlacementMode property
+   *
+   * @return property wrapper value around String[]
+   */
+  @NonNull
+  @SuppressWarnings("unchecked")
+  public PropertyValue<String[]> getTextPlacementMode() {
+    checkThread();
+    return (PropertyValue<String[]>) new PropertyValue("text-placement-mode", nativeGetTextPlacementMode());
+  }
+
   /**
    * Get the TextRotate property
    *
@@ -1241,6 +1253,10 @@ public PropertyValue<String> getTextTranslateAnchor() {
   @Keep
   private native Object nativeGetTextMaxAngle();
 
+  @NonNull
+  @Keep
+  private native Object nativeGetTextPlacementMode();
+
   @NonNull
   @Keep
   private native Object nativeGetTextRotate();

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
@@ -668,6 +668,19 @@ public void testTextMaxAngleAsConstant() {
     assertEquals(layer.getTextMaxAngle().getValue(), propertyValue);
   }
 
+  @Test
+  @UiThreadTest
+  public void testTextPlacementModeAsConstant() {
+    Timber.i("text-placement-mode");
+    assertNotNull(layer);
+    assertNull(layer.getTextPlacementMode().getValue());
+
+    // Set and Get
+    String[] propertyValue = new String[0];
+    layer.setProperties(textPlacementMode(propertyValue));
+    assertEquals(layer.getTextPlacementMode().getValue(), propertyValue);
+  }
+
   @Test
   @UiThreadTest
   public void testTextRotateAsConstant() {

diff --git a/platform/android/src/style/layers/symbol_layer.cpp b/platform/android/src/style/layers/symbol_layer.cpp
@@ -201,6 +201,11 @@ namespace android {
         return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextMaxAngle()));
     }
 
+    jni::Local<jni::Object<>> SymbolLayer::getTextPlacementMode(jni::JNIEnv& env) {
+        using namespace mbgl::android::conversion;
+        return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextPlacementMode()));
+    }
+
     jni::Local<jni::Object<>> SymbolLayer::getTextRotate(jni::JNIEnv& env) {
         using namespace mbgl::android::conversion;
         return std::move(*convert<jni::Local<jni::Object<>>>(env, toSymbolLayer(layer).getTextRotate()));
@@ -534,6 +539,7 @@ namespace android {
             METHOD(&SymbolLayer::getTextVariableAnchor, "nativeGetTextVariableAnchor"),
             METHOD(&SymbolLayer::getTextAnchor, "nativeGetTextAnchor"),
             METHOD(&SymbolLayer::getTextMaxAngle, "nativeGetTextMaxAngle"),
+            METHOD(&SymbolLayer::getTextPlacementMode, "nativeGetTextPlacementMode"),
             METHOD(&SymbolLayer::getTextRotate, "nativeGetTextRotate"),
             METHOD(&SymbolLayer::getTextPadding, "nativeGetTextPadding"),
             METHOD(&SymbolLayer::getTextKeepUpright, "nativeGetTextKeepUpright"),

diff --git a/platform/android/src/style/layers/symbol_layer.hpp b/platform/android/src/style/layers/symbol_layer.hpp
@@ -90,6 +90,8 @@ class SymbolLayer : public Layer {
 
     jni::Local<jni::Object<jni::ObjectTag>> getTextMaxAngle(jni::JNIEnv&);
 
+    jni::Local<jni::Object<jni::ObjectTag>> getTextPlacementMode(jni::JNIEnv&);
+
     jni::Local<jni::Object<jni::ObjectTag>> getTextRotate(jni::JNIEnv&);
 
     jni::Local<jni::Object<jni::ObjectTag>> getTextPadding(jni::JNIEnv&);