From f5eb40a7889d8d9fbf8208c6d4aa1616bcc0fbf5 Mon Sep 17 00:00:00 2001
From: "r.kuznetsov" <r.kuznetsov@corp.mail.ru>
Date: Mon, 20 Apr 2015 13:33:04 +0300
Subject: [PATCH] Fixed Android compilation issues

---
 android/jni/com/mapswithme/maps/Framework.cpp   | 17 +++++++++--------
 android/jni/com/mapswithme/maps/Framework.hpp   |  2 +-
 .../mapswithme/maps/bookmarks/data/Bookmark.cpp |  2 +-
 .../maps/bookmarks/data/BookmarkCategory.cpp    |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 1efc8b79ec..40291edf4a 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -13,6 +13,7 @@
 #include "map/user_mark.hpp"
 
 #include "drape_frontend/visual_params.hpp"
+#include "drape/pointers.hpp"
 
 #include "coding/file_container.hpp"
 #include "coding/file_name_utils.hpp"
@@ -148,13 +149,13 @@ float Framework::GetBestDensity(int densityDpi)
 
 bool Framework::CreateDrapeEngine(JNIEnv * env, jobject jSurface, int densityDpi)
 {
-  m_contextFactory.Reset(new dp::ThreadSafeFactory(new AndroidOGLContextFactory(env, jSurface)));
+  m_contextFactory = make_unique_dp<dp::ThreadSafeFactory>(new AndroidOGLContextFactory(env, jSurface));
   AndroidOGLContextFactory const * factory = m_contextFactory->CastFactory<AndroidOGLContextFactory>();
   if (!factory->IsValid())
     return false;
 
   float visualScale = GetBestDensity(densityDpi);
-  m_work.CreateDrapeEngine(m_contextFactory.GetRefPointer(), visualScale, factory->GetWidth(), factory->GetHeight());
+  m_work.CreateDrapeEngine(make_ref<dp::ThreadSafeFactory>(m_contextFactory), visualScale, factory->GetWidth(), factory->GetHeight());
   m_work.SetUpdatesEnabled(true);
   m_work.EnterForeground();
   LoadState();
@@ -707,7 +708,7 @@ void Framework::InjectMetadata(JNIEnv * env, jclass const clazz, jobject const m
   using feature::Metadata;
 
   Metadata metadata;
-  frm()->FindClosestPOIMetadata(userMark->GetOrg(), metadata);
+  frm()->FindClosestPOIMetadata(userMark->GetPivot(), metadata);
 
   static jmethodID const addId = env->GetMethodID(clazz, "addMetadata", "(ILjava/lang/String;)V");
   ASSERT ( addId, () );
@@ -887,7 +888,7 @@ extern "C"
     case UserMark::Type::POI:
       {
         PoiMarkPoint const * poiMark = CastMark<PoiMarkPoint>(mark);
-        CallOnPoiActivatedListener(obj, mark->GetOrg(), poiMark->GetInfo(), poiMark->GetMetadata());
+        CallOnPoiActivatedListener(obj, mark->GetPivot(), poiMark->GetInfo(), poiMark->GetMetadata());
         break;
       }
 
@@ -895,8 +896,8 @@ extern "C"
       {
         SearchMarkPoint const * searchMark = CastMark<SearchMarkPoint>(mark);
         feature::Metadata metadata;
-        fm->FindClosestPOIMetadata(mark->GetOrg(), metadata);
-        CallOnAdditionalLayerActivatedListener(obj, searchMark->GetOrg(), searchMark->GetInfo(), metadata);
+        fm->FindClosestPOIMetadata(mark->GetPivot(), metadata);
+        CallOnAdditionalLayerActivatedListener(obj, searchMark->GetPivot(), searchMark->GetInfo(), metadata);
         break;
       }
 
@@ -1131,10 +1132,10 @@ extern "C"
     env->SetObjectField(jsearchResult, typeId, jni::ToJavaString(env, info.GetPinType()));
 
     static jfieldID const latId = env->GetFieldID(javaClazz, "mLat", "D");
-    env->SetDoubleField(jsearchResult, latId, MercatorBounds::YToLat(mark->GetOrg().y));
+    env->SetDoubleField(jsearchResult, latId, MercatorBounds::YToLat(mark->GetPivot().y));
 
     static jfieldID const lonId = env->GetFieldID(javaClazz, "mLon", "D");
-    env->SetDoubleField(jsearchResult, lonId, MercatorBounds::XToLon(mark->GetOrg().x));
+    env->SetDoubleField(jsearchResult, lonId, MercatorBounds::XToLon(mark->GetPivot().x));
 
     g_framework->InjectMetadata(env, javaClazz, jsearchResult, mark);
   }
diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp
index b9b21d1116..859cdf16f9 100644
--- a/android/jni/com/mapswithme/maps/Framework.hpp
+++ b/android/jni/com/mapswithme/maps/Framework.hpp
@@ -28,7 +28,7 @@ namespace android
                     public storage::ActiveMapsLayout::ActiveMapsListener
   {
   private:
-    dp::MasterPointer<dp::ThreadSafeFactory> m_contextFactory;
+    drape_ptr<dp::ThreadSafeFactory> m_contextFactory;
     ::Framework m_work;
 
     typedef shared_ptr<jobject> TJobject;
diff --git a/android/jni/com/mapswithme/maps/bookmarks/data/Bookmark.cpp b/android/jni/com/mapswithme/maps/bookmarks/data/Bookmark.cpp
index a21bd90f15..9102e6fe56 100644
--- a/android/jni/com/mapswithme/maps/bookmarks/data/Bookmark.cpp
+++ b/android/jni/com/mapswithme/maps/bookmarks/data/Bookmark.cpp
@@ -67,7 +67,7 @@ extern "C"
   Java_com_mapswithme_maps_bookmarks_data_Bookmark_getXY(
        JNIEnv * env, jobject thiz, jint cat, jlong bmk)
   {
-    return jni::GetNewParcelablePointD(env, getBookmark(cat, bmk)->GetOrg());
+    return jni::GetNewParcelablePointD(env, getBookmark(cat, bmk)->GetPivot());
   }
 
   JNIEXPORT jdouble JNICALL
diff --git a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkCategory.cpp b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkCategory.cpp
index 703b34cb9f..115aae4989 100644
--- a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkCategory.cpp
+++ b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkCategory.cpp
@@ -114,7 +114,7 @@ extern "C"
     string formattedLenght;
     MeasurementUtils::FormatDistance(nTrack->GetLengthMeters(), formattedLenght);
 
-    dp::Color nColor = nTrack->GetMainColor();
+    dp::Color nColor = nTrack->GetColor(0);
 
     jint androidColor = shift(nColor.GetAlfa(), 24) +
                         shift(nColor.GetRed(), 16) +