[android] Fixed invalid merge with master branch

1 files changed, 70 insertions, 14 deletions

diff --git a/android/jni/com/mapswithme/platform/Platform.cpp b/android/jni/com/mapswithme/platform/Platform.cpp
index 67db8deecf..e7983c117f 100644
--- a/android/jni/com/mapswithme/platform/Platform.cpp
+++ b/android/jni/com/mapswithme/platform/Platform.cpp
@@ -1,24 +1,67 @@
 #include "Platform.hpp"
 
-#include "../core/jni_string.hpp"
-
 #include "../../../../../base/logging.hpp"
 
+#include "../../../../../std/algorithm.hpp"
+#include "../../../../../std/cmath.hpp"
+
 class Platform::PlatformImpl
 {
 public:
-  PlatformImpl(int densityDpi)
+  PlatformImpl(int densityDpi, int screenWidth, int screenHeight)
   { // Constants are taken from android.util.DisplayMetrics
+
+    // ceiling screen sizes to the nearest power of two, and taking half of it as a tile size
+    double const log2 = log(2.0);
+
+    screenWidth = static_cast<int>(pow(2.0, ceil(log(double(screenWidth)) / log2)));
+    screenHeight = static_cast<int>(pow(2.0, ceil(log(double(screenHeight)) / log2)));
+
+    m_tileSize = min(max(max(screenWidth, screenHeight) / 2, 128), 512);
+
+    int const k = static_cast<int>((256.0 / m_tileSize) * (256.0 / m_tileSize));
+
+    // calculating how much tiles we need for the screen of such size
+
+    // pure magic ;)
+
+    double const rotatedScreenCircleDiameter = sqrt(screenWidth * screenWidth + screenHeight * screenHeight);
+    int const tilesOnOneSide = ceil(rotatedScreenCircleDiameter / (m_tileSize / 1.05 / 2));
+    int const singleScreenTilesCount = tilesOnOneSide * tilesOnOneSide;
+    m_maxTilesCount = singleScreenTilesCount * 2;
+
+    LOG(LINFO, ("minimum amount of tiles needed is", m_maxTilesCount));
+
+    m_maxTilesCount = max(120 * k, m_maxTilesCount);
+
     switch (densityDpi)
     {
-    case 120: m_visualScale = 0.75; m_skinName = "basic_ldpi.skn"; break;
-    case 160: m_visualScale = 1.0; m_skinName = "basic_mdpi.skn"; break;
-    case 240: m_visualScale = 1.5; m_skinName = "basic_hdpi.skn"; break;
-    default: m_visualScale = 2.0; m_skinName = "basic_xhdpi.skn"; break;
+    case 120:
+      m_visualScale = 0.75;
+      m_skinName = "basic_ldpi.skn";
+      LOG(LINFO, ("using LDPI resources"));
+      break;
+    case 160:
+      m_visualScale = 1.0;
+      m_skinName = "basic_mdpi.skn";
+      LOG(LINFO, ("using MDPI resources"));
+      break;
+    case 240:
+      m_visualScale = 1.5;
+      m_skinName = "basic_hdpi.skn";
+      LOG(LINFO, ("using HDPI resources"));
+      break;
+    default:
+      m_visualScale = 2.0;
+      m_skinName = "basic_xhdpi.skn";
+      LOG(LINFO, ("using XHDPI resources"));
+      break;
     }
   }
   double m_visualScale;
   string m_skinName;
+  int m_maxTilesCount;
+  size_t m_tileSize;
 };
 
 double Platform::VisualScale() const
@@ -31,6 +74,16 @@ string Platform::SkinName() const
   return m_impl->m_skinName;
 }
 
+int Platform::MaxTilesCount() const
+{
+  return m_impl->m_maxTilesCount;
+}
+
+int Platform::TileSize() const
+{
+  return m_impl->m_tileSize;
+}
+
 namespace android
 {
   Platform::~Platform()
@@ -38,24 +91,27 @@ namespace android
     delete m_impl;
   }
 
-  void Platform::Initialize(int densityDpi, string const & apkPath,
-      jint screenWidth, jint screenHeight,
+  void Platform::Initialize(int densityDpi, int screenWidth, int screenHeight,
+      string const & apkPath,
       string const & storagePath, string const & tmpPath,
       string const & extTmpPath, string const & settingsPath)
   {
     m_impl = new PlatformImpl(densityDpi, screenWidth, screenHeight);
 
-    m_resourcesDir = jni::ToString(env, apkPath);
-    m_writableDir = jni::ToString(env, storagePath);
-    m_settingsDir = jni::ToString(env, settingsPath);
+    m_resourcesDir = apkPath;
+    m_writableDir = storagePath;
+    m_settingsDir = settingsPath;
 
-    m_localTmpPath = jni::ToString(env, tmpPath);
-    m_externalTmpPath = jni::ToString(env, extTmpPath);
+    m_localTmpPath = tmpPath;
+    m_externalTmpPath = extTmpPath;
     // By default use external temporary folder
     m_tmpDir = m_externalTmpPath;
 
     LOG(LDEBUG, ("Apk path = ", m_resourcesDir));
     LOG(LDEBUG, ("Writable path = ", m_writableDir));
+    LOG(LDEBUG, ("Local tmp path = ", m_localTmpPath));
+    LOG(LDEBUG, ("External tmp path = ", m_externalTmpPath));
+    LOG(LDEBUG, ("Settings path = ", m_settingsDir));
   }
 
   void Platform::OnExternalStorageStatusChanged(bool isAvailable)