RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] JNI for localized names and streets.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-04-26 12:29:20 +03:00 • committed by Alex Zolotarev
parent 1bc43d6319
commit 64e86e78fc
3 changed files with 86 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
android/jni/com/mapswithme/maps/editor/Editor.cpp
View file

@ -23,23 +23,23 @@ osm::EditableMapObject g_editableMapObject;
jclass g_featureCategoryClazz;
jmethodID g_featureCtor;
jclass g_localNameClazz;
jmethodID g_localNameCtor;
jfieldID g_localNameFieldCode;
jfieldID g_localNameFieldName;
jobject ToJavaFeatureCategory(JNIEnv * env, osm::Category const & category)
{
return env->NewObject(g_featureCategoryClazz, g_featureCtor, category.m_type, jni::TScopedLocalRef(env, jni::ToJavaString(env, category.m_name)).get());
}
jobjectArray ToJavaArray(JNIEnv * env, vector<string> const & src)
jobject ToJavaName(JNIEnv * env, osm::LocalizedName const & name)
{
int const size = src.size();
auto jArray = env->NewObjectArray(size, jni::GetStringClass(env), 0);
for (size_t i = 0; i < size; i++)
{
jni::TScopedLocalRef jItem(env, jni::ToJavaString(env, src[i]));
env->SetObjectArrayElement(jArray, i, jItem.get());
}
return jArray;
jni::TScopedLocalRef jName(env, jni::ToJavaString(env, name.m_name));
jni::TScopedLocalRef jLang(env, jni::ToJavaString(env, name.m_lang));
jni::TScopedLocalRef jLangName(env, jni::ToJavaString(env, name.m_langName));
return env->NewObject(g_localNameClazz, g_localNameCtor, name.m_code,
jName.get(), jLang.get(), jLangName.get());
}
} // namespace
@ -50,9 +50,15 @@ using osm::Editor;
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeInit(JNIEnv * env, jclass)
{
g_featureCategoryClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/editor/data/FeatureCategory");;
g_featureCategoryClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/editor/data/FeatureCategory");
// public FeatureCategory(int category, String name)
g_featureCtor = jni::GetConstructorID(env, g_featureCategoryClazz, "(ILjava/lang/String;)V");
g_localNameClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/editor/data/LocalizedName");
// public LocalizedName(int code, @NonNull String name, @NonNull String lang, @NonNull String langName)
g_localNameCtor = jni::GetConstructorID(env, g_localNameClazz, "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
g_localNameFieldCode = env->GetFieldID(g_localNameClazz, "code", "I");
g_localNameFieldName = env->GetFieldID(g_localNameClazz, "name", "Ljava/lang/String;");
}
JNIEXPORT jstring JNICALL
@ -254,31 +260,57 @@ Java_com_mapswithme_maps_editor_Editor_nativeIsBuilding(JNIEnv * env, jclass cla
JNIEXPORT jstring JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeGetDefaultName(JNIEnv * env, jclass)
{
// TODO(yunikkk): add multilanguage names support via EditableMapObject::GetLocalizedName().
return jni::ToJavaString(env, g_editableMapObject.GetDefaultName());
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeSetDefaultName(JNIEnv * env, jclass, jstring name)
{
// TODO(yunikkk): add multilanguage names support.
g_editableMapObject.SetName(jni::ToNativeString(env, name), StringUtf8Multilang::kDefaultCode);
}
JNIEXPORT jobjectArray JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeGetLocalizedNames(JNIEnv * env, jclass)
{
return jni::ToJavaArray(env, g_localNameClazz, g_editableMapObject.GetLocalizedNames(), ToJavaName);
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeSetLocalizedNames(JNIEnv * env, jclass, jobjectArray names)
{
int const length = env->GetArrayLength(names);
for (int i = 0; i < length; i++)
{
auto jName = env->GetObjectArrayElement(names, i);
g_editableMapObject.SetName(jni::ToNativeString(env, static_cast<jstring>(env->GetObjectField(jName, g_localNameFieldName))),
env->GetIntField(jName, g_localNameFieldCode));
}
}
JNIEXPORT jstring JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeGetStreet(JNIEnv * env, jclass)
{
// TODO(yunikkk): use "GetStreet().m_localizedName" to get localized street
return jni::ToJavaString(env, g_editableMapObject.GetStreet().m_defaultName);
}
JNIEXPORT jstring JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeGetLocalizedStreet(JNIEnv * env, jclass)
{
return jni::ToJavaString(env, g_editableMapObject.GetStreet().m_localizedName);
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeSetStreet(JNIEnv * env, jclass, jstring street)
{
//TODO(yunikkk): pass original localized street name as a second parameter.
g_editableMapObject.SetStreet({jni::ToNativeString(env, street), ""});
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeSetLocalizedStreet(JNIEnv * env, jclass, jstring street, jstring localizedStreet)
{
g_editableMapObject.SetStreet({jni::ToNativeString(env, street), jni::ToNativeString(env, localizedStreet)});
}
JNIEXPORT jstring JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeGetHouseNumber(JNIEnv * env, jclass)
{
@ -354,17 +386,15 @@ Java_com_mapswithme_maps_editor_Editor_nativeCreateMapObject(JNIEnv *, jclass, j
JNIEXPORT jobjectArray JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeGetNewFeatureCategories(JNIEnv * env, jclass clazz)
{
osm::NewFeatureCategories const & printableTypes = g_framework->NativeFramework()->GetEditorCategories();
int const size = printableTypes.m_allSorted.size();
auto jCategories = env->NewObjectArray(size, g_featureCategoryClazz, 0);
for (size_t i = 0; i < size; i++)
{
// TODO pass used categories section, too
jni::TScopedLocalRef jCategory(env, ToJavaFeatureCategory(env, printableTypes.m_allSorted[i]));
env->SetObjectArrayElement(jCategories, i, jCategory.get());
}
return jni::ToJavaArray(env, g_featureCategoryClazz, g_framework->NativeFramework()->GetEditorCategories().m_allSorted,
ToJavaFeatureCategory);
}
return jCategories;
JNIEXPORT jobjectArray JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeGetUsedFeatureCategories(JNIEnv * env, jclass clazz)
{
return jni::ToJavaArray(env, g_featureCategoryClazz, g_framework->NativeFramework()->GetEditorCategories().m_lastUsed,
ToJavaFeatureCategory);
}
JNIEXPORT jobjectArray JNICALL
@ -375,13 +405,13 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetCuisines(JNIEnv * env, jclass cl
keys.reserve(cuisines.size());
for (TCuisine const & cuisine : cuisines)
keys.push_back(cuisine.first);
return ToJavaArray(env, keys);
return jni::ToJavaStringArray(env, keys);
}
JNIEXPORT jobjectArray JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeGetSelectedCuisines(JNIEnv * env, jclass clazz)
{
return ToJavaArray(env, g_editableMapObject.GetCuisines());
return jni::ToJavaStringArray(env, g_editableMapObject.GetCuisines());
}
JNIEXPORT jobjectArray JNICALL
@ -395,7 +425,7 @@ Java_com_mapswithme_maps_editor_Editor_nativeTranslateCuisines(JNIEnv * env, jcl
string const & key = jni::ToNativeString(env, (jstring) env->GetObjectArrayElement(jKeys, i));
translations.push_back(osm::Cuisines::Instance().Translate(key));
}
return ToJavaArray(env, translations);
return jni::ToJavaStringArray(env, translations);
}
JNIEXPORT void JNICALL

16
android/src/com/mapswithme/maps/editor/Editor.java
View file

@ -9,8 +9,8 @@ import com.mapswithme.maps.Framework;
import com.mapswithme.maps.MwmApplication;
import com.mapswithme.maps.background.AppBackgroundTracker;
import com.mapswithme.maps.background.WorkerService;
import com.mapswithme.maps.bookmarks.data.Metadata;
import com.mapswithme.maps.editor.data.FeatureCategory;
import com.mapswithme.maps.editor.data.LocalizedName;
/**
@ -82,17 +82,18 @@ public final class Editor
public static native boolean nativeIsNameEditable();
public static native boolean nativeIsBuilding();
@NonNull
public static native String[] nativeGetNearbyStreets();
// TODO(yunikkk): add get/set name in specific language.
// To do that correctly, UI should query available languages, their translations and codes from
// osm::EditableFeature. And pass these codes back in setter together with edited name.
public static native String nativeGetDefaultName();
public static native void nativeSetDefaultName(String name);
public static native @NonNull LocalizedName[] nativeGetLocalizedNames();
public static native void nativeSetLocalizedNames(@NonNull LocalizedName[] names);
public static native String nativeGetStreet();
public static native String nativeGetLocalizedStreet();
public static native void nativeSetStreet(String street);
public static native void nativeSetLocalizedStreet(String street, String localizedStreet);
@NonNull
public static native String[] nativeGetNearbyStreets();
public static native String nativeGetHouseNumber();
public static native void nativeSetHouseNumber(String houseNumber);
@ -119,6 +120,7 @@ public final class Editor
public static native boolean nativeSaveEditedFeature();
public static native FeatureCategory[] nativeGetNewFeatureCategories();
public static native FeatureCategory[] nativeGetUsedFeatureCategories();
/**
* Creates new object on the map. Places it in the center of current viewport.

19
android/src/com/mapswithme/maps/editor/data/LocalizedName.java Normal file
View file

@ -0,0 +1,19 @@
package com.mapswithme.maps.editor.data;
import android.support.annotation.NonNull;
public class LocalizedName
{
public int code;
@NonNull public String name;
@NonNull public String lang;
@NonNull public String langName;
public LocalizedName(int code, @NonNull String name, @NonNull String lang, @NonNull String langName)
{
this.code = code;
this.name = name;
this.lang = lang;
this.langName = langName;
}
}