From 8fa98ed27d0a1458c49beb43e1c2497692008e23 Mon Sep 17 00:00:00 2001 From: vng Date: Mon, 13 Nov 2017 13:42:00 +0300 Subject: [PATCH] Increase max segregated distances. --- src/extractor/extractor.cpp | 11 +++++------ test/nodejs/constants.js | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/extractor/extractor.cpp b/src/extractor/extractor.cpp index 0df23f23d..54d6c27b3 100644 --- a/src/extractor/extractor.cpp +++ b/src/extractor/extractor.cpp @@ -889,8 +889,7 @@ bool IsSegregated(std::vector v1, return false; } - // set_intersection like routine to count equal name pairs, std function is - // not acceptable because of duplicates {a, a, b} ∩ {a, a, c} == {a, a}. + // set_intersection like routine to get equal result pairs std::vector> commons; auto i1 = v1.begin(); @@ -933,14 +932,14 @@ bool IsSegregated(std::vector v1, { case guidance::RoadPriorityClass::MOTORWAY: case guidance::RoadPriorityClass::TRUNK: - return 15.0; + return 30.0; case guidance::RoadPriorityClass::PRIMARY: - return 10.0; + return 20.0; case guidance::RoadPriorityClass::SECONDARY: case guidance::RoadPriorityClass::TERTIARY: - return 5.0; + return 10.0; default: - return 2.5; + return 5.0; } }; diff --git a/test/nodejs/constants.js b/test/nodejs/constants.js index 8e4bcc151..f1e85c5fd 100644 --- a/test/nodejs/constants.js +++ b/test/nodejs/constants.js @@ -10,7 +10,7 @@ exports.three_test_coordinates = [[7.41337, 43.72956], 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