From d90215dc6da55da1235e4a776a76bfc577412076 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Thu, 24 Dec 2015 11:39:06 +0100 Subject: [PATCH 01/20] Use v4.9.0 osrm-backend tag --- .travis.yml | 2 +- bootstrap.sh | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d3e540..f89a0ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ matrix: env: global: - JOBS: "3" - - OSRM_RELEASE: "develop" + - OSRM_RELEASE: "v4.9.0" - secure: KitzGZjoDblX/3heajcvssGz0JnJ/k02dr2tu03ksUV+6MogC3RSQudqyKY57+f8VyZrcllN/UOlJ0Q/3iG38Oz8DljC+7RZxtkVmE1SFBoOezKCdhcvWM12G3uqPs7hhrRxuUgIh0C//YXEkulUrqa2H1Aj2xeen4E3FAqEoy0= - secure: WLGmxl6VTVWhXGm6X83GYNYzPNsvTD+9usJOKM5YBLAdG7cnOBQBNiCCUKc9OZMMZVUr3ec2/iigakH5Y8Yc+U6AlWKzlORyqWLuk4nFuoedu62x6ocQkTkuOc7mHiYhKd21xTGMYauaZRS6kugv4xkpGES2UjI2T8cjZ+LN2jU= diff --git a/bootstrap.sh b/bootstrap.sh index 12ec790..a6d5281 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -10,7 +10,7 @@ CURRENT_DIR=$(pwd) # default to clang CXX=${CXX:-clang++} TARGET=${TARGET:-Release} -OSRM_RELEASE=${OSRM_RELEASE:-"develop"} +OSRM_RELEASE=${OSRM_RELEASE:-"v4.9.0"} OSRM_REPO=${OSRM_REPO:-"https://github.com/Project-OSRM/osrm-backend.git"} OSRM_DIR=deps/osrm-backend-${TARGET} diff --git a/package.json b/package.json index da1b275..bc9571c 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.0", "main": "./lib/osrm.js", "license": "BSD", "bugs": { From 6dc0e3603b33498e0f3f27136fa2747162263a07 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Thu, 24 Dec 2015 12:06:50 +0100 Subject: [PATCH 02/20] [publish binary] From 6cb4c103c64b6e278aef61c474b3b757fe60aa3f Mon Sep 17 00:00:00 2001 From: Andreas Hippler Date: Sun, 27 Dec 2015 20:06:35 +0100 Subject: [PATCH 03/20] travis build with node version 4 and 5 on osx --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index f89a0ab..7359c46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,12 @@ matrix: compiler: gcc env: NODE_VERSION="0.10" TARGET=Debug NPM_FLAGS="--debug" # OS X + - os: osx + compiler: clang + env: NODE_VERSION="5" TARGET=Release + - os: osx + compiler: clang + env: NODE_VERSION="4" TARGET=Release - os: osx compiler: clang env: NODE_VERSION="0.12" TARGET=Release From d9f9d48e9f804f4e3fd4d7fc27ea4389f80eca89 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Mon, 28 Dec 2015 12:16:28 +0100 Subject: [PATCH 04/20] [republish binary] Add v4/v5 for Mac OS X From f41c9d571e92e22e705288b8b033d6506da3174d Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Fri, 15 Jan 2016 11:12:32 -0800 Subject: [PATCH 05/20] New traffic release based on 4.9.0 [publish binary] --- .travis.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4a223e..8700b00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ matrix: env: global: - JOBS: "3" - - OSRM_RELEASE: "develop" + - OSRM_RELEASE: "c9d9df50f7e3736bdb8e16cbc4db007fa2e28f6a" - 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..15edd52 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.0-traffic.1", "main": "./lib/osrm.js", "license": "BSD", "bugs": { From 16ccec65fb5de0c8f5f3197d2527aed92fd7d2a0 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 15 Jan 2016 16:11:42 -0800 Subject: [PATCH 06/20] update md5 --- test/data/data.md5sum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/data/data.md5sum b/test/data/data.md5sum index 9953cb6..fd586b8 100644 --- a/test/data/data.md5sum +++ b/test/data/data.md5sum @@ -1,3 +1,3 @@ db2ddaa47d4cb3f6403638c2b22c88c8 lib/access.lua -0dd83131d425cbb1b50c036a35529cfc car.lua +4782bd9723a10789b22065a531525371 car.lua 045af81d07eb9f22e5718db13cf337e4 berlin-latest.osm.pbf From 5aa67277235e819d9cbea8c748552d750a98c872 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 15 Jan 2016 16:12:46 -0800 Subject: [PATCH 07/20] [republish binary] From 830a194c9bd4adc4ce8c51e2db96f3e31c2387cd Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sat, 16 Jan 2016 10:42:44 -0800 Subject: [PATCH 08/20] [republish binary] --- .travis.yml | 2 +- scripts/publish.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8700b00..3f2de12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,6 +105,6 @@ script: - if [[ ${RESULT} != 0 ]]; then exit $RESULT; fi - if [[ ${COVERAGE} == true ]]; then ./mason_packages/.link/bin/cpp-coveralls --exclude node_modules --exclude mason_packages --exclude tests --build-root build --gcov-options '\-lp' --exclude doc --exclude build/Release/obj/gen; - else + elif [[ ${TARGET} == 'Release' ]]; then ./scripts/publish.sh; fi; diff --git a/scripts/publish.sh b/scripts/publish.sh index 7c2947b..583c829 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -2,9 +2,14 @@ ./node_modules/.bin/node-pre-gyp package ${NPM_FLAGS} COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n') +echo ${COMMIT_MESSAGE} if [[ ${COMMIT_MESSAGE} =~ "[publish binary]" ]]; then + echo "Publishing" ./node_modules/.bin/node-pre-gyp publish ${NPM_FLAGS} elif [[ ${COMMIT_MESSAGE} =~ "[republish binary]" ]]; then + echo "Re-Publishing" ./node_modules/.bin/node-pre-gyp unpublish publish ${NPM_FLAGS} +else + echo "Skipping publishing" fi; From 57ef2ff578f2512c63a702ad8cb20fcdc087fe4f Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sat, 16 Jan 2016 11:05:32 -0800 Subject: [PATCH 09/20] fix [republish binary] via pull request - refs mapbox/node-pre-gyp#196 --- scripts/publish.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/publish.sh b/scripts/publish.sh index 583c829..5de85d2 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -1,7 +1,7 @@ ./node_modules/.bin/node-pre-gyp package ${NPM_FLAGS} -COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n') +COMMIT_MESSAGE=$(git log --format=%B --no-merges -n 1 | tr -d '\n') echo ${COMMIT_MESSAGE} if [[ ${COMMIT_MESSAGE} =~ "[publish binary]" ]]; then From eb24ec4ae6c016a90cb1b8189df5cc09b6f34c17 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sat, 16 Jan 2016 11:18:58 -0800 Subject: [PATCH 10/20] rollback minor previous change: we version on {configuration} so it is actually fine to publish Debug builds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3f2de12..8700b00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,6 +105,6 @@ script: - if [[ ${RESULT} != 0 ]]; then exit $RESULT; fi - if [[ ${COVERAGE} == true ]]; then ./mason_packages/.link/bin/cpp-coveralls --exclude node_modules --exclude mason_packages --exclude tests --build-root build --gcov-options '\-lp' --exclude doc --exclude build/Release/obj/gen; - elif [[ ${TARGET} == 'Release' ]]; then + else ./scripts/publish.sh; fi; From c182abc478fb5f8a39769b5865b58be9f967a319 Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Fri, 22 Jan 2016 13:12:52 -0800 Subject: [PATCH 11/20] Point to OSRM version that includes matching_prune_factor so that we can speed-up map-matching when the core factor is in use. --- .travis.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8700b00..4734b87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ matrix: env: global: - JOBS: "3" - - OSRM_RELEASE: "c9d9df50f7e3736bdb8e16cbc4db007fa2e28f6a" + - OSRM_RELEASE: "bcbcc18f57a3edb8195503e266f3da4753d84025" - 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 15edd52..67e032c 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-traffic.1", + "version": "4.9.0-traffic.2", "main": "./lib/osrm.js", "license": "BSD", "bugs": { From 0b0c2eebf01ae51ffbead1afa12298db8b86cbf7 Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Fri, 22 Jan 2016 13:13:10 -0800 Subject: [PATCH 12/20] [publish binary] From 2965751344f39f8f105c56b99a5adbffb671ca69 Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Fri, 22 Jan 2016 13:28:52 -0800 Subject: [PATCH 13/20] Pin nvm to a known working version [publish binary] --- scripts/install_node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_node.sh b/scripts/install_node.sh index 1ae9fe1..460a23e 100644 --- a/scripts/install_node.sh +++ b/scripts/install_node.sh @@ -1,6 +1,6 @@ # here we set up the node version on the fly based on the matrix value. # This is done manually so that the build works the same on OS X -rm -rf ~/.nvm/ && git clone --depth 1 https://github.com/creationix/nvm.git ~/.nvm +rm -rf ~/.nvm/ && git clone https://github.com/creationix/nvm.git ~/.nvm && cd ~/.nvm && git checkout tags/v0.30.1 source ~/.nvm/nvm.sh nvm install $1 nvm use $1 From b61950de658b60d62ac740930ca120609bf9bd43 Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Fri, 22 Jan 2016 13:37:39 -0800 Subject: [PATCH 14/20] Fix working directory after checking out tag. [publish binary] --- scripts/install_node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_node.sh b/scripts/install_node.sh index 460a23e..696fed2 100644 --- a/scripts/install_node.sh +++ b/scripts/install_node.sh @@ -1,6 +1,6 @@ # here we set up the node version on the fly based on the matrix value. # This is done manually so that the build works the same on OS X -rm -rf ~/.nvm/ && git clone https://github.com/creationix/nvm.git ~/.nvm && cd ~/.nvm && git checkout tags/v0.30.1 +rm -rf ~/.nvm/ && git clone https://github.com/creationix/nvm.git ~/.nvm && cd ~/.nvm && git checkout tags/v0.30.1 && cd .. source ~/.nvm/nvm.sh nvm install $1 nvm use $1 From 144bc3e52e7b341529c1a447a97e7af7503cb2c3 Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Fri, 22 Jan 2016 13:45:09 -0800 Subject: [PATCH 15/20] Use pushd/popd so that we end up back in the project working dir. [publish binary] --- scripts/install_node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_node.sh b/scripts/install_node.sh index 696fed2..6c0aa15 100644 --- a/scripts/install_node.sh +++ b/scripts/install_node.sh @@ -1,6 +1,6 @@ # here we set up the node version on the fly based on the matrix value. # This is done manually so that the build works the same on OS X -rm -rf ~/.nvm/ && git clone https://github.com/creationix/nvm.git ~/.nvm && cd ~/.nvm && git checkout tags/v0.30.1 && cd .. +rm -rf ~/.nvm/ && git clone https://github.com/creationix/nvm.git ~/.nvm && pushd ~/.nvm && git checkout tags/v0.30.1 && popd source ~/.nvm/nvm.sh nvm install $1 nvm use $1 From 0ba9465d0622d0f79c3b6b8483a7ff25572958fa Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Fri, 22 Jan 2016 19:55:08 -0800 Subject: [PATCH 16/20] New traffic build, sets matching_prune_factor properly. [publish binary] --- .travis.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4734b87..e5e54e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ matrix: env: global: - JOBS: "3" - - OSRM_RELEASE: "bcbcc18f57a3edb8195503e266f3da4753d84025" + - OSRM_RELEASE: "60a06e0ee79ab429bc1131beae13459d4bf00693" - 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 67e032c..04624b8 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-traffic.2", + "version": "4.9.0-traffic.3", "main": "./lib/osrm.js", "license": "BSD", "bugs": { From 0253398a893e3eb5eef299c080f5203205a6d7eb Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Fri, 22 Jan 2016 20:46:24 -0800 Subject: [PATCH 17/20] Expose matching_prune_factor in bindings. --- package.json | 2 +- src/node_osrm.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 04624b8..1271560 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-traffic.3", + "version": "4.9.0-traffic.4", "main": "./lib/osrm.js", "license": "BSD", "bugs": { diff --git a/src/node_osrm.cpp b/src/node_osrm.cpp index 8c89dbb..eef1411 100644 --- a/src/node_osrm.cpp +++ b/src/node_osrm.cpp @@ -420,6 +420,10 @@ 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 ba51cd98bfae139ff78e9acce5193d2d1443555b Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Fri, 22 Jan 2016 21:10:29 -0800 Subject: [PATCH 18/20] [publish binary] From a4cbf1057ef0ae84c67e654abec03c6905095f03 Mon Sep 17 00:00:00 2001 From: Freenerd Date: Thu, 4 Feb 2016 17:16:05 +0100 Subject: [PATCH 19/20] Fix nvm setup in parity with develop --- scripts/install_node.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_node.sh b/scripts/install_node.sh index 6c0aa15..ec6e25f 100644 --- a/scripts/install_node.sh +++ b/scripts/install_node.sh @@ -1,6 +1,6 @@ # here we set up the node version on the fly based on the matrix value. # This is done manually so that the build works the same on OS X -rm -rf ~/.nvm/ && git clone https://github.com/creationix/nvm.git ~/.nvm && pushd ~/.nvm && git checkout tags/v0.30.1 && popd +rm -rf ~/.nvm/ && git clone --depth 1 --branch v0.30.1 https://github.com/creationix/nvm.git ~/.nvm source ~/.nvm/nvm.sh nvm install $1 nvm use $1 From a37bd4a6e2f34143826e85ef10478b4747dbf2d0 Mon Sep 17 00:00:00 2001 From: Freenerd Date: Thu, 4 Feb 2016 13:40:53 +0100 Subject: [PATCH 20/20] Add DEBUG_GEOMETRY build flag [publish binary] --- bootstrap.sh | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index a6d5281..882df7a 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -79,7 +79,8 @@ function build_osrm() { -DCMAKE_INCLUDE_PATH=${MASON_HOME}/include \ -DCMAKE_LIBRARY_PATH=${MASON_HOME}/lib \ -DCMAKE_BUILD_TYPE=${TARGET} \ - -DCMAKE_EXE_LINKER_FLAGS="${LINK_FLAGS}" + -DCMAKE_EXE_LINKER_FLAGS="${LINK_FLAGS}" \ + -DDEBUG_GEOMETRY=ON make -j${JOBS} && make install popd diff --git a/package.json b/package.json index 1271560..992e9c1 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-traffic.4", + "version": "4.9.0-traffic.5", "main": "./lib/osrm.js", "license": "BSD", "bugs": {