kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] [bookmarks] change newAddressInfo. Viktor will be happy)

Browse source
This commit is contained in:
Alexei Vitenko 2013-01-24 19:12:58 +03:00 • committed by Alex Zolotarev
parent 322dc5d997
commit 96921d7ed5
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/jni/com/mapswithme/core/jni_helper.cpp
View file

@ -196,7 +196,7 @@ namespace jni
static_cast<jint>(point.y));
}
jobject GetNewAddressInfo(JNIEnv * env, string const & name, string const & type, m2::PointD const & px)
jobject GetNewAddressInfo(JNIEnv * env, Framework::AddressInfo const & adInfo, m2::PointD const & px)
{
jclass klass = env->FindClass("com/mapswithme/maps/bookmarks/data/AddressInfo");
ASSERT ( klass, () );
@ -206,8 +206,8 @@ namespace jni
ASSERT ( methodID, () );
return env->NewObject(klass, methodID,
jni::ToJavaString(env, name),
jni::ToJavaString(env, type),
jni::ToJavaString(env, adInfo.m_name),
jni::ToJavaString(env, adInfo.GetBestType() == 0 ? "" : adInfo.GetBestType()),
px.x,
px.y);
}

3
android/jni/com/mapswithme/core/jni_helper.hpp
View file

@ -5,6 +5,7 @@
#include "../../../../../std/string.hpp"
#include "../../../../../std/shared_ptr.hpp"
#include "../../../../../geometry/point2d.hpp"
#include "../../../../../map/Framework.hpp"
namespace jni
{
@ -41,5 +42,5 @@ namespace jni
jobject GetNewPoint(JNIEnv * env, m2::PointD const & point);
jobject GetNewPoint(JNIEnv * env, m2::PointI const & point);
jobject GetNewAddressInfo(JNIEnv * env, string const & name, string const & type, m2::PointD const & px);
jobject GetNewAddressInfo(JNIEnv * env, Framework::AddressInfo const & adInfo, m2::PointD const & px);
}

4
android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp
View file

@ -16,7 +16,7 @@ extern "C"
m2::PointD pxPivot;
if (frm()->GetVisiblePOI(m2::PointD(px, py), pxPivot, adInfo))
{
return jni::GetNewAddressInfo(env, adInfo.m_name, adInfo.GetBestType(), pxPivot);
return jni::GetNewAddressInfo(env, adInfo, pxPivot);
}
else
{
@ -30,7 +30,7 @@ extern "C"
m2::PointD point(px, py);
Framework::AddressInfo adInfo;
frm()->GetAddressInfo(point, adInfo);
return jni::GetNewAddressInfo(env, adInfo.m_name, adInfo.GetBestType() == 0 ? "" : adInfo.GetBestType(), point);
return jni::GetNewAddressInfo(env, adInfo, point);
}
JNIEXPORT void JNICALL