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

Increase max segregated distances.

Browse Source
This commit is contained in:
vng 2017-11-13 13:42:00 +03:00 committed by Michael Krasnyk
parent 111030864c
commit 8fa98ed27d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/extractor/extractor.cpp
View File

@ -889,8 +889,7 @@ bool IsSegregated(std::vector<EdgeInfo> v1,
return false; return false;
} }
// set_intersection like routine to count equal name pairs, std function is // set_intersection like routine to get equal result pairs
// not acceptable because of duplicates {a, a, b} ∩ {a, a, c} == {a, a}.
std::vector<std::pair<EdgeInfo const *, EdgeInfo const *>> commons; std::vector<std::pair<EdgeInfo const *, EdgeInfo const *>> commons;
auto i1 = v1.begin(); auto i1 = v1.begin();
@ -933,14 +932,14 @@ bool IsSegregated(std::vector<EdgeInfo> v1,
{ {
case guidance::RoadPriorityClass::MOTORWAY: case guidance::RoadPriorityClass::MOTORWAY:
case guidance::RoadPriorityClass::TRUNK: case guidance::RoadPriorityClass::TRUNK:
return 15.0; return 30.0;
case guidance::RoadPriorityClass::PRIMARY: case guidance::RoadPriorityClass::PRIMARY:
return 10.0; return 20.0;
case guidance::RoadPriorityClass::SECONDARY: case guidance::RoadPriorityClass::SECONDARY:
case guidance::RoadPriorityClass::TERTIARY: case guidance::RoadPriorityClass::TERTIARY:
return 5.0; return 10.0;
default: default:
return 2.5; return 5.0;
} }
}; };

2
test/nodejs/constants.js
View File

@ -10,7 +10,7 @@ exports.three_test_coordinates = [[7.41337, 43.72956],
exports.two_test_coordinates = exports.three_test_coordinates.slice(0, 2) exports.two_test_coordinates = exports.three_test_coordinates.slice(0, 2)
exports.test_tile = {'at': [17059, 11948, 15], 'size': 168151}; exports.test_tile = {'at': [17059, 11948, 15], 'size': 168606};
// Test files generated by the routing engine; check test/data // Test files generated by the routing engine; check test/data