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

[bookmarks] Review fixes.

Browse source
This commit is contained in:
Daria Volvenkova 2020-03-18 13:32:10 +03:00 • committed by mpimenov
parent bb4368cecd
commit 30e24efaea
4 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
map/bookmark_manager.cpp
View file

@ -1097,7 +1097,7 @@ void BookmarkManager::SetElevationActivePoint(kml::TrackId const & trackId, doub
CHECK(track != nullptr, ());
m2::PointD pt;
CHECK(track->GetPoint(targetDistance, pt), (trackId, targetDistance));
VERIFY(track->GetPoint(targetDistance, pt), (trackId, targetDistance));
SelectTrack(TrackSelectionInfo(trackId, pt, targetDistance));
}
@ -1155,18 +1155,16 @@ BookmarkManager::TrackSelectionInfo BookmarkManager::FindNearestTrack(
m2::ParametrizedSegment<m2::PointD> seg(pt1, pt2);
auto const closestPoint = seg.ClosestPointTo(touchRect.Center());
auto const squaredDist = closestPoint.SquaredLength(touchRect.Center());
if (squaredDist < minSquaredDist)
{
minSquaredDist = squaredDist;
selectionInfo.m_trackId = trackId;
selectionInfo.m_trackPoint = closestPoint;
if (squaredDist >= minSquaredDist)
continue;
auto const segDistInMeters = mercator::DistanceOnEarth(pointsWithAlt[i].GetPoint(),
closestPoint);
selectionInfo.m_distanceInMeters = segDistInMeters;
if (i > 0)
selectionInfo.m_distanceInMeters += track->GetLengthMeters(i - 1);
}
minSquaredDist = squaredDist;
selectionInfo.m_trackId = trackId;
selectionInfo.m_trackPoint = closestPoint;
auto const segDistInMeters = mercator::DistanceOnEarth(pointsWithAlt[i].GetPoint(),
closestPoint);
selectionInfo.m_distanceInMeters = segDistInMeters + track->GetLengthMeters(i);
}
}
}
@ -1244,7 +1242,7 @@ void BookmarkManager::ShowDefaultTrackInfo(kml::TrackId trackId)
auto const & points = track->GetPointsWithAltitudes();
auto const pt = points[points.size() / 2].GetPoint();
auto const distance = track->GetLengthMeters(points.size() / 2 - 1);
auto const distance = track->GetLengthMeters(points.size() / 2);
auto es = GetEditSession();
auto trackInfoMark = es.GetMarkForEdit<TrackInfoMark>(m_trackInfoMarkId);

21
map/track.cpp
View file

@ -20,15 +20,16 @@ void Track::CacheLengthsAndLimitRect()
{
m_cachedLimitRect.MakeEmpty();
m_cachedLimitRect.Add(m_data.m_pointsWithAltitudes.front().GetPoint());
m_cachedLengths.resize(m_data.m_pointsWithAltitudes.size() - 1);
m_cachedLengths.resize(m_data.m_pointsWithAltitudes.size());
double length = 0.0;
m_cachedLengths[0] = 0.0;
for (size_t i = 1; i < m_data.m_pointsWithAltitudes.size(); ++i)
{
auto const & pt1 = m_data.m_pointsWithAltitudes[i - 1].GetPoint();
auto const & pt2 = m_data.m_pointsWithAltitudes[i].GetPoint();
auto const segmentLength = mercator::DistanceOnEarth(pt1, pt2);
length += segmentLength;
m_cachedLengths[i - 1] = length;
m_cachedLengths[i] = length;
m_cachedLimitRect.Add(pt2);
}
}
@ -48,10 +49,10 @@ double Track::GetLengthMeters() const
return m_cachedLengths.back();
}
double Track::GetLengthMeters(size_t segmentIndex) const
double Track::GetLengthMeters(size_t pointIndex) const
{
CHECK_LESS(segmentIndex, m_cachedLengths.size(), (segmentIndex));
return m_cachedLengths[segmentIndex];
CHECK_LESS(pointIndex, m_cachedLengths.size(), (pointIndex, m_cachedLengths.size()));
return m_cachedLengths[pointIndex];
}
df::DepthLayer Track::GetDepthLayer() const
@ -116,7 +117,7 @@ bool Track::GetPoint(double distanceInMeters, m2::PointD & pt) const
{
CHECK_GREATER_OR_EQUAL(distanceInMeters, 0.0, (distanceInMeters));
if (distanceInMeters == 0.0)
if (fabs(distanceInMeters - m_cachedLengths.front()) < 1e-2)
{
pt = m_data.m_pointsWithAltitudes.front().GetPoint();
return true;
@ -132,14 +133,14 @@ bool Track::GetPoint(double distanceInMeters, m2::PointD & pt) const
if (it == m_cachedLengths.end())
return false;
auto const segmentIndex = it - m_cachedLengths.begin();
auto const pointIndex = std::distance(m_cachedLengths.begin(), it);
auto const length = *it;
auto const segmentLength = length - (segmentIndex == 0 ? 0.0 : m_cachedLengths[segmentIndex - 1]);
auto const segmentLength = length - m_cachedLengths[pointIndex - 1];
auto const k = (segmentLength - (length - distanceInMeters)) / segmentLength;
auto const & pt1 = m_data.m_pointsWithAltitudes[segmentIndex].GetPoint();
auto const & pt2 = m_data.m_pointsWithAltitudes[segmentIndex + 1].GetPoint();
auto const & pt1 = m_data.m_pointsWithAltitudes[pointIndex - 1].GetPoint();
auto const & pt2 = m_data.m_pointsWithAltitudes[pointIndex].GetPoint();
pt = pt1 + (pt2 - pt1) * k;
return true;

2
map/track.hpp
View file

@ -22,7 +22,7 @@ public:
std::string GetName() const;
m2::RectD const & GetLimitRect() const;
double GetLengthMeters() const;
double GetLengthMeters(size_t segmentIndex) const;
double GetLengthMeters(size_t pointIndex) const;
int GetMinZoom() const override { return 1; }
df::DepthLayer GetDepthLayer() const override;

2
map/track_mark.hpp
View file

@ -31,7 +31,7 @@ private:
class TrackSelectionMark : public UserMark
{
public:
double static constexpr kInvalidDistance = -1.0;
static double constexpr kInvalidDistance = -1.0;
explicit TrackSelectionMark(m2::PointD const & ptOrg);