Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Only extract berlin.osm.pbf once and fix windows builds

Browse Source
This commit is contained in:
Patrick Niklaus
2017-03-21 00:14:28 +00:00
committed by Patrick Niklaus
parent 16621f00c1
commit 7278f88aa9
13 changed files with 70 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit_tests/library/limits.cpp
+5 -5
View File
@@ -28,7 +28,7 @@ BOOST_AUTO_TEST_CASE(test_trip_limits)
using namespace osrm;
EngineConfig config;
config.storage_config = {OSRM_TEST_DATA_DIR "/berlin_CH.osrm"};
config.storage_config = {OSRM_TEST_DATA_DIR "/ch/berlin.osrm"};
config.use_shared_memory = false;
config.max_locations_trip = 2;
@@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE(test_route_limits)
using namespace osrm;
EngineConfig config;
config.storage_config = {OSRM_TEST_DATA_DIR "/berlin_CH.osrm"};
config.storage_config = {OSRM_TEST_DATA_DIR "/ch/berlin.osrm"};
config.use_shared_memory = false;
config.max_locations_viaroute = 2;
@@ -82,7 +82,7 @@ BOOST_AUTO_TEST_CASE(test_table_limits)
using namespace osrm;
EngineConfig config;
config.storage_config = {OSRM_TEST_DATA_DIR "/berlin_CH.osrm"};
config.storage_config = {OSRM_TEST_DATA_DIR "/ch/berlin.osrm"};
config.use_shared_memory = false;
config.max_locations_distance_table = 2;
@@ -109,7 +109,7 @@ BOOST_AUTO_TEST_CASE(test_match_limits)
using namespace osrm;
EngineConfig config;
config.storage_config = {OSRM_TEST_DATA_DIR "/berlin_CH.osrm"};
config.storage_config = {OSRM_TEST_DATA_DIR "/ch/berlin.osrm"};
config.use_shared_memory = false;
config.max_locations_map_matching = 2;
@@ -136,7 +136,7 @@ BOOST_AUTO_TEST_CASE(test_nearest_limits)
using namespace osrm;
EngineConfig config;
config.storage_config = {OSRM_TEST_DATA_DIR "/berlin_CH.osrm"};
config.storage_config = {OSRM_TEST_DATA_DIR "/ch/berlin.osrm"};
config.use_shared_memory = false;
config.max_results_nearest = 2;
unit_tests/library/match.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ BOOST_AUTO_TEST_CASE(test_match)
{
using namespace osrm;
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
MatchParameters params;
params.coordinates.push_back(get_dummy_location());
unit_tests/library/nearest.cpp
+4 -4
View File
@@ -16,7 +16,7 @@ BOOST_AUTO_TEST_SUITE(nearest)
BOOST_AUTO_TEST_CASE(test_nearest_response)
{
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
using namespace osrm;
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE(test_nearest_response)
BOOST_AUTO_TEST_CASE(test_nearest_response_no_coordinates)
{
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
using namespace osrm;
@@ -59,7 +59,7 @@ BOOST_AUTO_TEST_CASE(test_nearest_response_no_coordinates)
BOOST_AUTO_TEST_CASE(test_nearest_response_multiple_coordinates)
{
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
using namespace osrm;
@@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE(test_nearest_response_multiple_coordinates)
BOOST_AUTO_TEST_CASE(test_nearest_response_for_location_in_small_component)
{
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
using namespace osrm;
unit_tests/library/options.cpp
+3 -3
View File
@@ -14,7 +14,7 @@ BOOST_AUTO_TEST_CASE(test_ch)
using namespace osrm;
EngineConfig config;
config.use_shared_memory = false;
config.storage_config = storage::StorageConfig(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
config.storage_config = storage::StorageConfig(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
config.algorithm = EngineConfig::Algorithm::CH;
OSRM osrm{config};
}
@@ -24,7 +24,7 @@ BOOST_AUTO_TEST_CASE(test_corech)
using namespace osrm;
EngineConfig config;
config.use_shared_memory = false;
config.storage_config = storage::StorageConfig(OSRM_TEST_DATA_DIR "/berlin_CoreCH.osrm");
config.storage_config = storage::StorageConfig(OSRM_TEST_DATA_DIR "/corech/berlin.osrm");
config.algorithm = EngineConfig::Algorithm::CoreCH;
OSRM osrm{config};
}
@@ -34,7 +34,7 @@ BOOST_AUTO_TEST_CASE(test_mld)
using namespace osrm;
EngineConfig config;
config.use_shared_memory = false;
config.storage_config = storage::StorageConfig(OSRM_TEST_DATA_DIR "/berlin_MLD.osrm");
config.storage_config = storage::StorageConfig(OSRM_TEST_DATA_DIR "/mld/berlin.osrm");
config.algorithm = EngineConfig::Algorithm::MLD;
OSRM osrm{config};
}
unit_tests/library/route.cpp
+8 -8
View File
@@ -17,7 +17,7 @@ BOOST_AUTO_TEST_SUITE(route)
BOOST_AUTO_TEST_CASE(test_route_same_coordinates_fixture)
{
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
using namespace osrm;
@@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE(test_route_same_coordinates_fixture)
BOOST_AUTO_TEST_CASE(test_route_same_coordinates)
{
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
using namespace osrm;
@@ -249,7 +249,7 @@ BOOST_AUTO_TEST_CASE(test_route_same_coordinates)
BOOST_AUTO_TEST_CASE(test_route_response_for_locations_in_small_component)
{
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
using namespace osrm;
@@ -284,7 +284,7 @@ BOOST_AUTO_TEST_CASE(test_route_response_for_locations_in_small_component)
BOOST_AUTO_TEST_CASE(test_route_response_for_locations_in_big_component)
{
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
using namespace osrm;
@@ -319,7 +319,7 @@ BOOST_AUTO_TEST_CASE(test_route_response_for_locations_in_big_component)
BOOST_AUTO_TEST_CASE(test_route_response_for_locations_across_components)
{
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
using namespace osrm;
@@ -356,7 +356,7 @@ BOOST_AUTO_TEST_CASE(test_route_response_for_locations_across_components)
BOOST_AUTO_TEST_CASE(test_route_user_disables_generating_hints)
{
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
using namespace osrm;
@@ -376,7 +376,7 @@ BOOST_AUTO_TEST_CASE(test_route_user_disables_generating_hints)
BOOST_AUTO_TEST_CASE(speed_annotation_matches_duration_and_distance)
{
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
using namespace osrm;
@@ -410,7 +410,7 @@ BOOST_AUTO_TEST_CASE(speed_annotation_matches_duration_and_distance)
BOOST_AUTO_TEST_CASE(test_manual_setting_of_annotations_property)
{
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
using namespace osrm;
unit_tests/library/table.cpp
+3 -3
View File
@@ -19,7 +19,7 @@ BOOST_AUTO_TEST_CASE(test_table_three_coords_one_source_one_dest_matrix)
{
using namespace osrm;
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
TableParameters params;
params.coordinates.push_back(get_dummy_location());
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE(test_table_three_coords_one_source_matrix)
{
using namespace osrm;
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
TableParameters params;
params.coordinates.push_back(get_dummy_location());
@@ -113,7 +113,7 @@ BOOST_AUTO_TEST_CASE(test_table_three_coordinates_matrix)
{
using namespace osrm;
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
TableParameters params;
params.coordinates.push_back(get_dummy_location());
unit_tests/library/tile.cpp
+3 -3
View File
@@ -24,7 +24,7 @@ BOOST_AUTO_TEST_CASE(test_tile)
{
using namespace osrm;
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
// Tile within Berlin dataset at Hackescher Markt (13.40294, 52.52330)
TileParameters params{140831, 85967, 18};
@@ -216,7 +216,7 @@ BOOST_AUTO_TEST_CASE(test_tile_turns)
{
using namespace osrm;
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
// Tile within Berlin dataset at Hackescher Markt (13.40294, 52.52330)
TileParameters params{140831, 85967, 18};
@@ -366,7 +366,7 @@ BOOST_AUTO_TEST_CASE(test_tile_speeds)
{
using namespace osrm;
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
// Small tile so we can test all the values
// TileParameters params{272953, 191177, 19};
unit_tests/library/trip.cpp
+7 -7
View File
@@ -18,7 +18,7 @@ BOOST_AUTO_TEST_CASE(test_roundtrip_response_for_locations_in_small_component)
{
using namespace osrm;
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
const auto locations = get_locations_in_small_component();
TripParameters params;
@@ -60,7 +60,7 @@ BOOST_AUTO_TEST_CASE(test_roundtrip_response_for_locations_in_big_component)
{
using namespace osrm;
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
const auto locations = get_locations_in_big_component();
TripParameters params;
@@ -102,7 +102,7 @@ BOOST_AUTO_TEST_CASE(test_roundtrip_response_for_locations_across_components)
{
using namespace osrm;
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
const auto small = get_locations_in_small_component();
const auto big = get_locations_in_big_component();
@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE(test_tfse_1)
{
using namespace osrm;
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
const auto locations = get_locations_in_small_component();
TripParameters params;
@@ -194,7 +194,7 @@ BOOST_AUTO_TEST_CASE(test_tfse_2)
{
using namespace osrm;
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
const auto locations = get_locations_in_big_component();
TripParameters params;
@@ -265,7 +265,7 @@ BOOST_AUTO_TEST_CASE(test_tfse_illegal_parameters)
{
using namespace osrm;
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
const auto locations = get_locations_in_big_component();
auto params = osrm::TripParameters();
@@ -315,7 +315,7 @@ BOOST_AUTO_TEST_CASE(test_tfse_illegal_parameters)
BOOST_AUTO_TEST_CASE(test_tfse_legal_parameters)
{
using namespace osrm;
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/berlin_CH.osrm");
auto osrm = getOSRM(OSRM_TEST_DATA_DIR "/ch/berlin.osrm");
const auto locations = get_locations_in_big_component();
json::Object result;
TripParameters params;