[codereview]

4 files changed, 20 insertions, 18 deletions

diff --git a/android/YoPme/jni/Framework.cpp b/android/YoPme/jni/Framework.cpp
index 5740e49663..433b1b1e28 100644
--- a/android/YoPme/jni/Framework.cpp
+++ b/android/YoPme/jni/Framework.cpp
@@ -117,4 +117,15 @@ namespace yopme
     m_framework.DoPaint(pe);
     m_framework.EndPaint(pe);
   }
+
+  void Framework::OnKmlFileUpdate()
+  {
+    m_framework.LoadBookmarks();
+  }
+
+  void Framework::OnMapFileUpdate()
+  {
+    m_framework.RemoveLocalMaps();
+    m_framework.AddLocalMaps();
+  }
 } //yopme
diff --git a/android/YoPme/jni/Framework.hpp b/android/YoPme/jni/Framework.hpp
index 6ac6c65bec..07f94788f3 100644
--- a/android/YoPme/jni/Framework.hpp
+++ b/android/YoPme/jni/Framework.hpp
@@ -14,7 +14,8 @@ namespace yopme
     bool ShowMyPosition(double lat, double lon, double zoom);
     bool ShowPoi(double lat, double lon, bool needMyLoc, double myLat, double myLoc, double zoom);
 
-    ::Framework & NativeFramework() { return m_framework; }
+    void OnMapFileUpdate();
+    void OnKmlFileUpdate();
 
   private:
     void ShowRect(bool needApiPin, m2::PointD const & apiPinPoint,
diff --git a/android/YoPme/jni/MapRenderer.cpp b/android/YoPme/jni/MapRenderer.cpp
index b7e1a14b29..a9a24be9c9 100644
--- a/android/YoPme/jni/MapRenderer.cpp
+++ b/android/YoPme/jni/MapRenderer.cpp
@@ -10,8 +10,6 @@ namespace
   static shared_ptr<yopme::Framework> s_framework;
 }
 
-#define FRAMEWORK_CHECK() ASSERT(s_framework != NULL, ())
-
 // @TODO refactor and remove that
 void InitNVEvent(JavaVM * jvm) {}
 
@@ -28,8 +26,7 @@ JNIEXPORT bool JNICALL
 Java_com_mapswithme_yopme_map_MapRenderer_nativeRenderMyPosition(JNIEnv * env, jobject obj,
                                                                  double lat, double lon, double zoom)
 {
-//  ASSERT(s_framework != NULL, ());
-  FRAMEWORK_CHECK();
+  ASSERT(s_framework != NULL, ());
   return s_framework->ShowMyPosition(lat, lon, zoom);
 }
 
@@ -39,24 +36,22 @@ Java_com_mapswithme_yopme_map_MapRenderer_nativeRenderPoiMap(JNIEnv * env, jobje
                                                             bool needMyLoc, double myLat, double myLon,
                                                             double zoom)
 {
-//  ASSERT(s_framework != NULL, ());
-  FRAMEWORK_CHECK();
+  ASSERT(s_framework != NULL, ());
   return s_framework->ShowPoi(lat, lon, needMyLoc, myLat, myLon, zoom);
 }
 
 JNIEXPORT void JNICALL
 Java_com_mapswithme_yopme_map_MapRenderer_nativeOnMapFileUpdate(JNIEnv * env, jobject thiz)
 {
-  FRAMEWORK_CHECK();
-  s_framework->NativeFramework().RemoveLocalMaps();
-  s_framework->NativeFramework().AddLocalMaps();
+  ASSERT(s_framework != NULL, ());
+  s_framework->OnMapFileUpdate();
 }
 
 JNIEXPORT void JNICALL
 Java_com_mapswithme_yopme_map_MapRenderer_nativeOnKmlFileUpdate(JNIEnv * env, jobject thiz)
 {
-  FRAMEWORK_CHECK();
-  s_framework->NativeFramework().LoadBookmarks();
+  ASSERT(s_framework != NULL, ());
+  s_framework->OnKmlFileUpdate();
 }
 
 } // extern "C"
diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 3aa45bae9a..113634d381 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -860,12 +860,7 @@ extern "C"
 
   JNIEXPORT jdoubleArray Java_com_mapswithme_maps_Framework_getScreenRectCenter(JNIEnv * env, jclass clazz)
   {
-    const m2::PointD center = g_framework
-        ->NativeFramework()
-        ->GetNavigator()
-        .Screen()
-        .GlobalRect()
-        .GlobalCenter();
+    const m2::PointD center = g_framework->NativeFramework()->GetViewportCenter();
 
     double latlon[] = {MercatorBounds::YToLat(center.y), MercatorBounds::XToLon(center.x)};
     jdoubleArray jLatLon = env->NewDoubleArray(2);