Implement icon-anchor property

4 files changed, 41 insertions, 32 deletions

diff --git a/platform/android/src/style/conversion/types.hpp b/platform/android/src/style/conversion/types.hpp
index a00f668c24..375d1a33aa 100644
--- a/platform/android/src/style/conversion/types.hpp
+++ b/platform/android/src/style/conversion/types.hpp
@@ -58,15 +58,15 @@ struct Converter<jni::jobject*, mbgl::style::IconTextFitType> {
 };
 
 template <>
-struct Converter<jni::jobject*, mbgl::style::TextJustifyType> {
-    Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::TextJustifyType& value) const {
+struct Converter<jni::jobject*, mbgl::style::SymbolAnchorType> {
+    Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::SymbolAnchorType& value) const {
         return convert<jni::jobject*, std::string>(env, toString(value));
     }
 };
 
 template <>
-struct Converter<jni::jobject*, mbgl::style::TextAnchorType> {
-    Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::TextAnchorType& value) const {
+struct Converter<jni::jobject*, mbgl::style::TextJustifyType> {
+    Result<jni::jobject*> operator()(jni::JNIEnv& env, const mbgl::style::TextJustifyType& value) const {
         return convert<jni::jobject*, std::string>(env, toString(value));
     }
 };
diff --git a/platform/android/src/style/conversion/types_string_values.hpp b/platform/android/src/style/conversion/types_string_values.hpp
index e96de3b01e..a19ca33a2f 100644
--- a/platform/android/src/style/conversion/types_string_values.hpp
+++ b/platform/android/src/style/conversion/types_string_values.hpp
@@ -109,51 +109,34 @@ namespace conversion {
         }
     }
 
-    // text-justify
-    inline std::string toString(mbgl::style::TextJustifyType value) {
-        switch (value) {
-          case mbgl::style::TextJustifyType::Left:
-            return "left";
-            break;
-          case mbgl::style::TextJustifyType::Center:
-            return "center";
-            break;
-          case mbgl::style::TextJustifyType::Right:
-            return "right";
-            break;
-          default:
-            throw std::runtime_error("Not implemented");
-        }
-    }
-
-    // text-anchor
-    inline std::string toString(mbgl::style::TextAnchorType value) {
+    // icon-anchor
+    inline std::string toString(mbgl::style::SymbolAnchorType value) {
         switch (value) {
-          case mbgl::style::TextAnchorType::Center:
+          case mbgl::style::SymbolAnchorType::Center:
             return "center";
             break;
-          case mbgl::style::TextAnchorType::Left:
+          case mbgl::style::SymbolAnchorType::Left:
             return "left";
             break;
-          case mbgl::style::TextAnchorType::Right:
+          case mbgl::style::SymbolAnchorType::Right:
             return "right";
             break;
-          case mbgl::style::TextAnchorType::Top:
+          case mbgl::style::SymbolAnchorType::Top:
             return "top";
             break;
-          case mbgl::style::TextAnchorType::Bottom:
+          case mbgl::style::SymbolAnchorType::Bottom:
             return "bottom";
             break;
-          case mbgl::style::TextAnchorType::TopLeft:
+          case mbgl::style::SymbolAnchorType::TopLeft:
             return "top-left";
             break;
-          case mbgl::style::TextAnchorType::TopRight:
+          case mbgl::style::SymbolAnchorType::TopRight:
             return "top-right";
             break;
-          case mbgl::style::TextAnchorType::BottomLeft:
+          case mbgl::style::SymbolAnchorType::BottomLeft:
             return "bottom-left";
             break;
-          case mbgl::style::TextAnchorType::BottomRight:
+          case mbgl::style::SymbolAnchorType::BottomRight:
             return "bottom-right";
             break;
           default:
@@ -161,6 +144,23 @@ namespace conversion {
         }
     }
 
+    // text-justify
+    inline std::string toString(mbgl::style::TextJustifyType value) {
+        switch (value) {
+          case mbgl::style::TextJustifyType::Left:
+            return "left";
+            break;
+          case mbgl::style::TextJustifyType::Center:
+            return "center";
+            break;
+          case mbgl::style::TextJustifyType::Right:
+            return "right";
+            break;
+          default:
+            throw std::runtime_error("Not implemented");
+        }
+    }
+
     // text-transform
     inline std::string toString(mbgl::style::TextTransformType value) {
         switch (value) {
diff --git a/platform/android/src/style/layers/symbol_layer.cpp b/platform/android/src/style/layers/symbol_layer.cpp
index b6cf51ec7e..d44744a6cf 100644
--- a/platform/android/src/style/layers/symbol_layer.cpp
+++ b/platform/android/src/style/layers/symbol_layer.cpp
@@ -125,6 +125,12 @@ namespace android {
         return jni::Object<jni::ObjectTag>(*converted);
     }
 
+    jni::Object<jni::ObjectTag> SymbolLayer::getIconAnchor(jni::JNIEnv& env) {
+        using namespace mbgl::android::conversion;
+        Result<jni::jobject*> converted = convert<jni::jobject*>(env, layer.as<mbgl::style::SymbolLayer>()->SymbolLayer::getIconAnchor());
+        return jni::Object<jni::ObjectTag>(*converted);
+    }
+
     jni::Object<jni::ObjectTag> SymbolLayer::getIconPitchAlignment(jni::JNIEnv& env) {
         using namespace mbgl::android::conversion;
         Result<jni::jobject*> converted = convert<jni::jobject*>(env, layer.as<mbgl::style::SymbolLayer>()->SymbolLayer::getIconPitchAlignment());
@@ -520,6 +526,7 @@ namespace android {
             METHOD(&SymbolLayer::getIconPadding, "nativeGetIconPadding"),
             METHOD(&SymbolLayer::getIconKeepUpright, "nativeGetIconKeepUpright"),
             METHOD(&SymbolLayer::getIconOffset, "nativeGetIconOffset"),
+            METHOD(&SymbolLayer::getIconAnchor, "nativeGetIconAnchor"),
             METHOD(&SymbolLayer::getIconPitchAlignment, "nativeGetIconPitchAlignment"),
             METHOD(&SymbolLayer::getTextPitchAlignment, "nativeGetTextPitchAlignment"),
             METHOD(&SymbolLayer::getTextRotationAlignment, "nativeGetTextRotationAlignment"),
diff --git a/platform/android/src/style/layers/symbol_layer.hpp b/platform/android/src/style/layers/symbol_layer.hpp
index 6d3da13ae9..417e5e143f 100644
--- a/platform/android/src/style/layers/symbol_layer.hpp
+++ b/platform/android/src/style/layers/symbol_layer.hpp
@@ -59,6 +59,8 @@ public:
 
     jni::Object<jni::ObjectTag> getIconOffset(jni::JNIEnv&);
 
+    jni::Object<jni::ObjectTag> getIconAnchor(jni::JNIEnv&);
+
     jni::Object<jni::ObjectTag> getIconPitchAlignment(jni::JNIEnv&);
 
     jni::Object<jni::ObjectTag> getTextPitchAlignment(jni::JNIEnv&);