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

[generator] Fixed mini-roundabouts to roads matching.

Browse source
This commit is contained in:
Olga Khlopkova 2019-12-09 18:52:58 +03:00 • committed by Vladimir Byko-Ianko
parent d9ef62396a
commit 9e3f012f1d
2 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
generator/generator_tests/mini_roundabout_tests.cpp
View file

@ -213,8 +213,9 @@ UNIT_TEST(Manage_MiniRoundabout_1Road)
AddPointToCircle(circlePlain, newPointOnRoad);
std::vector<m2::PointD> const circlePlainExpected{
{11.50013, 85.06309}, {11.50012, 85.06310}, {11.50010, 85.06309},
{11.50010, 85.06306}, {11.50012, 85.06305}, {11.50013, 85.06306}};
{11.50013, 85.06309}, {11.50012, 85.06310}, {11.50011, 85.06310},
{11.50010, 85.06309},{11.50010, 85.06306}, {11.50012, 85.06305},
{11.50013, 85.06306}};
TestRunCmpPoints(circlePlain, circlePlainExpected, r);
}
@ -236,7 +237,7 @@ UNIT_TEST(Manage_MiniRoundabout_4Roads)
double const r = mercator::MetersToMercator(2.5);
auto circlePlain = PointToPolygon(center, r, 6, 30.0);
auto circlePlainBeforeAdd = circlePlain;
AddPointToCircle(circlePlain, TrimSegment(mercator::FromLatLon(stationRoadNode.m_lat,
stationRoadNode.m_lon),
center, r));
@ -251,7 +252,27 @@ UNIT_TEST(Manage_MiniRoundabout_4Roads)
plaughRoundaboutRightNode.m_lon),
center, r));
// No road points are added to the circle, becouse all of them are too close to the
// original circle points.
TestRunCmpPoints(circlePlain, circlePlainBeforeAdd, r);
std::vector<m2::PointD> const circlePlainExpected{
{-0.47381, 60.67520}, {-0.47383, 60.67521}, {-0.47384, 60.67521},
{-0.47385, 60.67520},{-0.47386, 60.67520}, {-0.47385, 60.67518},
{-0.47385, 60.67518}, {-0.47383,60.67517}, {-0.47381,60.67518},
{-0.47381, 60.67518}};
TestRunCmpPoints(circlePlain, circlePlainExpected, r);
}
UNIT_TEST(Manage_MiniRoundabout_EqualPoints)
{
auto const miniRoundabout = MiniRoundabout(1, 10.0, 10.0);
m2::PointD const center =
mercator::FromLatLon({miniRoundabout.m_lat, miniRoundabout.m_lon});
double const r = mercator::MetersToMercator(5.0);
auto circlePlain = PointToPolygon(center, r, 12, 30.0);
AddPointToCircle(circlePlain, circlePlain[12]);
AddPointToCircle(circlePlain, circlePlain[6]);
AddPointToCircle(circlePlain, circlePlain[0]);
AddPointToCircle(circlePlain, circlePlain[0]);
TEST_EQUAL(circlePlain.size(), 16, ());
}

3
generator/mini_roundabout_transformer.cpp
View file

@ -254,9 +254,6 @@ void AddPointToCircle(std::vector<m2::PointD> & circle, m2::PointD const & point
for (size_t i = 0; i < circle.size(); ++i)
{
if (AlmostEqualAbs(circle[i], point, kMwmPointAccuracy))
return;
double const dist = DistanceOnPlain(circle[i], point);
if (dist < dist1)
{