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

PR fixes

Browse source
This commit is contained in:
Lev Dragunov 2015-04-02 20:37:08 +03:00 • committed by Alex Zolotarev
parent 1db6f47ce3
commit eab75c690e
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
generator/routing_generator.cpp
View file

@ -99,13 +99,13 @@ void BuildRoutingIndex(string const & baseDir, string const & countryName, strin
// Check mwm borders crossing.
for (m2::RegionD const & border: regionBorders)
{
bool const outStart = border.Contains({ MercatorBounds::LonToX(startSeg.lon1), MercatorBounds::LatToY(startSeg.lat1) });
bool const outEnd = border.Contains({ MercatorBounds::LonToX(endSeg.lon2), MercatorBounds::LatToY(endSeg.lat2) });
bool const outStart = border.Contains(MercatorBounds::FromLatLon(startSeg.lat1, startSeg.lon1));
bool const outEnd = border.Contains(MercatorBounds::FromLatLon(endSeg.lat2, endSeg.lon2));
if (outStart == outEnd)
continue;
m2::PointD intersection = m2::PointD::Zero();
for (auto const & segment : data.m_segments)
if (border.FindIntersection({MercatorBounds::LonToX(segment.lon1), MercatorBounds::LatToY(segment.lat1)}, {MercatorBounds::LonToX(segment.lon2), MercatorBounds::LatToY(segment.lat2)}, intersection))
if (border.FindIntersection(MercatorBounds::FromLatLon(segment.lat1, segment.lon1), MercatorBounds::FromLatLon(segment.lat2, segment.lon2), intersection))
break;
if (intersection == m2::PointD::Zero())
continue;
@ -115,7 +115,7 @@ void BuildRoutingIndex(string const & baseDir, string const & countryName, strin
if (outStart && !outEnd)
{
string mwmName;
m2::PointD const mercatorPoint(MercatorBounds::LonToX(endSeg.lon2), MercatorBounds::LatToY(endSeg.lat2));
m2::PointD const mercatorPoint(MercatorBounds::FromLatLon(endSeg.lat2, endSeg.lon2));
m_countries.ForEachInRect(m2::RectD(mercatorPoint, mercatorPoint), [&](borders::CountryPolygons const & c)
{
if (c.m_name == countryName)
@ -126,7 +126,7 @@ void BuildRoutingIndex(string const & baseDir, string const & countryName, strin
if (region.Contains(mercatorPoint))
mwmName = c.m_name;
else
if (region.AtBorder(mercatorPoint,0.01))
if (region.AtBorder(mercatorPoint, 0.01 /*Near border accuracy. In mercator.*/))
mwmName = c.m_name;
});
});

8
integration_tests/osrm_route_test.cpp
View file

@ -55,14 +55,14 @@ namespace
UNIT_TEST(ArbatBaliCrimeanForwardCrossMwmTest)
{
shared_ptr<integration::OsrmRouterComponents> routerComponents = integration::GetAllMaps();
integration::CalculateRouteAndTestRouteLength(routerComponents, {MercatorBounds::LonToX(34.804955), MercatorBounds::LatToY(46.152324)},
{0., 0.}, {MercatorBounds::LonToX(35.369712), MercatorBounds::LatToY(45.356971)}, 105000.);
integration::CalculateRouteAndTestRouteLength(routerComponents, MercatorBounds::FromLatLon(46.152324, 34.804955),
{0., 0.}, MercatorBounds::FromLatLon(45.35697, 35.369712), 105000.);
}
UNIT_TEST(ArbatBaliCrimeanBackwardCrossTest)
{
shared_ptr<integration::OsrmRouterComponents> routerComponents = integration::GetAllMaps();
integration::CalculateRouteAndTestRouteLength(routerComponents, {MercatorBounds::LonToX(35.369712), MercatorBounds::LatToY(45.356971)},
{0., 0.}, {MercatorBounds::LonToX(34.804955), MercatorBounds::LatToY(46.152324)}, 105000.);
integration::CalculateRouteAndTestRouteLength(routerComponents, MercatorBounds::FromLatLon(45.356971, 35.369712),
{0., 0.}, MercatorBounds::FromLatLon(46.152324, 34.804955), 105000.);
}
}