pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Daria Volvenkova 2017-08-10 11:18:38 +03:00 • committed by Roman Kuznetsov
parent 3659b7d642
commit 2954e5af12
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drape_frontend/user_mark_generator.cpp
View file

@ -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;
}

5
drape_frontend/user_mark_shapes.cpp
View file

@ -22,7 +22,8 @@
namespace df
{
std::vector<double> const kLineWidthZoomFactor = {
std::vector<double> 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<dp::TextureManager> 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;