diff --git a/.travis.yml b/.travis.yml index c4a223e..e5e54e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ matrix: env: global: - JOBS: "3" - - OSRM_RELEASE: "develop" + - OSRM_RELEASE: "60a06e0ee79ab429bc1131beae13459d4bf00693" - 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..882df7a 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} @@ -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 da1b275..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-develop.0", + "version": "4.9.0-traffic.5", "main": "./lib/osrm.js", "license": "BSD", "bugs": { diff --git a/scripts/install_node.sh b/scripts/install_node.sh index 1ae9fe1..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 --depth 1 https://github.com/creationix/nvm.git ~/.nvm +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 diff --git a/scripts/publish.sh b/scripts/publish.sh index 7c2947b..5de85d2 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -1,10 +1,15 @@ ./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 + 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; 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()) { 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