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

[android] Adaptation for new core street format.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-04-08 15:56:17 +03:00 • committed by VladiMihaylenko
parent 15d9120d6f
commit f2ff86aeb0
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -185,13 +185,15 @@ Java_com_mapswithme_maps_editor_Editor_nativeSetDefaultName(JNIEnv * env, jclass
JNIEXPORT jstring JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeGetStreet(JNIEnv * env, jclass)
{
return jni::ToJavaString(env, g_editableMapObject.GetStreet());
// TODO(yunikkk): use "GetStreet().m_localizedName" to get localized street
return jni::ToJavaString(env, g_editableMapObject.GetStreet().m_defaultName);
}
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeSetStreet(JNIEnv * env, jclass, jstring street)
{
g_editableMapObject.SetStreet(jni::ToNativeString(env, street));
//TODO(yunikkk): pass original localized street name as a second parameter.
g_editableMapObject.SetStreet({jni::ToNativeString(env, street), ""});
}
JNIEXPORT jstring JNICALL
@ -213,7 +215,8 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetNearbyStreets(JNIEnv * env, jcla
int const size = streets.size();
jobjectArray jStreets = env->NewObjectArray(size, jni::GetStringClass(env), 0);
for (int i = 0; i < size; ++i)
env->SetObjectArrayElement(jStreets, i, jni::TScopedLocalRef(env, jni::ToJavaString(env, streets[i])).get());
// TODO(yunikkk): use "streets[i].m_localizedName" to get localized street.
env->SetObjectArrayElement(jStreets, i, jni::TScopedLocalRef(env, jni::ToJavaString(env, streets[i].m_defaultName)).get());
return jStreets;
}