[android] - add platform specific implementation of unaccent

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/StringUtils.java

@@ -0,0 +1,25 @@
+package com.mapbox.mapboxsdk.utils;
+
+import android.support.annotation.Keep;
+import android.support.annotation.NonNull;
+
+import java.text.Normalizer;
+
+/**
+ * String utility class used by core from jni.
+ */
+@Keep
+class StringUtils {
+
+  /**
+   * Normalises String input and strip diacritics from it.
+   *
+   * @return normalised String with stripped diacritics.
+   */
+  @Keep
+  @NonNull
+  static String unaccent(@NonNull String value) {
+    return Normalizer.normalize(value, Normalizer.Form.NFD)
+      .replaceAll("\\p{InCombiningDiacriticalMarks}+", "");
+  }
+}

platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/render/RenderTestActivity.java

@@ -56,6 +56,7 @@ public class RenderTestActivity extends AppCompatActivity {
       add("overlapping,raster-masking");
       add("missing,raster-loading");
       add("pitchAndBearing,line-pitch");
+      add("overdraw,sparse-tileset");
     }
   };
 
@@ -292,7 +293,7 @@ public void setOnRenderTestCompletionListener(OnRenderTestCompletionListener lis
   }
 
   public void onLoadIgnoreList(List<String> ignoreList) {
-    Timber.e("We loaded %s amount of tests to be ignored", ignoreList.size());
+    Timber.e("We loaded %s of tests to be ignored", ignoreList.size());
     EXCLUDED_TESTS.addAll(ignoreList);
     new LoadRenderDefinitionTask(this).execute();
   }

platform/android/config.cmake

@@ -1,6 +1,5 @@
 set(USE_GLES2 ON)
 
-include(cmake/nunicode.cmake)
 include(cmake/sqlite.cmake)
 include(cmake/icu.cmake)
 
@@ -49,7 +48,6 @@ macro(mbgl_platform_core)
     target_add_mason_package(mbgl-core PUBLIC rapidjson)
 
     target_link_libraries(mbgl-core
-        PRIVATE nunicode
         PRIVATE icu
         PUBLIC expected
         PUBLIC -llog

platform/android/core-files.txt

@@ -14,7 +14,7 @@ platform/android/src/thread.cpp
 platform/android/src/string_util.cpp
 platform/default/bidi.cpp
 platform/default/thread_local.cpp
-platform/default/unaccent.cpp
+platform/android/src/unaccent.cpp
 platform/default/unaccent.hpp
 platform/default/utf.cpp
 

platform/android/scripts/run-render-test.py

@@ -3,7 +3,7 @@
 import os
 import shutil
 
-catPath = os.getcwd() + "/platform/android/build/render-test/render/"
+catPath = os.getcwd() + "/platform/android/build/render-test/"
 failCounter = 0
 testCounter = 0
 for cat in os.listdir(catPath):

platform/android/src/jni.cpp

@@ -194,6 +194,7 @@ void registerNatives(JavaVM *vm) {
     LocalGlyphRasterizer::registerNative(env);
     Locale::registerNative(env);
     Collator::registerNative(env);
+    StringUtils::registerNative(env);
 
     // Logger
     Logger::registerNative(env);

platform/android/src/text/collator.cpp

@@ -5,6 +5,7 @@
 #include <unaccent.hpp>
 
 #include <jni/jni.hpp>
+#include "src/java/lang.hpp"
 
 #include "../attach_env.hpp"
 #include "collator_jni.hpp"
@@ -36,6 +37,19 @@ jni::jint Collator::compare(jni::JNIEnv& env, jni::Object<Collator> collator, jn
     return collator.Call(env, method, lhs, rhs);
 }
 
+
+void StringUtils::registerNative(jni::JNIEnv& env) {
+    javaClass = *jni::Class<StringUtils>::Find(env).NewGlobalRef(env).release();
+}
+
+jni::Class<StringUtils> StringUtils::javaClass;
+
+jni::String StringUtils::unaccent(jni::JNIEnv& env, jni::String value) {
+    using Signature = jni::String(jni::String);
+    auto static method = javaClass.GetStaticMethod<Signature>(env, "unaccent");
+    return javaClass.Call(env, method, value);
+}
+
 void Locale::registerNative(jni::JNIEnv& env) {
     javaClass = *jni::Class<Locale>::Find(env).NewGlobalRef(env).release();
 }

platform/android/src/text/collator_jni.hpp

@@ -53,5 +53,18 @@ class Collator {
 
 };
 
+
+class StringUtils {
+public:
+    static constexpr auto Name() { return "com/mapbox/mapboxsdk/utils/StringUtils"; };
+
+    static jni::String unaccent(jni::JNIEnv&, jni::String);
+
+    static jni::Class<StringUtils> javaClass;
+
+    static void registerNative(jni::JNIEnv&);
+
+};
+
 } // namespace android
 } // namespace mbgl

platform/android/src/unaccent.cpp

@@ -0,0 +1,21 @@
+#include <unaccent.hpp>
+#include <string>
+#include <src/java/lang.hpp>
+#include "attach_env.hpp"
+#include "text/collator_jni.hpp"
+
+namespace mbgl {
+namespace platform {
+
+std::string unaccent(const std::string& str) {
+    android::UniqueEnv env = android::AttachEnv();
+    jni::String input = jni::Make<jni::String>(*env, str);
+    jni::String unaccented = android::StringUtils::unaccent(*env, input);
+    jni::DeleteLocalRef(*env, input);
+    std::string output = jni::Make<std::string>(*env, unaccented);
+    jni::DeleteLocalRef(*env, unaccented);
+    return output;
+}
+
+} // namespace platform
+} // namespace mbgl