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

Fix crash while creating golden path.

Browse source
This commit is contained in:
Sergey Magidovich 2017-08-01 14:12:21 +03:00 • committed by Yuri Gorshenin
parent cf4c67525b
commit 8603fc622b
2 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
View file

@ -13,6 +13,7 @@
#include "routing_common/car_model.hpp"
#include "geometry/mercator.hpp"
#include "geometry/point2d.hpp"
#include <QDockWidget>
@ -101,6 +102,12 @@ private:
BookmarkManager & m_bm;
};
bool PointsMatch(m2::PointD const & a, m2::PointD const & b)
{
auto constexpr kToleraneDistanceM = 1.0;
return MercatorBounds::DistanceOnEarth(a, b) < kToleraneDistanceM;
}
class PointsControllerDelegate : public PointsControllerDelegateBase
{
public:
@ -121,7 +128,7 @@ public:
return;
for (auto const & p : points)
{
if (point.EqualDxDy(p, 1e-5))
if (PointsMatch(point, p))
return;
}
points.push_back(point);
@ -146,22 +153,29 @@ public:
std::vector<FeaturePoint> GetFeaturesPointsByPoint(m2::PointD & p) const
{
std::vector<FeaturePoint> points;
indexer::ForEachFeatureAtPoint(m_index, [&points, &p](FeatureType & ft) {
m2::PointD pointOnFt;
indexer::ForEachFeatureAtPoint(m_index, [&points, &p, &pointOnFt](FeatureType & ft) {
if (ft.GetFeatureType() != feature::GEOM_LINE)
return;
size_t pointIndex = 0;
ft.ForEachPoint([&points, &p, &ft, &pointIndex](m2::PointD const & fp)
{
if (fp.EqualDxDy(p, 1e-4))
{
points.emplace_back(ft.GetID(), pointIndex);
p = fp;
}
++pointIndex;
},
FeatureType::BEST_GEOMETRY);
auto minDistance = std::numeric_limits<double>::max();
ft.ForEachPoint(
[&points, &p, &ft, &pointIndex, &minDistance, &pointOnFt](m2::PointD const & fp)
{
auto const distance = MercatorBounds::DistanceOnEarth(fp, p);
if (PointsMatch(fp, p) && distance < minDistance)
{
points.emplace_back(ft.GetID(), pointIndex);
pointOnFt = fp;
minDistance = distance;
}
++pointIndex;
},
FeatureType::BEST_GEOMETRY);
},
p);
p = pointOnFt;
return points;
}
@ -182,13 +196,13 @@ public:
m2::PointD const & lastClickedPoint,
std::vector<m2::PointD> const & reachablePoints) const
{
LOG(LDEBUG, (clickPoint, "vs", lastClickedPoint));
if (clickPoint.EqualDxDy(lastClickedPoint, 1e-4))
// == Comparison is safe here since |clickPoint| is adjusted by GetFeaturesPointsByPoint
// so to be equal the closest feature's one.
if (clickPoint == lastClickedPoint)
return ClickType::Remove;
for (auto const & p : reachablePoints)
{
LOG(LDEBUG, (clickPoint, "vs", p));
if (clickPoint.EqualDxDy(p, 1e-4))
if (PointsMatch(clickPoint, p));
return ClickType::Add;
}
return ClickType::Miss;

7
openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
View file

@ -54,6 +54,7 @@ RoadPointCandidate::RoadPointCandidate(std::vector<FeaturePoint> const & points,
: m_coord(coord)
, m_candidates(points)
{
LOG(LDEBUG, ("Candidate points:", points));
}
void RoadPointCandidate::ActivatePoint(RoadPointCandidate const & rpc)
@ -356,6 +357,9 @@ void TrafficMode::HandlePoint(m2::PointD clickPoint, Qt::MouseButton const butto
// Get candidates and also fix clickPoint to make it more accurate and sutable for
// GetOutgoingEdges.
auto const & candidatePoints = m_pointsDelegate->GetFeaturesPointsByPoint(clickPoint);
if (candidatePoints.empty())
return;
auto reachablePoints = GetReachablePoints(clickPoint, GetCoordinates(), *m_pointsDelegate,
0 /* lookBackIndex */);
auto const & clickablePoints = currentPathLength != 0
@ -422,7 +426,8 @@ void TrafficMode::HandlePoint(m2::PointD clickPoint, Qt::MouseButton const butto
}
break;
case ClickType::Miss:
LOG(LDEBUG, ("You miss"));
// TODO(mgsergio): This situation should be handled by checking candidatePoitns.empty() above.
// Not shure though if all cases are handled by that check.
return;
}
}