[drape] use upper style zoom for 18 and 19 zoom levels

also guard DoNeedReadIndex by mutex.

is's need in situations when one tile info was push to back of thread pool, and than push to front and processed on separate threads in one time.

1 files changed, 9 insertions, 3 deletions

diff --git a/drape_frontend/tile_info.cpp b/drape_frontend/tile_info.cpp
index 1f8c05a4aa..4642428a39 100644
--- a/drape_frontend/tile_info.cpp
+++ b/drape_frontend/tile_info.cpp
@@ -43,11 +43,11 @@ namespace df
 
   void TileInfo::ReadFeatureIndex(model::FeaturesFetcher const & model)
   {
+    threads::MutexGuard guard(m_mutex);
     if (DoNeedReadIndex())
     {
-      threads::MutexGuard guard(m_mutex);
       CheckCanceled();
-      model.ForEachFeatureID(GetGlobalRect(), *this, m_key.m_zoomLevel);
+      model.ForEachFeatureID(GetGlobalRect(), *this, GetZoomLevel());
       sort(m_featureInfo.begin(), m_featureInfo.end());
     }
   }
@@ -91,7 +91,7 @@ namespace df
   void TileInfo::InitStylist(const FeatureType & f, Stylist & s)
   {
     CheckCanceled();
-    df::InitStylist(f, m_key.m_zoomLevel, s);
+    df::InitStylist(f, GetZoomLevel(), s);
   }
 
   //====================================================//
@@ -112,4 +112,10 @@ namespace df
     if (m_isCanceled)
       MYTHROW(ReadCanceledException, ());
   }
+
+  int TileInfo::GetZoomLevel() const
+  {
+    int upperScale = scales::GetUpperScale();
+    return m_key.m_zoomLevel <= upperScale ? m_key.m_zoomLevel : upperScale;
+  }
 }