From 2954e5af129d92f8f822b1494a01e3f7c2894553 Mon Sep 17 00:00:00 2001 From: Daria Volvenkova Date: Thu, 10 Aug 2017 11:18:38 +0300 Subject: [PATCH] Review fixes. --- drape_frontend/user_mark_generator.cpp | 8 ++++---- drape_frontend/user_mark_shapes.cpp | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drape_frontend/user_mark_generator.cpp b/drape_frontend/user_mark_generator.cpp index 510962c679..8a96d59611 100644 --- a/drape_frontend/user_mark_generator.cpp +++ b/drape_frontend/user_mark_generator.cpp @@ -120,7 +120,7 @@ void UserMarkGenerator::UpdateIndex(MarkGroupID groupId) double const maxLength = range / (1 << (zoomLevel - 1)); df::ProcessSplineSegmentRects(params.m_spline, maxLength, - [&](m2::RectD const & segmentRect) -> bool + [&](m2::RectD const & segmentRect) { CalcTilesCoverage(segmentRect, zoomLevel, [&](int tileX, int tileY) { @@ -274,10 +274,10 @@ void UserMarkGenerator::CacheUserMarks(TileKey const & tileKey, MarksIDGroups co int UserMarkGenerator::GetNearestLineIndexZoom(int zoom) const { int nearestZoom = kLineIndexingLevels[0]; - for (int zoomLevel : kLineIndexingLevels) + for (size_t i = 1; i < kLineIndexingLevels.size(); ++i) { - if (zoomLevel <= zoom) - nearestZoom = zoomLevel; + if (kLineIndexingLevels[i] <= zoom) + nearestZoom = kLineIndexingLevels[i]; else break; } diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp index b1199c818f..ee9621dd2d 100644 --- a/drape_frontend/user_mark_shapes.cpp +++ b/drape_frontend/user_mark_shapes.cpp @@ -22,7 +22,8 @@ namespace df { -std::vector const kLineWidthZoomFactor = { +std::vector const kLineWidthZoomFactor = +{ // 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 0.3, 0.3, 0.3, 0.4, 0.5, 0.6, 0.7, 0.7, 0.7, 0.7, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 }; @@ -263,7 +264,7 @@ void CacheUserLines(TileKey const & tileKey, ref_ptr texture bool intersected = false; ProcessSplineSegmentRects(renderInfo.m_spline, maxLength, - [&tileRect, &intersected](m2::RectD const & segmentRect) -> bool + [&tileRect, &intersected](m2::RectD const & segmentRect) { if (segmentRect.IsIntersect(tileRect)) intersected = true;