map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[routing] Routing integration tests on not crossing toll roads.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2019-08-06 12:56:48 +03:00 • committed by Aleksey Belousov
parent 6dc10d695f
commit 0704247dfc
2 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routing/index_graph.cpp
View file

@ -241,8 +241,6 @@ void IndexGraph::GetSegmentCandidateForRoadPoint(RoadPoint const & rp, NumMwmId
if (!road.IsValid())
return;
// Note. Flag |useRoutingOptions| is not passed to this place because it's true
// for all cases in current code. So if below should be checked anyway.
if (!road.SuitableForOptions(m_avoidRoutingOptions))
return;

46
routing/routing_integration_tests/route_test.cpp
View file

@ -1,6 +1,7 @@
#include "testing/testing.hpp"
#include "routing/routing_callbacks.hpp"
#include "routing/routing_options.hpp"
#include "routing/routing_integration_tests/routing_test_tools.hpp"
@ -13,6 +14,28 @@ using namespace std;
namespace
{
class RoutingOptionSetter
{
public:
RoutingOptionSetter(RoutingOptions::Road road)
{
m_formerRoutingOptions.LoadCarOptionsFromSettings();
RoutingOptions routingOptions;
routingOptions.Add(road);
RoutingOptions::SaveCarOptionsToSettings(routingOptions);
}
~RoutingOptionSetter()
{
RoutingOptions::SaveCarOptionsToSettings(m_formerRoutingOptions);
}
private:
RoutingOptions m_formerRoutingOptions;
};
UNIT_TEST(StrangeCaseInAfrica)
{
integration::CalculateRouteAndTestRouteLength(
@ -505,4 +528,27 @@ namespace
MercatorBounds::FromLatLon(51.603582, 0.266995), {0., 0.},
MercatorBounds::FromLatLon(51.606785, 0.264055), 416.8);
}
// Test that toll road is not crossed by a fake edge if RouingOptions are set to Road::Toll.
UNIT_TEST(RussiaMoscowNotCrossingTollRoadTest)
{
auto & vehicleComponents = integration::GetVehicleComponents(VehicleType::Car);
RoutingOptionSetter routingOptionSetter(RoutingOptions::Road::Toll);
integration::CalculateRouteAndTestRouteLength(
vehicleComponents, MercatorBounds::FromLatLon(55.93934, 37.406), {0.0, 0.0},
MercatorBounds::FromLatLon(55.93952, 37.45089), 8987.7);
}
// Test on necessity calling RectCoversPolyline() after DataSource::ForEachInRect()
// while looking for fake edges.
UNIT_TEST(RussiaMoscowNecessityRectCoversPolylineTest)
{
auto & vehicleComponents = integration::GetVehicleComponents(VehicleType::Car);
RoutingOptionSetter routingOptionSetter(RoutingOptions::Road::Toll);
integration::CalculateRouteAndTestRouteLength(
vehicleComponents, MercatorBounds::FromLatLon(55.93885, 37.40588), {0.0, 0.0},
MercatorBounds::FromLatLon(55.93706, 37.45339), 10270.2);
}
} // namespace