diff options
Diffstat (limited to 'platform/android')
4 files changed, 13 insertions, 9 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java index 3f2771a307..dc35fb85cc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java @@ -2298,18 +2298,18 @@ public class PropertyFactory { /** * Radial offset of text, in the direction of the symbol's anchor. Useful in combination with {@link PropertyFactory#textVariableAnchor}, which doesn't support the two-dimensional {@link PropertyFactory#textOffset}. * - * @param value a Float value - * @return property wrapper around Float + * @param value a Float[] value + * @return property wrapper around Float[] */ - public static PropertyValue<Float> textRadialOffset(Float value) { + public static PropertyValue<Float[]> textRadialOffset(Float[] value) { return new LayoutPropertyValue<>("text-radial-offset", value); } /** * Radial offset of text, in the direction of the symbol's anchor. Useful in combination with {@link PropertyFactory#textVariableAnchor}, which doesn't support the two-dimensional {@link PropertyFactory#textOffset}. * - * @param value a Float value - * @return property wrapper around Float + * @param value a Float[] value + * @return property wrapper around Float[] */ public static PropertyValue<Expression> textRadialOffset(Expression value) { return new LayoutPropertyValue<>("text-radial-offset", value); diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java index 1d8bad7e8e..89d1ffd0cc 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/SymbolLayer.java @@ -484,13 +484,13 @@ public class SymbolLayer extends Layer { /** * Get the TextRadialOffset property * - * @return property wrapper value around Float + * @return property wrapper value around Float[] */ @NonNull @SuppressWarnings("unchecked") - public PropertyValue<Float> getTextRadialOffset() { + public PropertyValue<Float[]> getTextRadialOffset() { checkThread(); - return (PropertyValue<Float>) new PropertyValue("text-radial-offset", nativeGetTextRadialOffset()); + return (PropertyValue<Float[]>) new PropertyValue("text-radial-offset", nativeGetTextRadialOffset()); } /** diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java index 60e305d607..515962e325 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java @@ -611,7 +611,7 @@ public class SymbolLayerTest extends BaseLayerTest { assertNull(layer.getTextRadialOffset().getValue()); // Set and Get - Float propertyValue = 0.3f; + Float[] propertyValue = new Float[] {}; layer.setProperties(textRadialOffset(propertyValue)); assertEquals(layer.getTextRadialOffset().getValue(), propertyValue); } diff --git a/platform/android/src/conversion/constant.hpp b/platform/android/src/conversion/constant.hpp index 839e6e84dc..298fb7faa1 100644 --- a/platform/android/src/conversion/constant.hpp +++ b/platform/android/src/conversion/constant.hpp @@ -81,6 +81,10 @@ struct Converter<jni::Local<jni::Object<>>, std::vector<float>> { Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const std::vector<float>& value) const; }; +template <> +struct Converter<jni::Local<jni::Object<>>, style::RadialOffsetType> : public Converter<jni::Local<jni::Object<>>, std::vector<float>> { +}; + template <class T> struct Converter<jni::Local<jni::Object<>>, T, typename std::enable_if_t<std::is_enum<T>::value>> { Result<jni::Local<jni::Object<>>> operator()(jni::JNIEnv& env, const T& value) const { |