computing current scale from the fixed-size pixel rect.

iphone/Maps/Platform/IPhonePlatform.hpp

@@ -24,6 +24,7 @@ public:
 	virtual bool IsBenchmarking() const;
 	virtual bool IsVisualLog() const;
   virtual string const DeviceID() const;
+	virtual unsigned ScaleEtalonSize() const;
 	
 private:
 	string m_deviceID;
@@ -35,4 +36,5 @@ private:
 	double m_periodicalUpdateInterval;
   string m_resourcesPath;
   string m_writablePath;
+	unsigned m_scaleEtalonSize;
 };

iphone/Maps/Platform/IPhonePlatform.mm

@@ -60,6 +60,8 @@ IPhonePlatform::IPhonePlatform()
 		}
 	}
 	
+	m_scaleEtalonSize = 256 * m_visualScale;
+	
 	NSLog(@"Device Name : %@, SystemName : %@, SystemVersion : %@", device.name, device.systemName, device.systemVersion);
 
   [pool release];
@@ -199,6 +201,11 @@ bool IPhonePlatform::IsVisualLog() const
 	return false;
 }
 
+unsigned IPhonePlatform::ScaleEtalonSize() const
+{
+	return m_scaleEtalonSize;
+}
+
 string const IPhonePlatform::DeviceID() const
 {
 	return m_deviceID;

map/framework.hpp

@@ -174,7 +174,8 @@ public:
                     GetPlatform().IsMultiSampled(),
                     GetPlatform().DoPeriodicalUpdate(),
                     GetPlatform().PeriodicalUpdateInterval(),
-                    GetPlatform().IsBenchmarking()),
+                    GetPlatform().IsBenchmarking(),
+                    GetPlatform().ScaleEtalonSize()),
       m_isRedrawEnabled(true)
   {
     m_informationDisplay.setBottomShift(bottomShift);
@@ -309,7 +310,15 @@ public:
 
   int GetCurrentScale() const
   {
-    return scales::GetScaleLevel(m_navigator.Screen().ClipRect());
+    m2::PointD textureCenter(m_renderQueue.renderState().m_textureWidth / 2,
+                             m_renderQueue.renderState().m_textureHeight / 2);
+    m2::RectD glbRect;
+
+    unsigned scaleEtalonSize = GetPlatform().ScaleEtalonSize();
+    m_navigator.Screen().PtoG(m2::RectD(textureCenter - m2::PointD(scaleEtalonSize / 2, scaleEtalonSize / 2),
+                                        textureCenter + m2::PointD(scaleEtalonSize / 2, scaleEtalonSize / 2)),
+                              glbRect);
+    return scales::GetScaleLevel(glbRect);
   }
 
   /// Actual rendering function.

map/render_queue.cpp

@@ -10,7 +10,8 @@ RenderQueue::RenderQueue(
     bool isMultiSampled,
     bool doPeriodicalUpdate,
     double updateInterval,
-    bool isBenchmarking)
+    bool isBenchmarking,
+    unsigned scaleEtalonSize)
   : m_renderState(new yg::gl::RenderState())
 {
   m_renderState->m_surfaceWidth = 100;
@@ -25,7 +26,8 @@ RenderQueue::RenderQueue(
       isMultiSampled,
       doPeriodicalUpdate,
       updateInterval,
-      isBenchmarking);
+      isBenchmarking,
+      scaleEtalonSize);
 }
 
 void RenderQueue::initializeGL(shared_ptr<yg::gl::RenderContext> const & primaryContext,

map/render_queue.hpp

@@ -35,7 +35,8 @@ public:
               bool isMultiSampled,
               bool doPeriodicalUpdate,
               double updateInterval,
-              bool isBenchmarking);
+              bool isBenchmarking,
+              unsigned scaleEtalonSize);
   /// destructor.
   ~RenderQueue();
   /// set the primary context. it starts the rendering thread.

map/render_queue_routine.cpp

@@ -33,7 +33,8 @@ RenderQueueRoutine::RenderQueueRoutine(shared_ptr<yg::gl::RenderState> const & r
                                        bool isMultiSampled,
                                        bool doPeriodicalUpdate,
                                        double updateInterval,
-                                       bool isBenchmarking)
+                                       bool isBenchmarking,
+                                       unsigned scaleEtalonSize)
 {
   m_skinName = skinName;
   m_visualScale = 0;
@@ -43,6 +44,7 @@ RenderQueueRoutine::RenderQueueRoutine(shared_ptr<yg::gl::RenderState> const & r
   m_doPeriodicalUpdate = doPeriodicalUpdate;
   m_updateInterval = updateInterval;
   m_isBenchmarking = isBenchmarking;
+  m_scaleEtalonSize = scaleEtalonSize;
 }
 
 void RenderQueueRoutine::Cancel()
@@ -373,7 +375,10 @@ void RenderQueueRoutine::Do()
 
       ScreenBase const & frameScreen = m_currentRenderCommand->m_frameScreen;
       m2::RectD glbRect;
-      frameScreen.PtoG(m2::RectD(surfaceRect), glbRect);
+      frameScreen.PtoG(m2::RectD(textureRect.Center() - m2::PointD(m_scaleEtalonSize / 2, m_scaleEtalonSize / 2),
+                                 textureRect.Center() + m2::PointD(m_scaleEtalonSize / 2, m_scaleEtalonSize / 2)),
+                       glbRect);
+//      frameScreen.PtoG(m2::RectD(surfaceRect), glbRect);
       int scaleLevel = scales::GetScaleLevel(glbRect);
 
       for (size_t i = 0; i < areas.size(); ++i)

map/render_queue_routine.hpp

@@ -78,6 +78,7 @@ private:
   double m_visualScale;
   string m_skinName;
   bool m_isBenchmarking;
+  unsigned m_scaleEtalonSize;
 
   void waitForRenderCommand(list<shared_ptr<RenderModelCommand> > & cmdList,
                             threads::ConditionGuard & guard);
@@ -88,7 +89,8 @@ public:
                      bool isMultiSampled,
                      bool doPeriodicalUpdate,
                      double updateInterval,
-                     bool isBenchmarking);
+                     bool isBenchmarking,
+                     unsigned scaleEtalonSize);
   /// initialize GL rendering
   /// this function is called just before the thread starts.
   void initializeGL(shared_ptr<yg::gl::RenderContext> const & renderContext,

platform/platform.hpp

@@ -76,6 +76,8 @@ public:
   virtual bool IsVisualLog() const = 0;
 
   virtual string const DeviceID() const = 0;
+
+  virtual unsigned ScaleEtalonSize() const = 0;
 };
 
 extern "C" Platform & GetPlatform();

platform/qtplatform.cpp

@@ -394,6 +394,11 @@ public:
   {
     return false;
   }
+
+  unsigned ScaleEtalonSize() const
+  {
+    return 512;
+  }
 };
 
 extern "C" Platform & GetPlatform()