From 466fe738a718bc08f56250c7633d8f4dcdcd9a36 Mon Sep 17 00:00:00 2001 From: d-kunin Date: Tue, 8 Oct 2013 16:07:43 +0300 Subject: [PATCH] [and] Compilation fix. --- android/jni/and_storage.cpp | 8 ++++++-- storage/article_info.hpp | 11 +++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/android/jni/and_storage.cpp b/android/jni/and_storage.cpp index 16b67a1..483f90e 100644 --- a/android/jni/and_storage.cpp +++ b/android/jni/and_storage.cpp @@ -103,13 +103,17 @@ jobject NativeArticle2JavaArticle(JNIEnv * env, ArticleInfo const * p) jclass ArtInfoClass = env->FindClass("com/guidewithme/article/ArticleInfo"); jmethodID initId = env->GetMethodID(ArtInfoClass, "", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DD)V"); + double lat = -1000; + double lon = -1000; + p->GetLatLon(lat, lon); + return env->NewObject(ArtInfoClass, initId, StdString2JString(env, p->GetUrl()), StdString2JString(env, p->GetThumbnailUrl()), StdString2JString(env, p->GetTitle()), StdString2JString(env, STORAGE.GetParentName(*p)), - p->m_lat, - p->m_lon); + lat, + lon); } /* diff --git a/storage/article_info.hpp b/storage/article_info.hpp index 5bf2c42..478e288 100644 --- a/storage/article_info.hpp +++ b/storage/article_info.hpp @@ -64,6 +64,17 @@ public: void Write(wr::Writer & w) const; void Read(rd::Reader & r); + bool GetLatLon(double & lat, double & lon) const + { + if (IsValidCoordinates()) + { + lat = m_lat; + lon = m_lon; + return true; + } + return false; + } + /// Calculate score for info. Less is better. double Score(double currLat, double currLon) const;