Prepare for drawing WorldCoasts in [0-17] scales:

- Use DataHeader::GetLastScale for covering depth calculation
- Pass correct scale to ForEachInIntervalAndScale for scale >= 10.

1 files changed, 8 insertions, 2 deletions

diff --git a/indexer/index.hpp b/indexer/index.hpp
index cf49839b2c..7d65749721 100644
--- a/indexer/index.hpp
+++ b/indexer/index.hpp
@@ -108,8 +108,14 @@ private:
         {
           feature::DataHeader const & header = pValue->GetHeader();
 
-          // prepare needed covering
-          covering::IntervalsT const & interval = cov.Get(header.GetScaleRange());
+          // Prepare needed covering.
+
+          // In case of WorldCoasts we should pass correct scale in ForEachInIntervalAndScale.
+          int const lastScale = header.GetLastScale();
+          if (scale > lastScale) scale = lastScale;
+
+          // Use last coding scale for covering (see index_builder.cpp).
+          covering::IntervalsT const & interval = cov.Get(lastScale);
 
           // prepare features reading
           FeaturesVector fv(pValue->m_cont, header);