From 6ccf33588e4a0d3acc2b7cfce7d1555f8c74d3b8 Mon Sep 17 00:00:00 2001 From: Freenerd Date: Thu, 4 Feb 2016 18:02:44 +0100 Subject: [PATCH 1/2] Use osrm-backend#prune_distance_search --- .travis.yml | 2 +- package.json | 2 +- src/node_osrm.cpp | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 63472bb..03b2ab0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ matrix: env: global: - JOBS: "3" - - OSRM_RELEASE: "develop" + - OSRM_RELEASE: "21820dd3c60ab70e39dca5a7100e252e8835e437" - secure: KitzGZjoDblX/3heajcvssGz0JnJ/k02dr2tu03ksUV+6MogC3RSQudqyKY57+f8VyZrcllN/UOlJ0Q/3iG38Oz8DljC+7RZxtkVmE1SFBoOezKCdhcvWM12G3uqPs7hhrRxuUgIh0C//YXEkulUrqa2H1Aj2xeen4E3FAqEoy0= - secure: WLGmxl6VTVWhXGm6X83GYNYzPNsvTD+9usJOKM5YBLAdG7cnOBQBNiCCUKc9OZMMZVUr3ec2/iigakH5Y8Yc+U6AlWKzlORyqWLuk4nFuoedu62x6ocQkTkuOc7mHiYhKd21xTGMYauaZRS6kugv4xkpGES2UjI2T8cjZ+LN2jU= diff --git a/package.json b/package.json index da1b275..eb1d367 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "url": "https://github.com/Project-OSRM/node-osrm", "homepage": "http://project-osrm.org", "author": "Dane Springmeyer ", - "version": "4.9.0-develop.0", + "version": "4.9.1-traffic.1", "main": "./lib/osrm.js", "license": "BSD", "bugs": { diff --git a/src/node_osrm.cpp b/src/node_osrm.cpp index 216622e..09b967b 100644 --- a/src/node_osrm.cpp +++ b/src/node_osrm.cpp @@ -420,6 +420,11 @@ void Engine::match(const Nan::FunctionCallbackInfo &args) { params->matching_beta = obj->Get(Nan::New("matching_beta").ToLocalChecked())->NumberValue(); } + if (obj->Has(Nan::New("matching_prune_factor").ToLocalChecked())) + { + params->matching_beta = obj->Get(Nan::New("matching_prune_factor").ToLocalChecked())->NumberValue(); + } + if (timestamps->IsArray()) { From c80a383697d7df27dfae258d3cedf2fe0c2b1345 Mon Sep 17 00:00:00 2001 From: Will White Date: Wed, 24 Feb 2016 18:27:23 -0500 Subject: [PATCH 2/2] Update osrm_release sha to point at prune_distance_search branch. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 03b2ab0..256958a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ matrix: env: global: - JOBS: "3" - - OSRM_RELEASE: "21820dd3c60ab70e39dca5a7100e252e8835e437" + - OSRM_RELEASE: "c8557cf28f51fa0935a236c939c0b32c2063bf49" - secure: KitzGZjoDblX/3heajcvssGz0JnJ/k02dr2tu03ksUV+6MogC3RSQudqyKY57+f8VyZrcllN/UOlJ0Q/3iG38Oz8DljC+7RZxtkVmE1SFBoOezKCdhcvWM12G3uqPs7hhrRxuUgIh0C//YXEkulUrqa2H1Aj2xeen4E3FAqEoy0= - secure: WLGmxl6VTVWhXGm6X83GYNYzPNsvTD+9usJOKM5YBLAdG7cnOBQBNiCCUKc9OZMMZVUr3ec2/iigakH5Y8Yc+U6AlWKzlORyqWLuk4nFuoedu62x6ocQkTkuOc7mHiYhKd21xTGMYauaZRS6kugv4xkpGES2UjI2T8cjZ+LN2jU=