Merge branch 'master' into master

.babelrc

@@ -1,8 +1,7 @@
 {
     "plugins": ["transform-class-properties"],
     "presets": [
-        "stage-0",
+        "@babel/preset-env",
-        "es2015",
+        "@babel/preset-react"
-        "react"
     ]
 }

.clang-tidy

@@ -1,4 +1,86 @@
 ---
-Checks:          '-clang-analyzer-*,google-*,llvm-*,misc-*,readability-*,-google-build-explicit-make-pair,-google-explicit-constructor,-google-readability-braces-around-statements,-google-readability-casting,-google-readability-namespace-comments,-google-readability-function,-google-readability-todo,-google-runtime-int,-llvm-namespace-comment,-llvm-header-guard,-llvm-twine-local,-misc-argument-comment,-readability-braces-around-statements,-readability-identifier-naming'
+Checks: >
-...
+    bugprone-*,
+    -bugprone-narrowing-conversions,
+    -bugprone-easily-swappable-parameters,
+    -bugprone-branch-clone,
+    -bugprone-misplaced-widening-cast,
+    -bugprone-exception-escape,
+    -bugprone-implicit-widening-of-multiplication-result,
+    -bugprone-integer-division,
+    -bugprone-reserved-identifier,
+    -bugprone-unhandled-self-assignment,
+    -bugprone-forward-declaration-namespace,
+    -bugprone-sizeof-expression,
+    -clang-analyzer-*,
+    -clang-diagnostic-deprecated-declarations,
+    -clang-diagnostic-constant-conversion,
+    cppcoreguidelines-avoid-goto,
+    cppcoreguidelines-no-malloc,
+    cppcoreguidelines-virtual-class-destructor,
+    google-*,
+    -google-build-explicit-make-pair,
+    -google-build-using-namespace,
+    -google-explicit-constructor,
+    -google-default-arguments,
+    -google-readability-braces-around-statements,
+    -google-readability-casting,
+    -google-readability-namespace-comments,
+    -google-readability-function,
+    -google-readability-todo,
+    -google-runtime-int,
+    -google-build-namespaces,
+    -google-runtime-references,
+    -google-readability-function-size,
+    llvm-*,
+    -llvm-namespace-comment,
+    -llvm-qualified-auto,
+    -llvm-include-order,
+    -llvm-else-after-return,
+    -llvm-header-guard,
+    -llvm-twine-local,
+    misc-*,
+    -misc-argument-comment,
+    -misc-non-private-member-variables-in-classes,
+    -misc-unconventional-assign-operator,
+    -misc-no-recursion,
+    -misc-misplaced-const,
+    -misc-definitions-in-headers,
+    -misc-unused-parameters,
+    performance-*,
+    -performance-noexcept-move-constructor,
+    -performance-move-const-arg,
+    -performance-no-int-to-ptr,
+    readability-*,
+    -readability-avoid-const-params-in-decls,
+    -readability-braces-around-statements,
+    -readability-container-size-empty,
+    -readability-convert-member-functions-to-static,
+    -readability-const-return-type,
+    -readability-function-cognitive-complexity,
+    -readability-function-size,
+    -readability-identifier-naming,
+    -readability-implicit-bool-conversion,
+    -readability-magic-numbers,
+    -readability-else-after-return,
+    -readability-inconsistent-declaration-parameter-name,
+    -readability-isolate-declaration,
+    -readability-redundant-declaration,
+    -readability-uppercase-literal-suffix,
+    -readability-named-parameter,
+    -readability-qualified-auto,
+    -readability-suspicious-call-argument,
+    -readability-redundant-access-specifiers,
+    -readability-redundant-member-init,
+    -readability-static-definition-in-anonymous-namespace,
+    -readability-use-anyofallof,
+    -readability-simplify-boolean-expr,
+    -readability-make-member-function-const,
+    -readability-redundant-string-init,
+    -readability-non-const-parameter,
+    -readability-static-accessed-through-instance
+    
+WarningsAsErrors: '*'
+HeaderFilterRegex: '.*'
+
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,7 +9,7 @@ If your PR is still work in progress please attach the relevant label.
 
  - [ ] CHANGELOG.md entry ([How to write a changelog entry](http://keepachangelog.com/en/1.0.0/#how))
  - [ ] update relevant [Wiki pages](https://github.com/Project-OSRM/osrm-backend/wiki)
- - [ ] add tests (see [testing documentation](https://github.com/Project-OSRM/osrm-backend/blob/master/docs/testing.md)
+ - [ ] add tests (see [testing documentation](https://github.com/Project-OSRM/osrm-backend/blob/master/docs/testing.md))
  - [ ] review
  - [ ] adjust for comments
  - [ ] cherry pick to release branch

.github/workflows/osrm-backend-docker.yml

@@ -0,0 +1,84 @@
+name: build and publish container image
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:       
+      - name: Check out the repo
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: ghcr.io/${{ github.repository }}
+
+      - name: Docker meta - debug
+        id: metadebug
+        uses: docker/metadata-action@v3
+        with:
+          images: ghcr.io/${{ github.repository }}
+          flavor: |
+            latest=true
+            suffix=-debug,onlatest=true
+
+      - name: Docker meta - assertions
+        id: metaassertions
+        uses: docker/metadata-action@v3
+        with:
+          images: ghcr.io/${{ github.repository }}
+          flavor: |
+            latest=true
+            suffix=-assertions,onlatest=true        
+
+      - name: Log in to GitHub Docker Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build container image - debug
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          platforms: linux/amd64,linux/arm64
+          file: ./docker/Dockerfile
+          tags: ${{ steps.metadebug.outputs.tags  }}
+          build-args: |
+            DOCKER_TAG=${{ join(steps.metadebug.outputs.tags ) }}
+
+
+      - name: Build container image - assertions
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          platforms: linux/amd64,linux/arm64
+          file: ./docker/Dockerfile
+          tags: ${{ steps.metaassertions.outputs.tags  }}
+          build-args: |
+            DOCKER_TAG=${{ join(steps.metaassertions.outputs.tags ) }}
+
+      # build and publish "normal" image as last to get it listed on top
+      - name: Build container image - normal
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          platforms: linux/amd64,linux/arm64
+          file: ./docker/Dockerfile
+          tags:  ${{ steps.meta.outputs.tags  }}
+          build-args: |
+            DOCKER_TAG=${{ join(steps.meta.outputs.tags ) }}            
+
+
+            

.github/workflows/osrm-backend.yml

@@ -16,18 +16,39 @@ env:
   CCACHE_COMPRESS: 1
   CASHER_TIME_OUT: 599 # one second less than 10m to avoid 10m timeout error: https://github.com/Project-OSRM/osrm-backend/issues/2742
   CCACHE_VERSION: 3.3.1
-  CMAKE_VERSION: 3.7.2
+  CMAKE_VERSION: 3.21.2
   ENABLE_NODE_BINDINGS: "ON"
 
 jobs:
+  windows:
+    needs: format-taginfo-docs
+    runs-on: windows-2022
+    continue-on-error: false
+    steps:
+    - uses: actions/checkout@v3
+    - run: pip install conan==1.50.0
+    - run: conan --version
+    - run: cmake --version
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16
+    - run: node --version
+    - run: npm --version
+    - run: npm install --ignore-scripts
+    - run: npm link --ignore-scripts
+    - uses: microsoft/setup-msbuild@v1.1
+    - name: Build
+      run: |
+        .\scripts\ci\windows-build.bat
+
   format-taginfo-docs:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
-        node-version: 10
+        node-version: 12
     - name: Enable Node.js cache
       uses: actions/cache@v2
       with:
@@ -46,79 +67,153 @@ jobs:
         ./scripts/check_taginfo.py taginfo.json profiles/car.lua
         ./scripts/format.sh && ./scripts/error_on_dirty.sh
         node ./scripts/validate_changelog.js
-        # See issue 4043
+        npm run docs && ./scripts/error_on_dirty.sh
-        #- npm run docs && ./scripts/error_on_dirty.sh
+  
+  docker-image:
+    needs: format-taginfo-docs
+    runs-on: ubuntu-22.04
+    continue-on-error: false
+    steps:       
+      - name: Check out the repo
+        uses: actions/checkout@v3
+      - name: Enable osm.pbf cache
+        uses: actions/cache@v2
+        with:
+          path: berlin-latest.osm.pbf
+          key: v1-berlin-osm-pbf
+          restore-keys: |
+            v1-berlin-osm-pbf
+      - name: Docker build
+        run: |
+          docker build -t osrm-backend-local -f docker/Dockerfile . 
+      - name: Test Docker image
+        run: |
+          if [ ! -f "${PWD}/berlin-latest.osm.pbf" ]; then
+            wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf
+          fi
+          TAG=osrm-backend-local
+          # when `--memory-swap` value equals `--memory` it means container won't use swap
+          # see https://docs.docker.com/config/containers/resource_constraints/#--memory-swap-details
+          MEMORY_ARGS="--memory=1g --memory-swap=1g"
+          docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-extract -p /opt/car.lua /data/berlin-latest.osm.pbf
+          docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-partition /data/berlin-latest.osrm
+          docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-customize /data/berlin-latest.osrm
+          docker run $MEMORY_ARGS --name=osrm-container -t -p 5000:5000 -v "${PWD}:/data" "${TAG}" osrm-routed --algorithm mld /data/berlin-latest.osrm &
+          curl --retry-delay 3 --retry 10 --retry-all-errors "http://127.0.0.1:5000/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true"
+          docker stop osrm-container
 
   build-test-publish:
     needs: format-taginfo-docs
     strategy:
       matrix:
         include:
-          - name: gcc-7-debug-cov
+          - name: gcc-9-debug-cov
             continue-on-error: false
-            node: 10
+            node: 12
-            runs-on: ubuntu-18.04
+            runs-on: ubuntu-20.04
             BUILD_TOOLS: ON
             BUILD_TYPE: Debug
-            CCOMPILER: gcc-7
+            CCOMPILER: gcc-9
             CUCUMBER_TIMEOUT: 20000
-            CXXCOMPILER: g++-7
+            CXXCOMPILER: g++-9
             ENABLE_COVERAGE: ON
 
-          - name: gcc-7-debug-asan
+          - name: gcc-9-debug-asan-ubsan
             continue-on-error: false
-            node: 10
+            node: 12
-            runs-on: ubuntu-18.04
+            runs-on: ubuntu-20.04
             BUILD_TOOLS: ON
             BUILD_TYPE: Debug
-            CCOMPILER: gcc-7
+            CCOMPILER: gcc-9
             CUCUMBER_TIMEOUT: 20000
-            CXXCOMPILER: g++-7
+            CXXCOMPILER: g++-9
             ENABLE_SANITIZER: ON
-            TARGET_ARCH: x86_64-asan
+            TARGET_ARCH: x86_64-asan-ubsan
+            OSRM_CONNECTION_RETRIES: 10
+            OSRM_CONNECTION_EXP_BACKOFF_COEF: 1.5
 
-          - name: clang-5.0-debug
+          - name: clang-6.0-debug
             continue-on-error: false
-            node: 10
+            node: 12
-            runs-on: ubuntu-18.04
+            runs-on: ubuntu-20.04
             BUILD_TOOLS: ON
             BUILD_TYPE: Debug
-            CLANG_VERSION: 5.0.0
+            CLANG_VERSION: 6.0.0
             CUCUMBER_TIMEOUT: 60000
 
-          - name: mason-linux-debug-asan
+          - name: clang-11.0-debug-clang-tidy
             continue-on-error: false
-            node: 10
+            node: 12
-            runs-on: ubuntu-18.04
+            runs-on: ubuntu-20.04
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Debug
+            CLANG_VERSION: 11.0.0
+            CUCUMBER_TIMEOUT: 60000
+            ENABLE_CLANG_TIDY: ON
+
+          - name: conan-linux-debug-asan-ubsan
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
             BUILD_TOOLS: ON
             BUILD_TYPE: Release
-            CLANG_VERSION: 5.0.0
+            CLANG_VERSION: 11.0.0
-            ENABLE_MASON: ON
+            ENABLE_CONAN: ON
             ENABLE_SANITIZER: ON
 
-          - name: mason-linux-release
+          - name: conan-linux-release
             continue-on-error: false
-            node: 10
+            node: 12
-            runs-on: ubuntu-18.04
+            runs-on: ubuntu-20.04
             BUILD_TOOLS: ON
             BUILD_TYPE: Release
-            CLANG_VERSION: 5.0.0
+            CLANG_VERSION: 6.0.0
-            ENABLE_MASON: ON
+            ENABLE_CONAN: ON
+
+          - name: gcc-11-release
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            CCOMPILER: gcc-11
+            CXXCOMPILER: g++-11
+
+          - name: gcc-10-release
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            CCOMPILER: gcc-10
+            CXXCOMPILER: g++-10
 
           - name: gcc-9-release
             continue-on-error: false
-            node: 10
+            node: 12
-            runs-on: ubuntu-18.04
+            runs-on: ubuntu-20.04
             BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: gcc-9
             CXXCOMPILER: g++-9
             CXXFLAGS: -Wno-cast-function-type
 
+          - name: gcc-9-release-i686
+            continue-on-error: false
+            node: 12
+            runs-on: ubuntu-20.04
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            CCOMPILER: gcc-9
+            CFLAGS: "-m32 -msse2 -mfpmath=sse"
+            CXXCOMPILER: g++-9
+            CXXFLAGS: "-m32 -msse2 -mfpmath=sse"
+            TARGET_ARCH: i686
+
           - name: gcc-8-release
             continue-on-error: false
-            node: 10
+            node: 12
-            runs-on: ubuntu-18.04
+            runs-on: ubuntu-20.04
             BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: gcc-8
@@ -127,227 +222,195 @@ jobs:
 
           - name: gcc-7-release
             continue-on-error: false
-            node: 10
+            node: 12
-            runs-on: ubuntu-18.04
+            runs-on: ubuntu-20.04
             BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: gcc-7
             CXXCOMPILER: g++-7
 
-          - name: gcc-7-release-i686
+          - name: conan-osx-release-node-12
-            continue-on-error: false
-            node: 10
-            runs-on: ubuntu-18.04
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Release
-            CCOMPILER: gcc-7
-            CFLAGS: "-m32 -msse2 -mfpmath=sse"
-            CXXCOMPILER: g++-7
-            CXXFLAGS: "-m32 -msse2 -mfpmath=sse"
-            TARGET_ARCH: i686
-
-          - name: gcc-5-release
-            continue-on-error: false
-            node: 10
-            runs-on: ubuntu-18.04
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Release
-            CCOMPILER: gcc-5
-            CXXCOMPILER: g++-5
-
-          - name: gcc-6-release
-            continue-on-error: false
-            node: 10
-            runs-on: ubuntu-18.04
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Release
-            CCOMPILER: gcc-6
-            CXXCOMPILER: g++-6
-
-          - name: mason-osx-release-node-10
-            build_node_package: true
-            continue-on-error: false
-            node: 10
-            runs-on: macos-10.15
-            BUILD_TOOLS: ON
-            BUILD_TYPE: Release
-            CCOMPILER: clang
-            CXXCOMPILER: clang++
-            CUCUMBER_TIMEOUT: 60000
-            ENABLE_ASSERTIONS: ON
-            ENABLE_MASON: ON
-
-          - name: mason-osx-release-node-12
             build_node_package: true
             continue-on-error: false
             node: 12
-            runs-on: macos-10.15
+            runs-on: macos-11
             BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: clang
             CXXCOMPILER: clang++
             CUCUMBER_TIMEOUT: 60000
             ENABLE_ASSERTIONS: ON
-            ENABLE_MASON: ON
+            ENABLE_CONAN: ON
 
-          - name: mason-osx-release-node-14
+          - name: conan-osx-release-node-14
             build_node_package: true
             continue-on-error: false
             node: 14
-            runs-on: macos-10.15
+            runs-on: macos-11
             BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: clang
             CXXCOMPILER: clang++
             CUCUMBER_TIMEOUT: 60000
             ENABLE_ASSERTIONS: ON
-            ENABLE_MASON: ON
+            ENABLE_CONAN: ON
+
+          - name: conan-osx-release-node-16
+            build_node_package: true
+            continue-on-error: false
+            node: 16
+            runs-on: macos-11
+            BUILD_TOOLS: ON
+            BUILD_TYPE: Release
+            CCOMPILER: clang
+            CXXCOMPILER: clang++
+            CUCUMBER_TIMEOUT: 60000
+            ENABLE_ASSERTIONS: ON
+            ENABLE_CONAN: ON
 
           - name: gcc-7-release-shared
             continue-on-error: false
-            node: 10
+            node: 12
-            runs-on: ubuntu-18.04
+            runs-on: ubuntu-20.04
             BUILD_TOOLS: ON
             BUILD_TYPE: Release
             BUILD_SHARED_LIBS: ON
             CCOMPILER: gcc-7
             CXXCOMPILER: g++-7
 
-          - name: node-14-mason-linux-release
+          - name: node-12-conan-linux-release
-            build_node_package: true
-            continue-on-error: false
-            node: 14
-            runs-on: ubuntu-18.04
-            BUILD_TYPE: Release
-            CLANG_VERSION: 5.0.0
-            ENABLE_GLIBC_WORKAROUND: ON
-            ENABLE_MASON: ON
-            NODE_PACKAGE_TESTS_ONLY: ON
-
-          - name: node-14-mason-linux-debug
-            build_node_package: true
-            continue-on-error: false
-            node: 14
-            runs-on: ubuntu-18.04
-            BUILD_TYPE: Debug
-            CLANG_VERSION: 5.0.0
-            ENABLE_GLIBC_WORKAROUND: ON
-            ENABLE_MASON: ON
-            NODE_PACKAGE_TESTS_ONLY: ON
-
-          - name: node-12-mason-linux-release
             build_node_package: true
             continue-on-error: false
             node: 12
-            runs-on: ubuntu-18.04
+            runs-on: ubuntu-20.04
             BUILD_TYPE: Release
-            CLANG_VERSION: 5.0.0
+            CLANG_VERSION: 6.0.0
             ENABLE_GLIBC_WORKAROUND: ON
-            ENABLE_MASON: ON
+            ENABLE_CONAN: ON
             NODE_PACKAGE_TESTS_ONLY: ON
 
-          - name: node-12-mason-linux-debug
+          - name: node-12-conan-linux-debug
             build_node_package: true
             continue-on-error: false
             node: 12
-            runs-on: ubuntu-18.04
+            runs-on: ubuntu-20.04
             BUILD_TYPE: Debug
-            CLANG_VERSION: 5.0.0
+            CLANG_VERSION: 6.0.0
             ENABLE_GLIBC_WORKAROUND: ON
-            ENABLE_MASON: ON
+            ENABLE_CONAN: ON
             NODE_PACKAGE_TESTS_ONLY: ON
 
-          - name: node-10-mason-linux-release
+          - name: node-14-conan-linux-release
             build_node_package: true
             continue-on-error: false
-            node: 10
+            node: 14
-            runs-on: ubuntu-18.04
+            runs-on: ubuntu-20.04
             BUILD_TYPE: Release
-            CLANG_VERSION: 5.0.0
+            CLANG_VERSION: 6.0.0
             ENABLE_GLIBC_WORKAROUND: ON
-            ENABLE_MASON: ON
+            ENABLE_CONAN: ON
             NODE_PACKAGE_TESTS_ONLY: ON
 
-          - name: node-10-mason-linux-debug
+          - name: node-14-conan-linux-debug
             build_node_package: true
             continue-on-error: false
-            node: 10
+            node: 14
-            runs-on: ubuntu-18.04
+            runs-on: ubuntu-20.04
             BUILD_TYPE: Debug
-            CLANG_VERSION: 5.0.0
+            CLANG_VERSION: 6.0.0
             ENABLE_GLIBC_WORKAROUND: ON
-            ENABLE_MASON: ON
+            ENABLE_CONAN: ON
             NODE_PACKAGE_TESTS_ONLY: ON
 
-          - name: mason-osx-release-node-latest
+
+          - name: node-16-conan-linux-release
+            build_node_package: true
+            continue-on-error: false
+            node: 16
+            runs-on: ubuntu-20.04
+            BUILD_TYPE: Release
+            CLANG_VERSION: 6.0.0
+            ENABLE_GLIBC_WORKAROUND: ON
+            ENABLE_CONAN: ON
+            NODE_PACKAGE_TESTS_ONLY: ON
+
+          - name: node-16-conan-linux-debug
+            build_node_package: true
+            continue-on-error: false
+            node: 16
+            runs-on: ubuntu-20.04
+            BUILD_TYPE: Debug
+            CLANG_VERSION: 6.0.0
+            ENABLE_GLIBC_WORKAROUND: ON
+            ENABLE_CONAN: ON
+            NODE_PACKAGE_TESTS_ONLY: ON
+
+          - name: conan-osx-release-node-latest
             build_node_package: true
             continue-on-error: true
-            # TODO: Use node 'latest' once supported: https://github.com/actions/setup-node/issues/257
+            node: latest
-            node: 16
+            runs-on: macos-11
-            runs-on: macos-10.15
             BUILD_TYPE: Release
             CCOMPILER: clang
             CXXCOMPILER: clang++
             CUCUMBER_TIMEOUT: 60000
             ENABLE_ASSERTIONS: ON
-            ENABLE_MASON: ON
+            ENABLE_CONAN: ON
 
-          - name: node-latest-mason-linux-release
+          - name: node-latest-conan-linux-release
             build_node_package: true
             continue-on-error: true
-            # TODO: Use node 'latest' once supported: https://github.com/actions/setup-node/issues/257
+            node: latest
-            node: 16
+            runs-on: ubuntu-20.04
-            runs-on: ubuntu-18.04
             BUILD_TYPE: Release
-            CLANG_VERSION: 5.0.0
+            CLANG_VERSION: 6.0.0
             ENABLE_GLIBC_WORKAROUND: ON
-            ENABLE_MASON: ON
+            ENABLE_CONAN: ON
             NODE_PACKAGE_TESTS_ONLY: ON
 
-          - name: node-latest-mason-linux-debug
+          - name: node-latest-conan-linux-debug
             build_node_package: true
             continue-on-error: true
-            # TODO: Use node 'latest' once supported: https://github.com/actions/setup-node/issues/257
+            node: latest
-            node: 16
+            runs-on: ubuntu-20.04
-            runs-on: ubuntu-18.04
             BUILD_TYPE: Debug
-            CLANG_VERSION: 5.0.0
+            CLANG_VERSION: 6.0.0
             ENABLE_GLIBC_WORKAROUND: ON
-            ENABLE_MASON: ON
+            ENABLE_CONAN: ON
             NODE_PACKAGE_TESTS_ONLY: ON
 
-          - name: mason-osx-release-node-lts
+          - name: conan-osx-release-node-lts
             build_node_package: true
             continue-on-error: true
             node: "lts/*"
-            runs-on: macos-10.15
+            runs-on: macos-11
             BUILD_TYPE: Release
             CCOMPILER: clang
             CXXCOMPILER: clang++
             CUCUMBER_TIMEOUT: 60000
             ENABLE_ASSERTIONS: ON
-            ENABLE_MASON: ON
+            ENABLE_CONAN: ON
 
-          - name: node-lts-mason-linux-release
+          - name: node-lts-conan-linux-release
             build_node_package: true
             continue-on-error: true
             node: "lts/*"
-            runs-on: ubuntu-18.04
+            runs-on: ubuntu-20.04
             BUILD_TYPE: Release
-            CLANG_VERSION: 5.0.0
+            CLANG_VERSION: 6.0.0
             ENABLE_GLIBC_WORKAROUND: ON
-            ENABLE_MASON: ON
+            ENABLE_CONAN: ON
             NODE_PACKAGE_TESTS_ONLY: ON
 
-          - name: node-lts-mason-linux-debug
+          - name: node-lts-conan-linux-debug
             build_node_package: true
             continue-on-error: true
             node: "lts/*"
-            runs-on: ubuntu-18.04
+            runs-on: ubuntu-20.04
             BUILD_TYPE: Debug
-            CLANG_VERSION: 5.0.0
+            CLANG_VERSION: 6.0.0
             ENABLE_GLIBC_WORKAROUND: ON
-            ENABLE_MASON: ON
+            ENABLE_CONAN: ON
             NODE_PACKAGE_TESTS_ONLY: ON
 
 
@@ -365,17 +428,20 @@ jobs:
       CXXCOMPILER: ${{ matrix.CXXCOMPILER }}
       CXXFLAGS: ${{ matrix.CXXFLAGS }}
       ENABLE_ASSERTIONS: ${{ matrix.ENABLE_ASSERTIONS }}
+      ENABLE_CLANG_TIDY: ${{ matrix.ENABLE_CLANG_TIDY }} 
       ENABLE_COVERAGE: ${{ matrix.ENABLE_COVERAGE }}
       ENABLE_GLIBC_WORKAROUND: ${{ matrix.ENABLE_GLIBC_WORKAROUND }}
-      ENABLE_MASON: ${{ matrix.ENABLE_MASON }}
+      ENABLE_CONAN: ${{ matrix.ENABLE_CONAN }}
       ENABLE_SANITIZER: ${{ matrix.ENABLE_SANITIZER }}
       NODE_PACKAGE_TESTS_ONLY: ${{ matrix.NODE_PACKAGE_TESTS_ONLY }}
       TARGET_ARCH: ${{ matrix.TARGET_ARCH }}
+      OSRM_CONNECTION_RETRIES: ${{ matrix.OSRM_CONNECTION_RETRIES }}
+      OSRM_CONNECTION_EXP_BACKOFF_COEF: ${{ matrix.OSRM_CONNECTION_EXP_BACKOFF_COEF }}
     steps:
     - uses: actions/checkout@v2
 
     - name: Use Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node }}
     - name: Enable Node.js cache
@@ -392,13 +458,20 @@ jobs:
         key: ccache-${{ matrix.name }}-${{ github.sha }}
         restore-keys: |
           ccache-${{ matrix.name }}-
+    - name: Enable Conan cache
+      uses: actions/cache@v2
+      with:
+        path: ~/.conan
+        key: v2-conan-${{ matrix.name }}-${{ github.sha }}
+        restore-keys: |
+          v2-conan-${{ matrix.name }}-
     - name: Enable test cache
       uses: actions/cache@v2
       with:
         path: ${{github.workspace}}/test/cache
-        key: test-${{ matrix.name }}-${{ github.sha }}
+        key: v2-test-${{ matrix.name }}-${{ github.sha }}
         restore-keys: |
-          test-${{ matrix.name }}-
+          v2-test-${{ matrix.name }}-
 
     - name: Prepare environment
       run: |
@@ -410,7 +483,8 @@ jobs:
 
         if [[ "$ENABLE_SANITIZER" == 'ON' ]]; then
           # We can only set this after checkout once we know the workspace directory
-          echo "LSAN_OPTIONS=suppressions=${GITHUB_WORKSPACE}/scripts/ci/leaksanitizer.conf" >> $GITHUB_ENV
+          echo "LSAN_OPTIONS=print_suppressions=0:suppressions=${GITHUB_WORKSPACE}/scripts/ci/leaksanitizer.conf" >> $GITHUB_ENV
+          echo "UBSAN_OPTIONS=symbolize=1:halt_on_error=1:print_stacktrace=1:suppressions=${GITHUB_WORKSPACE}/scripts/ci/undefinedsanitizer.conf" >> $GITHUB_ENV
         fi
 
         if [[ "${RUNNER_OS}" == "Linux" ]]; then
@@ -424,11 +498,13 @@ jobs:
 
         echo "MASON=${GITHUB_WORKSPACE}/scripts/mason.sh" >> $GITHUB_ENV
         echo "CMAKE_URL=https://mason-binaries.s3.amazonaws.com/${MASON_OS}-x86_64/cmake/${CMAKE_VERSION}.tar.gz" >> $GITHUB_ENV
-        echo "CMAKE_DIR=mason_packages/${MASON_OS}-x86_64/cmake/${CMAKE_VERSION}}" >> $GITHUB_ENV
+        echo "CMAKE_DIR=mason_packages/${MASON_OS}-x86_64/cmake/${CMAKE_VERSION}" >> $GITHUB_ENV
 
 
     - name: Install dev dependencies
       run: |
+        python3 -m pip install conan==1.50.0
+
         # CMake
         mkdir -p ${CMAKE_DIR}
         wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${CMAKE_DIR}
@@ -458,7 +534,7 @@ jobs:
         fi
 
         # Linux dev packages
-        if [ "${TARGET_ARCH}" != "i686" ] && [ "${ENABLE_MASON}" != "ON" ]; then
+        if [ "${TARGET_ARCH}" != "i686" ] && [ "${ENABLE_CONAN}" != "ON" ]; then
           sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
           sudo apt-get update -y
           sudo apt-get install -y libbz2-dev libxml2-dev libzip-dev liblua5.2-dev libtbb-dev libboost-all-dev
@@ -470,6 +546,7 @@ jobs:
           fi
         elif [[ $TARGET_ARCH == "i686" ]]; then
           source ./scripts/ci/before_install.${TARGET_ARCH}.sh
+          echo "PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig:${PKG_CONFIG_PATH}" >> $GITHUB_ENV
         fi
 
     - name: Prepare build
@@ -488,8 +565,9 @@ jobs:
         echo "Using ${JOBS} jobs"
         pushd ${OSRM_BUILD_DIR}
         cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-                 -DENABLE_MASON=${ENABLE_MASON:-OFF} \
+                 -DENABLE_CONAN=${ENABLE_CONAN:-OFF} \
-                 -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS:-OFF}} \
+                 -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS:-OFF} \
+                 -DENABLE_CLANG_TIDY=${ENABLE_CLANG_TIDY:-OFF} \
                  -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} \
                  -DENABLE_COVERAGE=${ENABLE_COVERAGE:-OFF} \
                  -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
@@ -530,14 +608,7 @@ jobs:
 
         # All tests assume to be run from the build directory
         pushd ${OSRM_BUILD_DIR}
-        ./unit_tests/library-tests
+        for i in ./unit_tests/*-tests ; do echo Running $i ; $i ; done
-        ./unit_tests/extractor-tests
-        ./unit_tests/contractor-tests
-        ./unit_tests/engine-tests
-        ./unit_tests/util-tests
-        ./unit_tests/server-tests
-        ./unit_tests/partitioner-tests
-        ./unit_tests/customizer-tests
         if [ -z "${ENABLE_SANITIZER}" ] && [ "$TARGET_ARCH" != "i686" ]; then
           npm run nodejs-tests
         fi
@@ -547,6 +618,12 @@ jobs:
       if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }}
       run: |
         npm run nodejs-tests
+    - name: Upload test logs
+      uses: actions/upload-artifact@v3
+      if: failure()
+      with:
+        name: logs
+        path: test/logs/
 
     - name: Generate code coverage
       if: ${{ matrix.ENABLE_COVERAGE == 'ON' }}
@@ -583,6 +660,6 @@ jobs:
 
   ci-complete:
     runs-on: ubuntu-18.04
-    needs: build-test-publish
+    needs: [build-test-publish, docker-image, windows]
     steps:
     - run: echo "CI complete"

CHANGELOG.md

@@ -1,4 +1,42 @@
 # Unreleased
+  - Changes from 5.26.0
+    - API:
+      - FIXED: Use Boost.Beast to parse HTTP request. [#6294](https://github.com/Project-OSRM/osrm-backend/pull/6294)
+      - FIXED: Fix inefficient osrm-routed connection handling [#6113](https://github.com/Project-OSRM/osrm-backend/pull/6113)
+    - NodeJS:
+      - FIXED: Support `skip_waypoints` in Node bindings [#6060](https://github.com/Project-OSRM/osrm-backend/pull/6060)
+    - Misc:
+      - CHANGED: Do not use deprecated Callback::Call overload in Node bindings. [#6318](https://github.com/Project-OSRM/osrm-backend/pull/6318)
+      - FIXED: Fix distance calculation consistency. [#6315](https://github.com/Project-OSRM/osrm-backend/pull/6315)
+      - FIXED: Fix performance issue after migration to sol2 3.3.0. [#6304](https://github.com/Project-OSRM/osrm-backend/pull/6304)
+      - CHANGED: Pass osm_node_ids by reference in osrm::updater::Updater class. [#6298](https://github.com/Project-OSRM/osrm-backend/pull/6298)
+      - FIXED: Fix bug with reading Set values from Lua scripts. [#6285](https://github.com/Project-OSRM/osrm-backend/pull/6285)
+      - FIXED: Bug in bicycle profile that caused exceptions if there is a highway=bicycle in the data. [#6296](https://github.com/Project-OSRM/osrm-backend/pull/6296)
+    - Build:
+      - CHANGED: Use the latest node on CI. [#6317](https://github.com/Project-OSRM/osrm-backend/pull/6317)
+      - CHANGED: Migrate Windows CI to GitHub Actions. [#6312](https://github.com/Project-OSRM/osrm-backend/pull/6312)
+      - ADDED: Add smoke test for Docker image. [#6313](https://github.com/Project-OSRM/osrm-backend/pull/6313)
+      - CHANGED: Update libosmium to version 2.18.0. [#6303](https://github.com/Project-OSRM/osrm-backend/pull/6303)
+      - CHANGED: Remove EXACT from find_package if using Conan. [#6299](https://github.com/Project-OSRM/osrm-backend/pull/6299)
+      - CHANGED: Configure Undefined Behaviour Sanitizer. [#6290](https://github.com/Project-OSRM/osrm-backend/pull/6290)
+      - CHANGED: Use Conan instead of Mason to install code dependencies. [#6284](https://github.com/Project-OSRM/osrm-backend/pull/6284)
+      - CHANGED: Migrate to C++17. Update sol2 to 3.3.0. [#6279](https://github.com/Project-OSRM/osrm-backend/pull/6279)
+      - CHANGED: Update macOS CI image to macos-11. [#6286](https://github.com/Project-OSRM/osrm-backend/pull/6286)
+      - CHANGED: Enable even more clang-tidy checks. [#6273](https://github.com/Project-OSRM/osrm-backend/pull/6273)
+      - CHANGED: Configure CMake to not build flatbuffers tests and samples. [#6274](https://github.com/Project-OSRM/osrm-backend/pull/6274)
+      - CHANGED: Enable more clang-tidy checks. [#6270](https://github.com/Project-OSRM/osrm-backend/pull/6270)
+      - CHANGED: Configure clang-tidy job on CI. [#6261](https://github.com/Project-OSRM/osrm-backend/pull/6261)
+      - CHANGED: Use Github Actions for building container images [#6138](https://github.com/Project-OSRM/osrm-backend/pull/6138)
+      - CHANGED: Upgrade Boost dependency to 1.70 [#6113](https://github.com/Project-OSRM/osrm-backend/pull/6113)
+      - CHANGED: Upgrade Ubuntu CI builds to 20.04  [#6119](https://github.com/Project-OSRM/osrm-backend/pull/6119)
+      - CHANGED: Make building osrm-routed optional [#6144](https://github.com/Project-OSRM/osrm-backend/pull/6144)
+      - FIXED: Run all unit tests in CI [#5248](https://github.com/Project-OSRM/osrm-backend/pull/5248)
+      - FIXED: Fix installation of Mason CMake and 32 bit CI build [#6170](https://github.com/Project-OSRM/osrm-backend/pull/6170)
+      - FIXED: Fixed Node docs generation check in CI. [#6058](https://github.com/Project-OSRM/osrm-backend/pull/6058)
+      - CHANGED: Docker build, enabled arm64 build layer [#6172](https://github.com/Project-OSRM/osrm-backend/pull/6172)
+      - CHANGED: Docker build, enabled apt-get update/install caching in separate layer for build phase [#6175](https://github.com/Project-OSRM/osrm-backend/pull/6175)
+
+# 5.26.0
   - Changes from 5.25.0
     - API:
       - FIXED: Allow for special characters in the profile/method as part of the HTTP URL. [#6090](https://github.com/Project-OSRM/osrm-backend/pull/6090)
@@ -6,10 +44,11 @@
     - Build:
       - CHANGED: Replace Travis with Github Actions for CI builds [#6071](https://github.com/Project-OSRM/osrm-backend/pull/6071)
       - FIXED: Fixed Boost link flags in pkg-config file. [#6083](https://github.com/Project-OSRM/osrm-backend/pull/6083)
-    - NodeJS
+      - FIXED: Fixed test cache to consider MLD executable changes. [#6129](https://github.com/Project-OSRM/osrm-backend/pull/6129)
-      - FIXED: Support `skip_waypoints` in Node bindings [#6060](https://github.com/Project-OSRM/osrm-backend/pull/6060)
     - Routing:
       - FIXED: Fix generation of inefficient MLD partitions [#6084](https://github.com/Project-OSRM/osrm-backend/pull/6084)
+      - FIXED: Fix MLD level mask generation to support 64-bit masks. [#6123](https://github.com/Project-OSRM/osrm-backend/pull/6123)
+      - FIXED: Fix metric offset overflow for large MLD partitions. This breaks the **data format** [#6124](https://github.com/Project-OSRM/osrm-backend/pull/6124)
 
 # 5.25.0
   - Changes from 5.24.0

CMakeLists.txt

@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.2)
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
+
 if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR AND NOT MSVC_IDE)
   message(FATAL_ERROR "In-source builds are not allowed.
 Please create a directory and run cmake from there, passing the path to this source directory as the last argument.
@@ -18,10 +21,11 @@ if (NOT WIN32 AND NOT DEFINED ENV{OSRM_BUILD_DIR})
   set(ENV{OSRM_BUILD_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 endif()
 
-option(ENABLE_MASON "Use mason for dependencies" OFF)
+option(ENABLE_CONAN "Use conan for dependencies" OFF)
 option(ENABLE_CCACHE "Speed up incremental rebuilds via ccache" ON)
 option(BUILD_TOOLS "Build OSRM tools" OFF)
 option(BUILD_PACKAGE "Build OSRM package" OFF)
+option(BUILD_ROUTED "Build osrm-routed HTTP server" ON)
 option(ENABLE_ASSERTIONS "Use assertions in release mode" OFF)
 option(ENABLE_DEBUG_LOGGING "Use debug logging in release mode" OFF)
 option(ENABLE_COVERAGE "Build with coverage instrumentalisation" OFF)
@@ -31,27 +35,20 @@ option(ENABLE_FUZZING "Fuzz testing using LLVM's libFuzzer" OFF)
 option(ENABLE_GOLD_LINKER "Use GNU gold linker if available" ON)
 option(ENABLE_NODE_BINDINGS "Build NodeJs bindings" OFF)
 option(ENABLE_GLIBC_WORKAROUND "Workaround GLIBC symbol exports" OFF)
+option(ENABLE_CLANG_TIDY "Enables clang-tidy checks" OFF)
+
+if (ENABLE_CLANG_TIDY)
+  find_program(CLANG_TIDY_COMMAND NAMES clang-tidy)
+  if(NOT CLANG_TIDY_COMMAND)
+    message(FATAL_ERROR "ENABLE_CLANG_TIDY is ON but clang-tidy is not found!")
+  else()
+    message(STATUS "Found clang-tidy at ${CLANG_TIDY_COMMAND}")
+    set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_COMMAND};--warnings-as-errors=*")
+  endif()
+endif()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
-if(ENABLE_MASON)
-  # versions in use
-  set(MASON_BOOST_VERSION "1.65.1")
-  set(MASON_EXPAT_VERSION "2.2.0")
-  set(MASON_LUA_VERSION "5.2.4")
-  set(MASON_BZIP2_VERSION "1.0.6")
-  set(MASON_TBB_VERSION "2017_U7")
-
-  message(STATUS "Enabling mason")
-
-  find_program(CURL_FOUND curl)
-  if(NOT CURL_FOUND)
-    message(FATAL_ERROR "curl command required with -DENABLE_MASON")
-  endif()
-
-  include(mason)
-endif()
-
 # be compatible with version handling before cmake 3.x
 if (POLICY CMP0048)
   cmake_policy(SET CMP0048 OLD)
@@ -132,7 +129,7 @@ endif()
 
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/)
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/)
-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/sol2/)
+include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/sol2-3.3.0/include)
 include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/variant/include)
 
 set(BOOST_COMPONENTS date_time chrono filesystem iostreams program_options regex system thread unit_test_framework)
@@ -162,7 +159,11 @@ add_library(CONTRACTOR OBJECT ${ContractorGlob})
 add_library(UPDATER OBJECT ${UpdaterGlob})
 add_library(STORAGE OBJECT ${StorageGlob})
 add_library(ENGINE OBJECT ${EngineGlob})
-add_library(SERVER OBJECT ${ServerGlob})
+
+if (BUILD_ROUTED) 
+  add_library(SERVER OBJECT ${ServerGlob})
+  add_executable(osrm-routed src/tools/routed.cpp $<TARGET_OBJECTS:SERVER> $<TARGET_OBJECTS:UTIL>)
+endif()
 
 set_target_properties(UTIL PROPERTIES LINKER_LANGUAGE CXX)
 
@@ -170,7 +171,6 @@ add_executable(osrm-extract src/tools/extract.cpp)
 add_executable(osrm-partition src/tools/partition.cpp)
 add_executable(osrm-customize src/tools/customize.cpp)
 add_executable(osrm-contract src/tools/contract.cpp)
-add_executable(osrm-routed src/tools/routed.cpp $<TARGET_OBJECTS:SERVER> $<TARGET_OBJECTS:UTIL>)
 add_executable(osrm-datastore src/tools/store.cpp $<TARGET_OBJECTS:MICROTAR> $<TARGET_OBJECTS:UTIL>)
 add_library(osrm src/osrm/osrm.cpp $<TARGET_OBJECTS:ENGINE> $<TARGET_OBJECTS:STORAGE> $<TARGET_OBJECTS:MICROTAR> $<TARGET_OBJECTS:UTIL>)
 add_library(osrm_contract src/osrm/contractor.cpp $<TARGET_OBJECTS:CONTRACTOR> $<TARGET_OBJECTS:UTIL>)
@@ -201,13 +201,6 @@ if(ENABLE_GOLD_LINKER)
     endif()
 endif()
 
-# Disable LTO when mason+gcc is detected before testing for / setting any flags.
-# Mason builds libraries with Clang, mixing does not work in the context of lto.
-if(ENABLE_MASON AND CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND ENABLE_LTO)
-  set(ENABLE_LTO OFF)
-  message(WARNING "Mason and GCC's LTO not work together. Disabling LTO.")
-endif()
-
 # Explicitly set the build type to Release if no other type is specified
 # on the command line.  Without this, cmake defaults to an unoptimized,
 # non-debug build, which almost nobody wants.
@@ -308,9 +301,9 @@ if(CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES MinRelSize OR CM
   endif()
 endif()
 
-if(UNIX AND NOT APPLE AND ENABLE_MASON AND (LTO_WORKS OR ENABLE_GOLD_LINKER))
+# TODO: this was added for Mason, we are not sure if it is true after migration to Conan
-  message(WARNING "ENABLE_MASON and ENABLE_LTO/ENABLE_GOLD_LINKER may not work on all linux systems currently")
+if(UNIX AND NOT APPLE AND ENABLE_CONAN AND (LTO_WORKS OR ENABLE_GOLD_LINKER))
-  message(WARNING "For more details see: https://github.com/Project-OSRM/osrm-backend/issues/3202")
+  message(WARNING "ENABLE_CONAN and ENABLE_LTO/ENABLE_GOLD_LINKER may not work on all linux systems currently")
 endif()
 
 set(MAYBE_COVERAGE_LIBRARIES "")
@@ -323,11 +316,14 @@ if (ENABLE_COVERAGE)
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ftest-coverage -fprofile-arcs")
 endif()
 
+
 if (ENABLE_SANITIZER)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+  set(SANITIZER_FLAGS "-g -fsanitize=address -fsanitize-address-use-after-scope -fsanitize=undefined -fno-omit-frame-pointer")
-  set(OSRM_CXXFLAGS "${OSRM_CXXFLAGS} -fsanitize=address")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SANITIZER_FLAGS}")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SANITIZER_FLAGS}")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address")
+  set(OSRM_CXXFLAGS "${OSRM_CXXFLAGS} ${SANITIZER_FLAGS}")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SANITIZER_FLAGS}")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${SANITIZER_FLAGS}")
 endif()
 
 # Configuring compilers
@@ -360,7 +356,6 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-intel -wd10237 -Wall -ipo -fPIC")
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
   # using Visual Studio C++
-  set(BOOST_COMPONENTS ${BOOST_COMPONENTS} zlib)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # avoid compiler error C1128 from scripting_environment_lua.cpp
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32_LEAN_AND_MEAN") # avoid compiler error C2011 from dual #include of winsock.h and winsock2.h
   add_dependency_defines(-DBOOST_LIB_DIAGNOSTIC)
@@ -397,16 +392,13 @@ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")
 
 # Activate C++1y
 if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-  set(OSRM_CXXFLAGS "${OSRM_CXXFLAGS} -std=c++14")
+  set(OSRM_CXXFLAGS "${OSRM_CXXFLAGS} -std=c++17")
 endif()
 
 # Configuring other platform dependencies
 if(APPLE)
-  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10")
   execute_process(COMMAND xcrun --sdk macosx --show-sdk-path OUTPUT_VARIABLE CMAKE_OSX_SYSROOT OUTPUT_STRIP_TRAILING_WHITESPACE)
-  set(CMAKE_OSX_ARCHITECTURES "x86_64")
-  message(STATUS "Set Architecture to x64 on OS X")
   exec_program(uname ARGS -v  OUTPUT_VARIABLE DARWIN_VERSION)
   string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${DARWIN_VERSION})
   if(OSXLIBSTD)
@@ -433,7 +425,7 @@ include_directories(SYSTEM ${MICROTAR_INCLUDE_DIR})
 
 set(MBXGEOM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/geometry.hpp-0.9.2/include")
 include_directories(SYSTEM ${MBXGEOM_INCLUDE_DIR})
-set(CHEAPRULER_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/cheap-ruler-cpp-2.5.4/include")
+set(CHEAPRULER_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/cheap-ruler-cpp-2778eb8/include")
 include_directories(SYSTEM ${CHEAPRULER_INCLUDE_DIR})
 
 add_library(MICROTAR OBJECT "${CMAKE_CURRENT_SOURCE_DIR}/third_party/microtar/src/microtar.c")
@@ -445,83 +437,98 @@ include_directories(SYSTEM ${PROTOZERO_INCLUDE_DIR})
 set(VTZERO_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/vtzero/include")
 include_directories(SYSTEM ${VTZERO_INCLUDE_DIR})
 
+set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "Disable the build of Flatbuffers tests and samples.")
 set(FLATBUFFERS_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/flatbuffers")
 set(FLATBUFFERS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/flatbuffers/include")
-include_directories(${FLATBUFFERS_INCLUDE_DIR})
+include_directories(SYSTEM ${FLATBUFFERS_INCLUDE_DIR})
 add_subdirectory(${FLATBUFFERS_SRC_DIR}
         ${CMAKE_CURRENT_BINARY_DIR}/flatbuffers-build
         EXCLUDE_FROM_ALL)
 
-# if mason is enabled no find_package calls are made
+# see https://stackoverflow.com/questions/70898030/boost-link-error-using-conan-find-package
-# to ensure that we are only compiling and linking against
+if (MSVC)
-# fully portable mason packages
+  add_definitions(-DBOOST_ALL_NO_LIB)
-if(ENABLE_MASON)
+endif()
-  message(STATUS "Installing dependencies via mason")
+
+if(ENABLE_CONAN)
+  message(STATUS "Installing dependencies via Conan")
+
+  # Conan will generate Find*.cmake files to build directory, so we use them with the highest priority 
+  list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_BINARY_DIR})
+  list(INSERT CMAKE_PREFIX_PATH 0 ${CMAKE_BINARY_DIR})
+
+  include(${CMAKE_CURRENT_LIST_DIR}/cmake/conan.cmake)
+
+  set(CONAN_BOOST_VERSION 1.79.0)
+  set(CONAN_BZIP2_VERSION 1.0.8)
+  set(CONAN_EXPAT_VERSION 2.2.10)
+  set(CONAN_LUA_VERSION 5.4.4)
+  set(CONAN_TBB_VERSION 2020.3)
+  
+  set(CONAN_SYSTEM_INCLUDES ON)
+  
+  # TODO: 
+  # if we link TBB dynamically osrm-extract.exe finishes on the first access to any TBB symbol 
+  # with exit code = -1073741515, which means that program cannot load required DLL.
+  if (MSVC)
+    set(TBB_SHARED False)
+  else()
+    set(TBB_SHARED True)
+  endif()
+
+  conan_cmake_run(
+    REQUIRES 
+    boost/${CONAN_BOOST_VERSION}
+    bzip2/${CONAN_BZIP2_VERSION}
+    expat/${CONAN_EXPAT_VERSION}
+    lua/${CONAN_LUA_VERSION}
+    tbb/${CONAN_TBB_VERSION}
+    BASIC_SETUP 
+    BUILD missing 
+    GENERATORS cmake_find_package
+    KEEP_RPATHS
+    NO_OUTPUT_DIRS
+    OPTIONS boost:filesystem_version=3 # https://stackoverflow.com/questions/73392648/error-with-boost-filesystem-version-in-cmake
+            tbb:shared=${TBB_SHARED}
+  )
+
+  add_dependency_includes(${CONAN_INCLUDE_DIRS_BOOST})
+  add_dependency_includes(${CONAN_INCLUDE_DIRS_BZIP2})
+  add_dependency_includes(${CONAN_INCLUDE_DIRS_EXPAT})
+  add_dependency_includes(${CONAN_INCLUDE_DIRS_LUA})
+  add_dependency_includes(${CONAN_INCLUDE_DIRS_TBB})
 
   set(Boost_USE_STATIC_LIBS ON)
-  mason_use(boost VERSION ${MASON_BOOST_VERSION} HEADER_ONLY)
+  find_package(Boost REQUIRED EXACT ${CONAN_BOOST_VERSION} COMPONENTS ${BOOST_COMPONENTS})
-  add_dependency_includes(${MASON_PACKAGE_boost_INCLUDE_DIRS})
+  set(Boost_DATE_TIME_LIBRARY "${Boost_date_time_LIB_TARGETS}")
-  mason_use(boost_libfilesystem VERSION ${MASON_BOOST_VERSION})
+  set(Boost_CHRONO_LIBRARY "${Boost_chrono_LIB_TARGETS}")
-  set(Boost_FILESYSTEM_LIBRARY ${MASON_PACKAGE_boost_libfilesystem_STATIC_LIBS})
+  set(Boost_PROGRAM_OPTIONS_LIBRARY "${Boost_program_options_LIB_TARGETS}")
-  mason_use(boost_libiostreams VERSION ${MASON_BOOST_VERSION})
+  set(Boost_FILESYSTEM_LIBRARY "${Boost_filesystem_LIB_TARGETS}")
-  set(Boost_IOSTREAMS_LIBRARY ${MASON_PACKAGE_boost_libiostreams_STATIC_LIBS})
+  set(Boost_IOSTREAMS_LIBRARY "${Boost_iostreams_LIB_TARGETS}")
-  mason_use(boost_libprogram_options VERSION ${MASON_BOOST_VERSION})
+  set(Boost_THREAD_LIBRARY "${Boost_thread_LIB_TARGETS}")
-  set(Boost_PROGRAM_OPTIONS_LIBRARY ${MASON_PACKAGE_boost_libprogram_options_STATIC_LIBS})
+  set(Boost_SYSTEM_LIBRARY "${Boost_system_LIB_TARGETS}")
-  mason_use(boost_libregex VERSION ${MASON_BOOST_VERSION})
+  set(Boost_ZLIB_LIBRARY "${Boost_zlib_LIB_TARGETS}")
-  set(Boost_REGEX_LIBRARY ${MASON_PACKAGE_boost_libregex_STATIC_LIBS})
+  set(Boost_REGEX_LIBRARY "${Boost_regex_LIB_TARGETS}")
-  mason_use(boost_libtest VERSION ${MASON_BOOST_VERSION})
+  set(Boost_UNIT_TEST_FRAMEWORK_LIBRARY "${Boost_unit_test_framework_LIB_TARGETS}")
-  set(Boost_UNIT_TEST_FRAMEWORK_LIBRARY ${MASON_PACKAGE_boost_libtest_STATIC_LIBS})
-  mason_use(boost_libdate_time VERSION ${MASON_BOOST_VERSION})
-  set(Boost_DATE_TIME_LIBRARY ${MASON_PACKAGE_boost_libdate_time_STATIC_LIBS})
-  mason_use(boost_libthread VERSION ${MASON_BOOST_VERSION})
-  set(Boost_THREAD_LIBRARY ${MASON_PACKAGE_boost_libthread_STATIC_LIBS})
-  mason_use(boost_libsystem VERSION ${MASON_BOOST_VERSION})
-  set(Boost_SYSTEM_LIBRARY ${MASON_PACKAGE_boost_libsystem_STATIC_LIBS})
   
-  mason_use(expat VERSION ${MASON_EXPAT_VERSION})
+  find_package(BZip2 REQUIRED)
-  add_dependency_includes(${MASON_PACKAGE_expat_INCLUDE_DIRS})
+  find_package(EXPAT REQUIRED)
-  set(EXPAT_LIBRARIES ${MASON_PACKAGE_expat_STATIC_LIBS})
+  find_package(lua REQUIRED)
+  set(LUA_LIBRARIES ${lua_LIBRARIES})
 
-  mason_use(lua VERSION ${MASON_LUA_VERSION})
+  find_package(TBB REQUIRED)
-  add_dependency_includes(${MASON_PACKAGE_lua_INCLUDE_DIRS})
-  set(USED_LUA_LIBRARIES ${MASON_PACKAGE_lua_STATIC_LIBS})
 
-  mason_use(bzip2 VERSION ${MASON_BZIP2_VERSION})
-  add_dependency_includes(${MASON_PACKAGE_bzip2_INCLUDE_DIRS})
-  set(BZIP2_LIBRARIES ${MASON_PACKAGE_bzip2_STATIC_LIBS})
-
-  mason_use(tbb VERSION ${MASON_TBB_VERSION})
-  add_dependency_includes(${MASON_PACKAGE_tbb_INCLUDE_DIRS})
-  set(TBB_LIBRARIES ${MASON_PACKAGE_tbb_LDFLAGS})
-
-  if(NOT MASON_PACKAGE_tbb_LIBRARY_DIRS)
-    message(FATAL_ERROR "MASON_PACKAGE_tbb_LIBRARY_DIRS is empty, rpath will not work")
-  endif()
-  set(TBB_LINKER_RPATHS "")
-  foreach(libpath ${MASON_PACKAGE_tbb_LIBRARY_DIRS})
-    set(TBB_LINKER_RPATHS "${TBB_LINKER_RPATHS} -Wl,-rpath -Wl,${libpath}")
-    file(GLOB TBBGlob ${libpath}/*.*)
-    install(FILES ${TBBGlob} DESTINATION lib)
-  endforeach()
-  if(APPLE)
-    set(LINKER_FLAGS "${TBB_LINKER_RPATHS} -Wl,-rpath -Wl,@loader_path")
-  elseif(UNIX)
-    set(LINKER_FLAGS "${TBB_LINKER_RPATHS} '-Wl,-rpath,$ORIGIN' -Wl,-z,origin")
-  endif()
-
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAGS}")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAGS}")
-  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")
-
-  # current mason packages target -D_GLIBCXX_USE_CXX11_ABI=0
-  add_dependency_defines(-D_GLIBCXX_USE_CXX11_ABI=0)
 
   # note: we avoid calling find_package(Osmium ...) here to ensure that the
-  # expat and bzip2 are used from mason rather than the system
+  # expat and bzip2 are used from conan rather than the system
   include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include)
 else()
-
+  if (BUILD_ROUTED)
-  find_package(Boost 1.54 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
+    # osrm-routed requires newer boost:asio 
+    find_package(Boost 1.70 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
+  else()
+    find_package(Boost 1.60 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
+  endif()
   add_dependency_includes(${Boost_INCLUDE_DIRS})
 
   find_package(TBB REQUIRED)
@@ -541,7 +548,6 @@ else()
     message(STATUS "Using Lua ${LUA_VERSION_STRING}")
   endif()
 
-  set(USED_LUA_LIBRARIES ${LUA_LIBRARIES})
   add_dependency_includes(${LUA_INCLUDE_DIR})
 
   # add a target to generate API documentation with Doxygen
@@ -575,19 +581,11 @@ if(ENABLE_CCACHE AND (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILE
   endif()
 endif()
 
-# even with mason builds we want to link to system zlib
+# even with conan builds we want to link to system zlib
 # to ensure that osrm binaries play well with other binaries like nodejs
 find_package(ZLIB REQUIRED)
 add_dependency_includes(${ZLIB_INCLUDE_DIRS})
 
-if(NOT WIN32 AND NOT Boost_USE_STATIC_LIBS)
-  add_dependency_defines(-DBOOST_TEST_DYN_LINK)
-endif()
-
-if(NOT WIN32 AND NOT Boost_USE_STATIC_LIBS)
-  add_dependency_defines(-DBOOST_TEST_DYN_LINK)
-endif()
-
 add_dependency_defines(-DBOOST_SPIRIT_USE_PHOENIX_V3)
 add_dependency_defines(-DBOOST_RESULT_OF_USE_DECLTYPE)
 add_dependency_defines(-DBOOST_FILESYSTEM_NO_DEPRECATED)
@@ -614,7 +612,9 @@ target_link_libraries(osrm-extract osrm_extract ${Boost_PROGRAM_OPTIONS_LIBRARY}
 target_link_libraries(osrm-partition osrm_partition ${Boost_PROGRAM_OPTIONS_LIBRARY})
 target_link_libraries(osrm-customize osrm_customize ${Boost_PROGRAM_OPTIONS_LIBRARY})
 target_link_libraries(osrm-contract osrm_contract ${Boost_PROGRAM_OPTIONS_LIBRARY})
-target_link_libraries(osrm-routed osrm ${Boost_PROGRAM_OPTIONS_LIBRARY} ${OPTIONAL_SOCKET_LIBS} ${ZLIB_LIBRARY})
+if (BUILD_ROUTED)
+  target_link_libraries(osrm-routed osrm ${Boost_PROGRAM_OPTIONS_LIBRARY} ${OPTIONAL_SOCKET_LIBS} ${ZLIB_LIBRARY})
+endif()
 
 set(EXTRACTOR_LIBRARIES
     ${BZIP2_LIBRARIES}
@@ -622,7 +622,7 @@ set(EXTRACTOR_LIBRARIES
     ${BOOST_BASE_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
     ${EXPAT_LIBRARIES}
-    ${USED_LUA_LIBRARIES}
+    ${LUA_LIBRARIES}
     ${OSMIUM_LIBRARIES}
     ${TBB_LIBRARIES}
     ${ZLIB_LIBRARY}
@@ -630,7 +630,7 @@ set(EXTRACTOR_LIBRARIES
 set(GUIDANCE_LIBRARIES
     ${BOOST_BASE_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
-    ${USED_LUA_LIBRARIES}
+    ${LUA_LIBRARIES}
     ${TBB_LIBRARIES}
     ${MAYBE_COVERAGE_LIBRARIES})
 set(PARTITIONER_LIBRARIES
@@ -656,7 +656,7 @@ set(UPDATER_LIBRARIES
 set(CONTRACTOR_LIBRARIES
     ${BOOST_BASE_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}
-    ${USED_LUA_LIBRARIES}
+    ${LUA_LIBRARIES}
     ${TBB_LIBRARIES}
     ${MAYBE_RT_LIBRARY}
     ${MAYBE_COVERAGE_LIBRARIES})
@@ -697,7 +697,7 @@ install(TARGETS osrm-components DESTINATION bin)
 if(BUILD_TOOLS)
   message(STATUS "Activating OSRM internal tools")
   add_executable(osrm-io-benchmark src/tools/io-benchmark.cpp $<TARGET_OBJECTS:UTIL>)
-  target_link_libraries(osrm-io-benchmark ${BOOST_BASE_LIBRARIES})
+  target_link_libraries(osrm-io-benchmark ${BOOST_BASE_LIBRARIES} ${TBB_LIBRARIES})
 
   install(TARGETS osrm-io-benchmark DESTINATION bin)
 endif()
@@ -719,7 +719,9 @@ set_property(TARGET osrm-extract PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
 set_property(TARGET osrm-partition PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
 set_property(TARGET osrm-contract PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
 set_property(TARGET osrm-datastore PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
-set_property(TARGET osrm-routed PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
+if (BUILD_ROUTED)
+  set_property(TARGET osrm-routed PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
+endif()
 
 file(GLOB VariantGlob third_party/variant/include/mapbox/*.hpp)
 file(GLOB FlatbuffersGlob third_party/flatbuffers/include/flatbuffers/*.h)
@@ -748,7 +750,9 @@ install(TARGETS osrm-partition DESTINATION bin)
 install(TARGETS osrm-customize DESTINATION bin)
 install(TARGETS osrm-contract DESTINATION bin)
 install(TARGETS osrm-datastore DESTINATION bin)
-install(TARGETS osrm-routed DESTINATION bin)
+if (BUILD_ROUTED)
+  install(TARGETS osrm-routed DESTINATION bin)
+endif()
 install(TARGETS osrm DESTINATION lib)
 install(TARGETS osrm_extract DESTINATION lib)
 install(TARGETS osrm_partition DESTINATION lib)
@@ -805,8 +809,9 @@ JOIN("-I${DEPENDENCIES_INCLUDE_DIRS}" " -I" PKGCONFIG_OSRM_INCLUDE_FLAGS)
 
 # Boost uses imported targets, we need to use a generator expression to extract
 # the link libraries to be written to the pkg-config file.
+# Conan defines dependencies as CMake targets too, that's why we do the same for them.
 foreach(engine_lib ${ENGINE_LIBRARIES})
-  if("${engine_lib}" MATCHES "^Boost.*")
+  if("${engine_lib}" MATCHES "^Boost.*" OR "${engine_lib}" MATCHES "^CONAN_LIB.*")
     list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "$<TARGET_LINKER_FILE:${engine_lib}>")
   else()
     list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "${engine_lib}")

README.md

@@ -2,7 +2,7 @@
 
 | Linux / macOS | Windows | Code Coverage |
 | ------------- | ------- | ------------- |
-| [![Travis](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=master)](https://travis-ci.org/Project-OSRM/osrm-backend) | [![AppVeyor](https://ci.appveyor.com/api/projects/status/4iuo3s9gxprmcjjh)](https://ci.appveyor.com/project/DennisOSRM/osrm-backend) | [![Codecov](https://codecov.io/gh/Project-OSRM/osrm-backend/branch/master/graph/badge.svg)](https://codecov.io/gh/Project-OSRM/osrm-backend) |
+| [![osrm-backend CI](https://github.com/Project-OSRM/osrm-backend/actions/workflows/osrm-backend.yml/badge.svg)](https://github.com/Project-OSRM/osrm-backend/actions/workflows/osrm-backend.yml) | [![AppVeyor](https://ci.appveyor.com/api/projects/status/4iuo3s9gxprmcjjh)](https://ci.appveyor.com/project/DennisOSRM/osrm-backend) | [![Codecov](https://codecov.io/gh/Project-OSRM/osrm-backend/branch/master/graph/badge.svg)](https://codecov.io/gh/Project-OSRM/osrm-backend) |
 
 High performance routing engine written in C++14 designed to run on OpenStreetMap data.
 

appveyor-build.bat

@@ -1,194 +0,0 @@
-@ECHO OFF
-SETLOCAL
-SET EL=0
-
-ECHO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-SET PROJECT_DIR=%CD%
-ECHO PROJECT_DIR^: %PROJECT_DIR%
-ECHO NUMBER_OF_PROCESSORS^: %NUMBER_OF_PROCESSORS%
-
-
-:: Check CMake version
-SET CMAKE_VERSION=3.16.3
-SET PATH=%PROJECT_DIR%\cmake-%CMAKE_VERSION%-win32-x86\bin;%PATH%
-ECHO cmake^: && cmake --version
-IF %ERRORLEVEL% NEQ 0 ECHO CMAKE not found && GOTO CMAKE_NOT_OK
-
-cmake --version | findstr /C:%CMAKE_VERSION% && GOTO CMAKE_OK
-
-:CMAKE_NOT_OK
-ECHO CMAKE NOT OK - downloading new CMake %CMAKE_VERSION%
-powershell Invoke-WebRequest https://cmake.org/files/v3.16/cmake-%CMAKE_VERSION%-win32-x86.zip -OutFile $env:PROJECT_DIR\cm.zip
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-IF NOT EXIST cmake-%CMAKE_VERSION%-win32-x86 7z -y x cm.zip | %windir%\system32\FIND "ing archive"
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-:CMAKE_OK
-ECHO CMAKE_OK
-cmake --version
-
-ECHO activating VS command prompt ...
-SET PATH=C:\Program Files (x86)\MSBuild\15.0\Bin;%PATH%
-CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
-
-ECHO platform^: %platform%
-
-ECHO cl.exe version
-cl
-ECHO msbuild version
-msbuild /version
-
-:: HARDCODE "x64" as it is uppercase on AppVeyor and download from S3 is case sensitive
-SET DEPSPKG=osrm-deps-win-x64-14.2-2019.01.7z
-
-:: local development
-ECHO.
-ECHO LOCAL_DEV^: %LOCAL_DEV%
-IF NOT DEFINED LOCAL_DEV SET LOCAL_DEV=0
-IF DEFINED LOCAL_DEV IF %LOCAL_DEV% EQU 1 IF EXIST %DEPSPKG% ECHO skipping deps download && GOTO SKIPDL
-
-IF EXIST %DEPSPKG% DEL %DEPSPKG%
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-ECHO downloading %DEPSPKG%
-powershell Invoke-WebRequest http://project-osrm.wolt.com/windows-build-deps/$env:DEPSPKG -OutFile $env:PROJECT_DIR\$env:DEPSPKG
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-:SKIPDL
-
-IF EXIST osrm-deps ECHO deleting osrm-deps... && RD /S /Q osrm-deps
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-IF EXIST build ECHO deleting build dir... && RD /S /Q build
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-7z -y x %DEPSPKG% | %windir%\system32\FIND "ing archive"
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-::tree osrm-deps
-
-MKDIR build
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-cd build
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-SET OSRMDEPSDIR=%PROJECT_DIR%/osrm-deps
-set PREFIX=%OSRMDEPSDIR%/libs
-set BOOST_ROOT=%OSRMDEPSDIR%
-set BOOST_LIBRARYDIR=%BOOST_ROOT%/lib
-set TBB_INSTALL_DIR=%OSRMDEPSDIR%
-REM set TBB_ARCH_PLATFORM=intel64/vc17
-
-ECHO OSRMDEPSDIR       ^: %OSRMDEPSDIR%
-ECHO PREFIX            ^: %PREFIX%
-ECHO BOOST_ROOT        ^: %BOOST_ROOT%
-ECHO BOOST_LIBRARYDIR  ^: %BOOST_LIBRARYDIR%
-ECHO TBB_INSTALL_DIR   ^: %TBB_INSTALL_DIR%
-REM ECHO TBB_ARCH_PLATFORM ^: %TBB_ARCH_PLATFORM%
-
-
-ECHO calling cmake ....
-cmake .. ^
--G "Visual Studio 16 2019" ^
--DBOOST_ROOT=%BOOST_ROOT% ^
--DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% ^
--DBoost_ADDITIONAL_VERSIONS=1.73.0 ^
--DBoost_USE_MULTITHREADED=ON ^
--DBoost_USE_STATIC_LIBS=ON ^
--DEXPAT_INCLUDE_DIR=%OSRMDEPSDIR% ^
--DEXPAT_LIBRARY=%OSRMDEPSDIR%/lib/libexpat.lib ^
--DBZIP2_INCLUDE_DIR=%OSRMDEPSDIR% ^
--DBZIP2_LIBRARIES=%OSRMDEPSDIR%/lib/libbz2.lib ^
--DLUA_INCLUDE_DIR=%OSRMDEPSDIR% ^
--DLUA_LIBRARIES=%OSRMDEPSDIR%/lib/lua5.3.5.lib ^
--DZLIB_INCLUDE_DIR=%OSRMDEPSDIR% ^
--DZLIB_LIBRARY=%OSRMDEPSDIR%/lib/libz.lib ^
--DCMAKE_BUILD_TYPE=%CONFIGURATION% ^
--DCMAKE_INSTALL_PREFIX=%PREFIX%
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
-ECHO building ...
-msbuild OSRM.sln ^
-/p:Configuration=%Configuration% ^
-/p:Platform=x64 ^
-/t:rebuild ^
-/p:BuildInParallel=true ^
-/m:%NUMBER_OF_PROCESSORS% ^
-/toolsversion:Current ^
-/p:PlatformToolset=v142 ^
-/clp:Verbosity=normal ^
-/nologo ^
-/flp1:logfile=build_errors.txt;errorsonly ^
-/flp2:logfile=build_warnings.txt;warningsonly
-IF %ERRORLEVEL% EQU 1 GOTO ERROR
-
-CD %PROJECT_DIR%\build
-IF %ERRORLEVEL% EQU 1 GOTO ERROR
-
-SET PATH=%PROJECT_DIR%\osrm-deps\lib;%PATH%
-
-ECHO running extractor-tests.exe ...
-unit_tests\%Configuration%\extractor-tests.exe
-IF %ERRORLEVEL% EQU 1 GOTO ERROR
-
-ECHO running contractor-tests.exe ...
-unit_tests\%Configuration%\contractor-tests.exe
-IF %ERRORLEVEL% EQU 1 GOTO ERROR
-
-ECHO running engine-tests.exe ...
-unit_tests\%Configuration%\engine-tests.exe
-IF %ERRORLEVEL% EQU 1 GOTO ERROR
-
-ECHO running util-tests.exe ...
-unit_tests\%Configuration%\util-tests.exe
-IF %ERRORLEVEL% EQU 1 GOTO ERROR
-
-ECHO running server-tests.exe ...
-unit_tests\%Configuration%\server-tests.exe
-IF %ERRORLEVEL% EQU 1 GOTO ERROR
-
-ECHO running partitioner-tests.exe ...
-unit_tests\%Configuration%\partitioner-tests.exe
-IF %ERRORLEVEL% EQU 1 GOTO ERROR
-
-ECHO running customizer-tests.exe ...
-unit_tests\%Configuration%\customizer-tests.exe
-IF %ERRORLEVEL% EQU 1 GOTO ERROR
-
-ECHO running library-tests.exe ...
-SET test_region=monaco
-SET test_region_ch=ch\monaco
-SET test_region_corech=corech\monaco
-SET test_region_mld=mld\monaco
-SET test_osm=%test_region%.osm.pbf
-IF NOT EXIST %test_osm% powershell Invoke-WebRequest http://project-osrm.wolt.com/testing/monaco.osm.pbf -OutFile %test_osm%
-ECHO running %Configuration%\osrm-extract.exe -p ../profiles/car.lua %test_osm%
-%Configuration%\osrm-extract.exe
-%Configuration%\osrm-extract.exe -p ../profiles/car.lua %test_osm%
-MKDIR ch
-XCOPY %test_region%.osrm.* ch\
-XCOPY %test_region%.osrm ch\
-MKDIR corech
-XCOPY %test_region%.osrm.* corech\
-XCOPY %test_region%.osrm corech\
-MKDIR mld
-XCOPY %test_region%.osrm.* mld\
-XCOPY %test_region%.osrm mld\
-%Configuration%\osrm-contract.exe %test_region_ch%.osrm
-%Configuration%\osrm-contract.exe --core 0.8 %test_region_corech%.osrm
-%Configuration%\osrm-partition.exe %test_region_mld%.osrm
-%Configuration%\osrm-customize.exe %test_region_mld%.osrm
-XCOPY /Y ch\*.* ..\test\data\ch\
-XCOPY /Y corech\*.* ..\test\data\corech\
-XCOPY /Y mld\*.* ..\test\data\mld\
-unit_tests\%Configuration%\library-tests.exe
-
-:ERROR
-ECHO ~~~~~~~~~~~~~~~~~~~~~~ ERROR %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-ECHO ERRORLEVEL^: %ERRORLEVEL%
-SET EL=%ERRORLEVEL%
-
-:DONE
-ECHO ~~~~~~~~~~~~~~~~~~~~~~ DONE %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-EXIT /b %EL%

appveyor.yml

@@ -1,15 +1,3 @@
-environment:
-  matrix:
-  - configuration: Release
-#  - configuration: Debug
-
-install:
-  - ps: Install-Product node 6
-
-# scripts that are called at very beginning, before repo cloning
-init:
-  - git config --global core.autocrlf input
-
 os: Visual Studio 2019
 
 # clone directory
@@ -17,20 +5,11 @@ clone_folder: c:\projects\osrm
 
 platform: x64
 
+# no-op for the time being until someone with access to GitHub checks settings will remove integration with AppVeyor
+# https://github.com/Project-OSRM/osrm-backend/pull/6312#issuecomment-1217237055 
 build_script:
-  - CALL appveyor-build.bat
+  - EXIT 0
-
-before_test:
-  - node --version
-  - npm --version
-  - npm install --ignore-scripts
-  - npm link --ignore-scripts
-  - SET PATH=%CD%\osrm-deps\lib;%PATH%
-  - SET OSRM_BUILD_DIR=build\%Configuration%
-# TODO tests fail with "JavaScript heap out of memory", need a better host?
-#  - npm test
 
 branches:
   only:
     - master
-

docker/Dockerfile

@@ -1,14 +1,16 @@
-FROM debian:stretch-slim as builder
+FROM debian:bullseye-slim as builder
 ARG DOCKER_TAG
 ARG BUILD_CONCURRENCY
 RUN mkdir -p /src  && mkdir -p /opt
+
+RUN apt-get update && \
+    apt-get -y --no-install-recommends install cmake make git gcc g++ libbz2-dev libxml2-dev \
+    libzip-dev libboost1.74-all-dev lua5.2 liblua5.2-dev libtbb-dev -o APT::Install-Suggests=0 -o APT::Install-Recommends=0
+
 COPY . /src
 WORKDIR /src
 
 RUN NPROC=${BUILD_CONCURRENCY:-$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1)} && \
-    apt-get update && \
-    apt-get -y --no-install-recommends install cmake make git gcc g++ libbz2-dev libxml2-dev \
-    libzip-dev libboost1.62-all-dev lua5.2 liblua5.2-dev libtbb-dev -o APT::Install-Suggests=0 -o APT::Install-Recommends=0 && \
     echo "Building OSRM ${DOCKER_TAG}" && \
     git show --format="%H" | head -n1 > /opt/OSRM_GITSHA && \
     echo "Building OSRM gitsha $(cat /opt/OSRM_GITSHA)" && \
@@ -27,15 +29,15 @@ RUN NPROC=${BUILD_CONCURRENCY:-$(grep -c ^processor /proc/cpuinfo 2>/dev/null ||
     strip /usr/local/bin/* && \
     rm -rf /src /usr/local/lib/libosrm*
 
-
 # Multistage build to reduce image size - https://docs.docker.com/engine/userguide/eng-image/multistage-build/#use-multi-stage-builds
 # Only the content below ends up in the image, this helps remove /src from the image (which is large)
-FROM debian:stretch-slim as runstage
+FROM debian:bullseye-slim as runstage
 RUN mkdir -p /src  && mkdir -p /opt
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends libboost-program-options1.62.0 libboost-regex1.62.0 \
+    apt-get install -y --no-install-recommends libboost-program-options1.74.0 libboost-regex1.74.0 \
-        libboost-date-time1.62.0 libboost-chrono1.62.0 libboost-filesystem1.62.0 \
+        libboost-date-time1.74.0 libboost-chrono1.74.0 libboost-filesystem1.74.0 \
-        libboost-iostreams1.62.0 libboost-thread1.62.0 expat liblua5.2-0 libtbb2 &&\
+        libboost-iostreams1.74.0 libboost-system1.74.0 libboost-thread1.74.0 \
+        expat liblua5.2-0 libtbb2 &&\
     rm -rf /var/lib/apt/lists/*
 COPY --from=builder /usr/local /usr/local
 COPY --from=builder /opt /opt

docs/nodejs/api.md

@@ -20,23 +20,24 @@ var osrm = new OSRM('network.osrm');
 
 **Parameters**
 
--   `options` **([Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object) \| [String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String))** Options for creating an OSRM object or string to the `.osrm` file. (optional, default `{shared_memory:true}`)
+-   `options` **([Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object) \| [String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String))** Options for creating an OSRM object or string to the `.osrm` file. (optional, default `{shared_memory:true}`)
-    -   `options.algorithm` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** The algorithm to use for routing. Can be 'CH', 'CoreCH' or 'MLD'. Default is 'CH'.
+    -   `options.algorithm` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** The algorithm to use for routing. Can be 'CH', 'CoreCH' or 'MLD'. Default is 'CH'.
                Make sure you prepared the dataset with the correct toolchain.
-    -   `options.shared_memory` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Connects to the persistent shared memory datastore.
+    -   `options.shared_memory` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Connects to the persistent shared memory datastore.
                This requires you to run `osrm-datastore` prior to creating an `OSRM` object.
-    -   `options.dataset_name` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** Connects to the persistent shared memory datastore defined by `--dataset_name` option when running `osrm-datastore`
+    -   `options.dataset_name` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** Connects to the persistent shared memory datastore defined by `--dataset_name` option when running `osrm-datastore`.
                This requires you to run `osrm-datastore --dataset_name` prior to creating an `OSRM` object.
-    -   `options.memory_file` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** *DEPRECATED*
+    -   `options.memory_file` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** **DEPRECATED**
                Old behaviour: Path to a file on disk to store the memory using mmap.  Current behaviour: setting this value is the same as setting `mmap_memory: true`.
-    -   `options.mmap_memory` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Map on-disk files to virtual memory addresses (mmap), rather than loading into RAM.
+    -   `options.mmap_memory` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Map on-disk files to virtual memory addresses (mmap), rather than loading into RAM.
-    -   `options.path` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** The path to the `.osrm` files. This is mutually exclusive with setting {options.shared_memory} to true.
+    -   `options.path` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** The path to the `.osrm` files. This is mutually exclusive with setting {options.shared_memory} to true.
-    -   `options.max_locations_trip` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in trip query (default: unlimited).
+    -   `options.max_locations_trip` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in trip query (default: unlimited).
-    -   `options.max_locations_viaroute` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in viaroute query (default: unlimited).
+    -   `options.max_locations_viaroute` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in viaroute query (default: unlimited).
-    -   `options.max_locations_distance_table` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in distance table query (default: unlimited).
+    -   `options.max_locations_distance_table` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in distance table query (default: unlimited).
-    -   `options.max_locations_map_matching` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in map-matching query (default: unlimited).
+    -   `options.max_locations_map_matching` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in map-matching query (default: unlimited).
-    -   `options.max_results_nearest` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. results supported in nearest query (default: unlimited).
+    -   `options.max_radius_map_matching` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. radius size supported in map matching query (default: 5).
-    -   `options.max_alternatives` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max.number of alternatives supported in alternative routes query (default: 3).
+    -   `options.max_results_nearest` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. results supported in nearest query (default: unlimited).
+    -   `options.max_alternatives` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. number of alternatives supported in alternative routes query (default: 3).
 
 ### route
 
@@ -44,39 +45,39 @@ Returns the fastest route between two or more coordinates while visiting the way
 
 **Parameters**
 
--   `options` **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the route query.
+-   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the route query.
-    -   `options.coordinates` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
+    -   `options.coordinates` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
-    -   `options.bearings` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
+    -   `options.bearings` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
                                           Can be `null` or an array of `[{value},{range}]` with `integer 0 .. 360,integer 0 .. 180`.
-    -   `options.radiuses` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the coordinate snapping to streets in the given radius in meters. Can be `null` (unlimited, default) or `double >= 0`.
+    -   `options.radiuses` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the coordinate snapping to streets in the given radius in meters. Can be `null` (unlimited, default) or `double >= 0`.
-    -   `options.hints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
+    -   `options.hints` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
-    -   `options.generate_hints` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Whether or not adds a Hint to the response which can be used in subsequent requests. (optional, default `true`)
+    -   `options.generate_hints` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Whether or not adds a Hint to the response which can be used in subsequent requests. (optional, default `true`)
-    -   `options.alternatives` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Search for alternative routes. (optional, default `false`)
+    -   `options.alternatives` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Search for alternative routes. (optional, default `false`)
-    -   `options.alternatives` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)** Search for up to this many alternative routes.
+    -   `options.alternatives` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** Search for up to this many alternative routes.
         _Please note that even if alternative routes are requested, a result cannot be guaranteed._ (optional, default `0`)
-    -   `options.steps` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route steps for each route leg. (optional, default `false`)
+    -   `options.steps` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route steps for each route leg. (optional, default `false`)
-    -   `options.annotations` **([Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array) \| [Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean))** An array with strings of `duration`, `nodes`, `distance`, `weight`, `datasources`, `speed` or boolean for enabling/disabling all. (optional, default `false`)
+    -   `options.annotations` **([Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array) \| [Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean))** An array with strings of `duration`, `nodes`, `distance`, `weight`, `datasources`, `speed` or boolean for enabling/disabling all. (optional, default `false`)
-    -   `options.geometries` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route geometry format (influences overview and per step). Can also be `geojson`. (optional, default `polyline`)
+    -   `options.geometries` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route geometry format (influences overview and per step). Can also be `geojson`. (optional, default `polyline`)
-    -   `options.overview` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Add overview geometry either `full`, `simplified` according to highest zoom level it could be display on, or not at all (`false`). (optional, default `simplified`)
+    -   `options.overview` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Add overview geometry either `full`, `simplified` according to highest zoom level it could be display on, or not at all (`false`). (optional, default `simplified`)
-    -   `options.continue_straight` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Forces the route to keep going straight at waypoints and don't do a uturn even if it would be faster. Default value depends on the profile.
+    -   `options.continue_straight` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Forces the route to keep going straight at waypoints and don't do a uturn even if it would be faster. Default value depends on the profile.
-    -   `options.approaches` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
+    -   `options.approaches` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
-    -   `options.waypoints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Indices to coordinates to treat as waypoints.  If not supplied, all coordinates are waypoints.  Must include first and last coordinate index.
                          `null`/`true`/`false`
-    -   `options.snapping` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which edges can be snapped to, either `default`, or `any`.  `default` only snaps to edges marked by the profile as `is_startpoint`, `any` will allow snapping to any edge in the routing graph.
+    -   `options.waypoints` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Indices to coordinates to treat as waypoints. If not supplied, all coordinates are waypoints.  Must include first and last coordinate index.
--   `callback` **[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)**
+    -   `options.snapping` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which edges can be snapped to, either `default`, or `any`.  `default` only snaps to edges marked by the profile as `is_startpoint`, `any` will allow snapping to any edge in the routing graph.
+-   `callback` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)** 
 
 **Examples**
 
 ```javascript
 var osrm = new OSRM("berlin-latest.osrm");
-osrm.route({coordinates: [[13.438640,52.519930], [13.415852,52.513191]]}, function(err, result) {
+osrm.route({coordinates: [[52.519930,13.438640], [52.513191,13.415852]]}, function(err, result) {
   if(err) throw err;
   console.log(result.waypoints); // array of Waypoint objects representing all waypoints in order
   console.log(result.routes); // array of Route objects ordered by descending recommendation rank
 });
 ```
 
-Returns **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** An array of [Waypoint](#waypoint) objects representing all waypoints in order AND an array of [`Route`](#route) objects ordered by descending recommendation rank.
+Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** An array of [Waypoint](#waypoint) objects representing all waypoints in order AND an array of [`Route`](#route) objects ordered by descending recommendation rank.
 
 ### nearest
 
@@ -86,18 +87,18 @@ Note: `coordinates` in the general options only supports a single `{longitude},{
 
 **Parameters**
 
--   `options` **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the nearest query.
+-   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the nearest query.
-    -   `options.coordinates` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
+    -   `options.coordinates` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
-    -   `options.bearings` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
+    -   `options.bearings` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
                                           Can be `null` or an array of `[{value},{range}]` with `integer 0 .. 360,integer 0 .. 180`.
-    -   `options.radiuses` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the coordinate snapping to streets in the given radius in meters. Can be `null` (unlimited, default) or `double >= 0`.
+    -   `options.radiuses` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the coordinate snapping to streets in the given radius in meters. Can be `null` (unlimited, default) or `double >= 0`.
-    -   `options.hints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
+    -   `options.hints` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
-    -   `options.generate_hints` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Whether or not adds a Hint to the response which can be used in subsequent requests. (optional, default `true`)
+    -   `options.generate_hints` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Whether or not adds a Hint to the response which can be used in subsequent requests. (optional, default `true`)
-    -   `options.number` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)** Number of nearest segments that should be returned.
+    -   `options.number` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)** Number of nearest segments that should be returned.
         Must be an integer greater than or equal to `1`. (optional, default `1`)
-    -   `options.approaches` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
+    -   `options.approaches` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
-    -   `options.snapping` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which edges can be snapped to, either `default`, or `any`.  `default` only snaps to edges marked by the profile as `is_startpoint`, `any` will allow snapping to any edge in the routing graph.
+    -   `options.snapping` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which edges can be snapped to, either `default`, or `any`.  `default` only snaps to edges marked by the profile as `is_startpoint`, `any` will allow snapping to any edge in the routing graph.
--   `callback` **[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)**
+-   `callback` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)** 
 
 **Examples**
 
@@ -113,37 +114,34 @@ osrm.nearest(options, function(err, response) {
 });
 ```
 
-Returns **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** containing `waypoints`.
+Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** containing `waypoints`.
 **`waypoints`**: array of [`Ẁaypoint`](#waypoint) objects sorted by distance to the input coordinate.
                  Each object has an additional `distance` property, which is the distance in meters to the supplied input coordinate.
 
 ### table
 
-Computes duration table for the given locations. Allows for both symmetric and asymmetric
+Computes duration table for the given locations. Allows for both symmetric and asymmetric tables.
-tables. Optionally returns distance table.
+Optionally returns distance table.
 
 **Parameters**
 
--   `options` **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the table query.
+-   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the table query.
-    -   `options.coordinates` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
+    -   `options.coordinates` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
-    -   `options.bearings` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
+    -   `options.bearings` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
                                           Can be `null` or an array of `[{value},{range}]` with `integer 0 .. 360,integer 0 .. 180`.
-    -   `options.radiuses` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the coordinate snapping to streets in the given radius in meters. Can be `null` (unlimited, default) or `double >= 0`.
+    -   `options.radiuses` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the coordinate snapping to streets in the given radius in meters. Can be `null` (unlimited, default) or `double >= 0`.
-    -   `options.hints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
+    -   `options.hints` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
-    -   `options.generate_hints` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Whether or not adds a Hint to the response which can be used in subsequent requests. (optional, default `true`)
+    -   `options.generate_hints` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Whether or not adds a Hint to the response which can be used in subsequent requests. (optional, default `true`)
-    -   `options.sources` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** An array of `index` elements (`0 <= integer < #coordinates`) to
+    -   `options.sources` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** An array of `index` elements (`0 <= integer < #coordinates`) to use
-        use
+                                         location with given index as source. Default is to use all.
-        location with given index as source. Default is to use all.
+    -   `options.destinations` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** An array of `index` elements (`0 <= integer < #coordinates`) to use location with given index as destination. Default is to use all.
-    -   `options.destinations` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** An array of `index` elements (`0 <= integer <
+    -   `options.approaches` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
-        #coordinates`) to use location with given index as destination. Default is to use all.
+    -   `options.fallback_speed` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Replace `null` responses in result with as-the-crow-flies estimates based on `fallback_speed`.  Value is in metres/second.
-    -   `options.approaches` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
+    -   `options.fallback_coordinate` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** Either `input` (default) or `snapped`.  If using a `fallback_speed`, use either the user-supplied coordinate (`input`), or the snapped coordinate (`snapped`) for calculating the as-the-crow-flies distance between two points.
-    -   `options.fallback_speed` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Replace `null` responses in result with as-the-crow-flies estimates based on `fallback_speed`.  Value is in metres/second.
+    -   `options.scale_factor` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Multiply the table duration values in the table by this number for more controlled input into a route optimization solver.
-    -   `options.fallback_coordinate` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** Either `input` (default) or `snapped`.  If using a `fallback_speed`, use either the user-supplied coordinate (`input`), or the snapped coordinate (`snapped`) for calculating the as-the-crow-flies diestance between two points.
+    -   `options.snapping` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which edges can be snapped to, either `default`, or `any`.  `default` only snaps to edges marked by the profile as `is_startpoint`, `any` will allow snapping to any edge in the routing graph.
-    -   `options.scale_factor` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Multiply the table duration values in the table by this number for more controlled input into a route optimization solver.
+    -   `options.annotations` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Return the requested table or tables in response. Can be `['duration']` (return the duration matrix, default), `[distance']` (return the distance matrix), or `['duration', distance']` (return both the duration matrix and the distance matrix).
-    -   `options.snapping` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which edges can be snapped to, either `default`, or `any`.  `default` only snaps to edges marked by the profile as `is_startpoint`, `any` will allow snapping to any edge in the routing graph.
+-   `callback` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)** 
-    -   `options.annotations` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Return the requested table or tables in response. Can be `['duration']` (return the duration matrix, default) or `['duration', distance']` (return both the duration matrix and the distance matrix). 
-     
--   `callback` **[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)**
 
 **Examples**
 
@@ -158,14 +156,17 @@ var options = {
 };
 osrm.table(options, function(err, response) {
   console.log(response.durations); // array of arrays, matrix in row-major order
+  console.log(response.distances); // array of arrays, matrix in row-major order
   console.log(response.sources); // array of Waypoint objects
   console.log(response.destinations); // array of Waypoint objects
 });
 ```
 
-Returns **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** containing `durations`, `sources`, and `destinations`.
+Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** containing `durations`, `distances`, `sources`, and `destinations`.
 **`durations`**: array of arrays that stores the matrix in row-major order. `durations[i][j]` gives the travel time from the i-th waypoint to the j-th waypoint.
                  Values are given in seconds.
+**`distances`**: array of arrays that stores the matrix in row-major order. `distances[i][j]` gives the travel time from the i-th waypoint to the j-th waypoint.
+                 Values are given in meters.
 **`sources`**: array of [`Ẁaypoint`](#waypoint) objects describing all sources in order.
 **`destinations`**: array of [`Ẁaypoint`](#waypoint) objects describing all destinations in order.
 **`fallback_speed_cells`**: (optional) if `fallback_speed` is used, will be an array of arrays of `row,column` values, indicating which cells contain estimated values.
@@ -181,10 +182,10 @@ and what weights they have applied.
 
 **Parameters**
 
--   `ZXY` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)** an array consisting of `x`, `y`, and `z` values representing tile coordinates like
+-   `ZXY` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)** an array consisting of `x`, `y`, and `z` values representing tile coordinates like
            [wiki.openstreetmap.org/wiki/Slippy_map_tilenames](https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames)
            and are supported by vector tile viewers like [Mapbox GL JS](https://www.mapbox.com/mapbox-gl-js/api/).
--   `callback` **[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)**
+-   `callback` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)** 
 
 **Examples**
 
@@ -208,23 +209,23 @@ if they can not be matched successfully.
 
 **Parameters**
 
--   `options` **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the match query.
+-   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the match query.
-    -   `options.coordinates` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
+    -   `options.coordinates` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
-    -   `options.bearings` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
+    -   `options.bearings` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
                                           Can be `null` or an array of `[{value},{range}]` with `integer 0 .. 360,integer 0 .. 180`.
-    -   `options.hints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
+    -   `options.hints` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
-    -   `options.generate_hints` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Whether or not adds a Hint to the response which can be used in subsequent requests. (optional, default `true`)
+    -   `options.generate_hints` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Whether or not adds a Hint to the response which can be used in subsequent requests. (optional, default `true`)
-    -   `options.steps` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route steps for each route. (optional, default `false`)
+    -   `options.steps` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route steps for each route. (optional, default `false`)
-    -   `options.annotations` **([Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array) \| [Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean))** An array with strings of `duration`, `nodes`, `distance`, `weight`, `datasources`, `speed` or boolean for enabling/disabling all. (optional, default `false`)
+    -   `options.annotations` **([Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array) \| [Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean))** An array with strings of `duration`, `nodes`, `distance`, `weight`, `datasources`, `speed` or boolean for enabling/disabling all. (optional, default `false`)
-    -   `options.geometries` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route geometry format (influences overview and per step). Can also be `geojson`. (optional, default `polyline`)
+    -   `options.geometries` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route geometry format (influences overview and per step). Can also be `geojson`. (optional, default `polyline`)
-    -   `options.overview` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Add overview geometry either `full`, `simplified` according to highest zoom level it could be display on, or not at all (`false`). (optional, default `simplified`)
+    -   `options.overview` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Add overview geometry either `full`, `simplified` according to highest zoom level it could be display on, or not at all (`false`). (optional, default `simplified`)
-    -   `options.timestamps` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)&lt;[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)>?** Timestamp of the input location (integers, UNIX-like timestamp).
+    -   `options.timestamps` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)&lt;[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)>?** Timestamp of the input location (integers, UNIX-like timestamp).
-    -   `options.radiuses` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Standard deviation of GPS precision used for map matching. If applicable use GPS accuracy. Can be `null` for default value `5` meters or `double >= 0`.
+    -   `options.radiuses` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Standard deviation of GPS precision used for map matching. If applicable use GPS accuracy. Can be `null` for default value `5` meters or `double >= 0`.
-    -   `options.gaps` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** Allows the input track splitting based on huge timestamp gaps between points. Either `split` or `ignore` (optional, default `split`).
+    -   `options.gaps` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Allows the input track splitting based on huge timestamp gaps between points. Either `split` or `ignore`. (optional, default `split`)
-    -   `options.tidy` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Allows the input track modification to obtain better matching quality for noisy tracks (optional, default `false`).
+    -   `options.tidy` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Allows the input track modification to obtain better matching quality for noisy tracks. (optional, default `false`)
-    -   `options.waypoints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Indices to coordinates to treat as waypoints.  If not supplied, all coordinates are waypoints.  Must include first and last coordinate index.
+    -   `options.waypoints` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Indices to coordinates to treat as waypoints.  If not supplied, all coordinates are waypoints.  Must include first and last coordinate index.
-    -   `options.snapping` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which edges can be snapped to, either `default`, or `any`.  `default` only snaps to edges marked by the profile as `is_startpoint`, `any` will allow snapping to any edge in the routing graph.
+    -   `options.snapping` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which edges can be snapped to, either `default`, or `any`. `default` only snaps to edges marked by the profile as `is_startpoint`, `any` will allow snapping to any edge in the routing graph.
--   `callback` **[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)**
+-   `callback` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)** 
 
 **Examples**
 
@@ -241,19 +242,15 @@ osrm.match(options, function(err, response) {
 });
 ```
 
-Returns **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** containing `tracepoints` and `matchings`.
+Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** containing `tracepoints` and `matchings`.
 **`tracepoints`** Array of [`Ẁaypoint`](#waypoint) objects representing all points of the trace in order.
                   If the trace point was ommited by map matching because it is an outlier, the entry will be null.
                   Each `Waypoint` object has the following additional properties,
-                  
                   1) `matchings_index`: Index to the
                   [`Route`](#route) object in matchings the sub-trace was matched to,
-                  
                   2) `waypoint_index`: Index of
                   the waypoint inside the matched route.
-                  
                   3) `alternatives_count`: Number of probable alternative matchings for this trace point. A value of zero indicate that this point was matched unambiguously. Split the trace at these points for incremental map matching.
-                  
 **`matchings`** is an array of [`Route`](#route) objects that assemble the trace. Each `Route` object has an additional `confidence` property,
                 which is the confidence of the matching. float value between `0` and `1`. `1` is very confident that the matching is correct.
 
@@ -281,23 +278,23 @@ Right now, the following combinations are possible:
 
 **Parameters**
 
--   `options` **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the trip query.
+-   `options` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the trip query.
-    -   `options.coordinates` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
+    -   `options.coordinates` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
-    -   `options.bearings` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
+    -   `options.bearings` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
                                           Can be `null` or an array of `[{value},{range}]` with `integer 0 .. 360,integer 0 .. 180`.
-    -   `options.radiuses` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the coordinate snapping to streets in the given radius in meters. Can be `double >= 0` or `null` (unlimited, default).
+    -   `options.radiuses` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the coordinate snapping to streets in the given radius in meters. Can be `double >= 0` or `null` (unlimited, default).
-    -   `options.hints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
+    -   `options.hints` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
-    -   `options.generate_hints` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Whether or not adds a Hint to the response which can be used in subsequent requests. (optional, default `true`)
+    -   `options.generate_hints` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Whether or not adds a Hint to the response which can be used in subsequent requests. (optional, default `true`)
-    -   `options.steps` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route steps for each route. (optional, default `false`)
+    -   `options.steps` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route steps for each route. (optional, default `false`)
-    -   `options.annotations` **([Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array) \| [Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean))** An array with strings of `duration`, `nodes`, `distance`, `weight`, `datasources`, `speed` or boolean for enabling/disabling all. (optional, default `false`)
+    -   `options.annotations` **([Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array) \| [Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean))** An array with strings of `duration`, `nodes`, `distance`, `weight`, `datasources`, `speed` or boolean for enabling/disabling all. (optional, default `false`)
-    -   `options.geometries` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route geometry format (influences overview and per step). Can also be `geojson`. (optional, default `polyline`)
+    -   `options.geometries` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route geometry format (influences overview and per step). Can also be `geojson`. (optional, default `polyline`)
-    -   `options.overview` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Add overview geometry either `full`, `simplified` (optional, default `simplified`)
+    -   `options.overview` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Add overview geometry either `full`, `simplified` (optional, default `simplified`)
-    -   `options.roundtrip` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route is a roundtrip. (optional, default `true`)
+    -   `options.roundtrip` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route is a roundtrip. (optional, default `true`)
-    -   `options.source` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Return route starts at `any` or `first` coordinate. (optional, default `any`)
+    -   `options.source` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Return route starts at `any` or `first` coordinate. (optional, default `any`)
-    -   `options.destination` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Return route ends at `any` or `last` coordinate. (optional, default `any`)
+    -   `options.destination` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** Return route ends at `any` or `last` coordinate. (optional, default `any`)
-    -   `options.approaches` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
+    -   `options.approaches` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
-    -   `options.snapping` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which edges can be snapped to, either `default`, or `any`.  `default` only snaps to edges marked by the profile as `is_startpoint`, `any` will allow snapping to any edge in the routing graph.
+    -   `options.snapping` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which edges can be snapped to, either `default`, or `any`. `default` only snaps to edges marked by the profile as `is_startpoint`, `any` will allow snapping to any edge in the routing graph.
--   `callback` **[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)**
+-   `callback` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)** 
 
 **Examples**
 
@@ -319,19 +316,28 @@ osrm.trip(options, function(err, response) {
 });
 ```
 
-Returns **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** containing `waypoints` and `trips`.
+Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** containing `waypoints` and `trips`.
 **`waypoints`**: an array of [`Waypoint`](#waypoint) objects representing all waypoints in input order.
                  Each Waypoint object has the following additional properties,
                  1) `trips_index`: index to trips of the sub-trip the point was matched to, and
                  2) `waypoint_index`: index of the point in the trip.
 **`trips`**: an array of [`Route`](#route) objects that assemble the trace.
 
-## Plugin behaviour
+## Configuration
 
-All plugins support a second additional object that is available to configure some NodeJS specific behaviours.
+All plugins support a second additional object that is available to configure some NodeJS
+specific behaviours.
 
--   `plugin_config` **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the trip query.
+**Parameters**
-    -   `plugin_config.format` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** The format of the result object to various API calls.  Valid options are `object` (default), which returns a standard Javascript object, as described above, and `json_buffer`, which will return a NodeJS **[Buffer](https://nodejs.org/api/buffer.html)** object, containing a JSON string.  The latter has the advantage that it can be immediately serialized to disk/sent over the network, and the generation of the string is performed outside the main NodeJS event loop.  This option is ignored by the `tile` plugin.
+
+-   `plugin_config` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)?** Object literal containing parameters for the trip query.
+    -   `plugin_config.format` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** The format of the result object to various API calls.
+                                               Valid options are `object` (default), which returns a
+        standard Javascript object, as described above, and `json_buffer`, which will return a NodeJS
+        **[Buffer](https://nodejs.org/api/buffer.html)** object, containing a JSON string. The latter has
+        the advantage that it can be immediately serialized to disk/sent over the network, and the
+        generation of the string is performed outside the main NodeJS event loop.  This option is ignored
+        by the `tile` plugin.
 
 **Examples**
 
@@ -357,7 +363,7 @@ Represents a route through (potentially multiple) waypoints.
 
 **Parameters**
 
--   **documentation** in
+-   `external` **documentation** in
     [`osrm-backend`](../http.md#route-object)
 
 ### RouteLeg
@@ -366,7 +372,7 @@ Represents a route between two waypoints.
 
 **Parameters**
 
--   **documentation** in
+-   `external` **documentation** in
     [`osrm-backend`](../http.md#routeleg-object)
 
 ### RouteStep
@@ -376,14 +382,14 @@ single way to the subsequent step.
 
 **Parameters**
 
--   **documentation** in
+-   `external` **documentation** in
     [`osrm-backend`](../http.md#routestep-object)
 
 ### StepManeuver
 
 **Parameters**
 
--   **documentation** in
+-   `external` **documentation** in
     [`osrm-backend`](../http.md#stepmaneuver-object)
 
 ### Waypoint
@@ -392,5 +398,5 @@ Object used to describe waypoint on a route.
 
 **Parameters**
 
--   **documentation** in
+-   `external` **documentation** in
     [`osrm-backend`](../http.md#waypoint-object)

docs/windows-deps.md

@@ -12,20 +12,14 @@ Prepare directories for dependencies, build and target file location.Target dire
 
 ### Bzip2
 
-1. Download either from Wolt OSRM mirror or original distribution and unpack.
+1. Download from https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
-    * https://project-osrm.wolt.com/deps/bzip2-1.0.8.tar.gz
-    * https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
-
 2. Start 'x64 Native Tools Command Prompt for VS2019' and change directory to unpacked source tree.
 3. Issue `nmake /f makefile.msc`
 4. Copy bzlib.h to $target\include and libbz2.lib to $target\lib
 
 ### ZLib
 
-1. Download either from Wolt OSRM mirror or original distribution and unpack.
+1. Download https://www.zlib.net/zlib-1.2.11.tar.gz
-    * https://project-osrm.wolt.com/deps/zlib-1.2.11.tar.gz
-    * https://www.zlib.net/zlib-1.2.11.tar.gz
-
 2. Start 'x64 Native Tools Command Prompt for VS2019' and change directory to unpacked source tree.
 3. Switch to `contrib\vstudio\vc14`
 4. If needed, open `zlibvc.sln` with Visual Studio and retarget to your version of compiler and SDK.
@@ -34,10 +28,8 @@ Prepare directories for dependencies, build and target file location.Target dire
 
 ### ICU
 
-1. Download either from Wolt OSRM mirror or original distribution and unpack.
+1. Download and unpack.
-    * https://wolt-project.wolt.com/deps/icu4c-66_1-src.zip
     * https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-src.zip
-    * https://wolt-project.wolt.com/deps/icu4c-66_1-data.zip
     * https://github.com/unicode-org/icu/releases/download/release-66-1/icu4c-66_1-data.zip
 2. Do retarget if neededby openinig .\source\allinone\allinone.sln and editing projects
 3. Start 'x64 Native Tools Command Prompt for VS2019' and change directory to unpacked source tree.
@@ -48,10 +40,7 @@ Prepare directories for dependencies, build and target file location.Target dire
 
 ### Boost
 
-1. Download either from Wolt OSRM mirror or original distribution and unpack.
+1. Download and unpack https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.zip
-    * https://project-osrm.wolt.com/deps/boost_1_73_0.zip
-    * https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.zip
-
 2. Start 'x64 Native Tools Command Prompt for VS2019' and change directory to unpacked source tree.
 3. Build b2:
     bootstrap.bat --with-toolset=msvc-14.2
@@ -61,9 +50,7 @@ Prepare directories for dependencies, build and target file location.Target dire
 
 ### Expat
 
-1. Download either from Wolt OSRM mirror or original distribution and unpack.
+1. Download and unpack https://github.com/libexpat/libexpat/archive/R_2_2_9.zip
-    * https://project-osrm.wolt.com/deps/libexpat-2_2_9.zip
-    * https://github.com/libexpat/libexpat/archive/R_2_2_9.zip
 2. Start 'x64 Native Tools Command Prompt for VS2019' and change directory to unpacked source tree.
 3. Configure build my calling cmake:
     mkdir expat\build
@@ -74,9 +61,7 @@ Prepare directories for dependencies, build and target file location.Target dire
 
 ### LUA
 
-1. Download either from Wolt OSRM mirror or original distribution and unpack.
+1. Download and unpack https://www.lua.org/ftp/lua-5.3.5.tar.gz
-    * https://project-osrm.wolt.com/deps/lua-5.3.5.tar.gz
-    * https://www.lua.org/ftp/lua-5.3.5.tar.gz
 2. Start 'x64 Native Tools Command Prompt for VS2019' and change directory to unpacked source tree.
 3. Lua doesn't have native MSVC support, so you have to compile it by hand:
     cd src
@@ -88,9 +73,7 @@ Prepare directories for dependencies, build and target file location.Target dire
 
 ### TBB
 
-1. Download either from Wolt OSRM mirror or original distribution and unpack.
+1. Download and unpack https://github.com/oneapi-src/oneTBB/archive/v2020.2.zip
-    * https://project-osrm.wolt.com/deps/oneTBB-v2020.2.zip
-    * https://github.com/oneapi-src/oneTBB/archive/v2020.2.zip
 2. Retarget by opening build\vs2013\makefile.sln
 3. Start 'x64 Native Tools Command Prompt for VS2019' and change directory to unpacked source tree.
 4. Switch to build\vs2013 and build: `msbuild makefle.sln /nologo /p:Configuration=Release /p:Platform=x64`

features/bicycle/exclude.feature

@@ -45,7 +45,7 @@ Feature: Bicycle - Exclude flags
 
         When I match I should get
             | trace | matchings | duration |
-            | abcf  | abcf      | 301.2    |
+            | abcf  | abcf      | 301      |
 
         When I request a travel time matrix I should get
             |   | a          | f        |

features/bicycle/maxspeed.feature

@@ -9,7 +9,7 @@ Feature: Bike - Max speed restrictions
         Then routability should be
             | highway     | maxspeed | bothw   |
             | residential |          | 15 km/h |
-            | residential | 10       | 9 km/h  |
+            | residential | 10       | 10 km/h |
 
     Scenario: Bicycle - Ignore maxspeed when higher than way speed
         Then routability should be
@@ -65,12 +65,12 @@ Feature: Bike - Max speed restrictions
         Then routability should be
             | maxspeed | maxspeed:forward | maxspeed:backward | forw    | backw   |
             |          |                  |                   | 15 km/h | 15 km/h |
-            | 10       |                  |                   | 9 km/h  | 9 km/h  |
+            | 10       |                  |                   | 10 km/h | 10 km/h |
-            |          | 10               |                   | 9 km/h  | 15 km/h |
+            |          | 10               |                   | 10 km/h | 15 km/h |
-            |          |                  | 10                | 14 km/h | 9 km/h  |
+            |          |                  | 10                | 15 km/h | 10 km/h |
-            | 2        | 10               |                   | 9 km/h  | 2 km/h  |
+            | 2        | 10               |                   | 10 km/h | 2 km/h  |
-            | 2        |                  | 10                | 2 km/h  | 9 km/h  |
+            | 2        |                  | 10                | 2 km/h  | 10 km/h |
-            | 2        | 5                | 10                | 5 km/h  | 9 km/h  |
+            | 2        | 5                | 10                | 5 km/h  | 10 km/h |
 
     Scenario: Bike - Maxspeed should not allow routing on unroutable ways
         Then routability should be

features/bicycle/safety.feature

@@ -33,7 +33,7 @@ Feature: Bicycle - Adds penalties to unsafe roads
             | tertiary_link  | track       | 15 km/h | 15 km/h |       4.2 |        4.2 |
             | residential    | track       | 15 km/h | 15 km/h |       4.2 |        4.2 |
             | cycleway       | track       | 15 km/h | 15 km/h |       4.2 |        4.2 |
-            | footway        | track       | 15 km/h | 15 km/h |       4.2 |        4.2 |
+            | footway        | track       | 14 km/h | 14 km/h |       4.2 |        4.2 |
             | motorway       | lane        | 15 km/h |         |       4.2 |            |
             | primary        | lane        | 15 km/h | 15 km/h |       4.2 |        4.2 |
             | secondary      | lane        | 15 km/h | 15 km/h |       4.2 |        4.2 |
@@ -41,7 +41,7 @@ Feature: Bicycle - Adds penalties to unsafe roads
             | primary_link   | lane        | 15 km/h | 15 km/h |       4.2 |        4.2 |
             | secondary_link | lane        | 15 km/h | 15 km/h |       4.2 |        4.2 |
             | tertiary_link  | lane        | 15 km/h | 15 km/h |       4.2 |        4.2 |
-            | residential    | lane        | 15 km/h | 15 km/h |       4.2 |        4.2 |
+            | residential    | lane        | 14 km/h | 14 km/h |       4.2 |        4.2 |
             | cycleway       | lane        | 15 km/h | 15 km/h |       4.2 |        4.2 |
             | footway        | lane        | 15 km/h | 15 km/h |       4.2 |        4.2 |
             | motorway       | shared_lane | 15 km/h |         |       4.2 |            |
@@ -59,7 +59,7 @@ Feature: Bicycle - Adds penalties to unsafe roads
             | tertiary_link  | track          |               | 15 km/h     | 15 km/h     |       4.2 |        3.3 |
             | residential    | track          |               | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
             | cycleway       | track          |               | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
-            | footway        | track          |               | 15 km/h     | 4 km/h +-1  |       4.2 |        1.1 |
+            | footway        | track          |               | 14 km/h     | 4 km/h +-1  |       4.2 |        1.1 |
             | motorway       |                | track         | 15 km/h     |             |       4.2 |            |
             | primary        |                | track         | 15 km/h     | 15 km/h     |       2.1 |        4.2 |
             | secondary      |                | track         | 15 km/h     | 15 km/h     |       2.7 |        4.2 |
@@ -67,7 +67,7 @@ Feature: Bicycle - Adds penalties to unsafe roads
             | primary_link   |                | track         | 15 km/h     | 15 km/h     |       2.1 |        4.2 |
             | secondary_link |                | track         | 15 km/h     | 15 km/h     |       2.7 |        4.2 |
             | tertiary_link  |                | track         | 15 km/h     | 15 km/h     |       3.3 |        4.2 |
-            | residential    |                | track         | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
+            | residential    |                | track         | 14 km/h     | 14 km/h     |       4.2 |        4.2 |
             | cycleway       |                | track         | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
             | footway        |                | track         | 4 km/h +-1  | 15 km/h     |       1.1 |        4.2 |
             | motorway       | lane           |               | 15 km/h     |             |       4.2 |            |
@@ -75,7 +75,7 @@ Feature: Bicycle - Adds penalties to unsafe roads
             | secondary      | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        2.7 |
             | tertiary       | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        3.3 |
             | primary_link   | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        2.1 |
-            | secondary_link | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        2.7 |
+            | secondary_link | lane           |               | 14 km/h     | 14 km/h     |       4.2 |        2.7 |
             | tertiary_link  | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        3.3 |
             | residential    | lane           |               | 15 km/h +-1 | 15 km/h +-1 |       4.2 |        4.2 |
             | cycleway       | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
@@ -84,7 +84,7 @@ Feature: Bicycle - Adds penalties to unsafe roads
             | primary        |                | lane          | 15 km/h     | 15 km/h     |       2.1 |        4.2 |
             | secondary      |                | lane          | 15 km/h +-1 | 15 km/h +-1 |       2.7 |        4.2 |
             | tertiary       |                | lane          | 15 km/h     | 15 km/h     |       3.3 |        4.2 |
-            | primary_link   |                | lane          | 15 km/h     | 15 km/h     |       2.1 |        4.2 |
+            | primary_link   |                | lane          | 14 km/h     | 14 km/h     |       2.1 |        4.2 |
             | secondary_link |                | lane          | 15 km/h     | 15 km/h     |       2.7 |        4.2 |
             | tertiary_link  |                | lane          | 15 km/h     | 15 km/h     |       3.3 |        4.2 |
             | residential    |                | lane          | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
@@ -92,7 +92,7 @@ Feature: Bicycle - Adds penalties to unsafe roads
             | footway        |                | lane          | 4 km/h +-1  | 15 km/h     |       1.1 |        4.2 |
             | motorway       | shared_lane    |               | 15 km/h     |             |       4.2 |            |
             | primary        | shared_lane    |               | 15 km/h     | 15 km/h     |       4.2 |        2.1 |
-            | motorway       |                | shared_lane   | 15 km/h     |             |       4.2 |            |
+            | motorway       |                | shared_lane   | 14 km/h     |             |       4.2 |            |
             | primary        |                | shared_lane   | 15 km/h     | 15 km/h     |       2.1 |        4.2 |
 
 

features/bicycle/surface.feature

@@ -8,29 +8,29 @@ Feature: Bike - Surfaces
         Then routability should be
             | highway  | surface               | bothw   |
             | cycleway |                       | 48 s    |
-            | cycleway | asphalt               | 48 s    |
+            | cycleway | asphalt               | 47.9 s  |
             | cycleway | cobblestone:flattened | 72 s    |
             | cycleway | paving_stones         | 72 s    |
             | cycleway | compacted             | 72 s    |
             | cycleway | cobblestone           | 120 s   |
             | cycleway | fine_gravel           | 120 s   |
             | cycleway | gravel                | 120 s   |
-            | cycleway | pebblestone           | 120.1 s |
+            | cycleway | pebblestone           | 120 s   |
             | cycleway | dirt                  | 120 s   |
             | cycleway | earth                 | 120 s   |
             | cycleway | grass                 | 120 s   |
             | cycleway | mud                   | 240 s   |
-            | cycleway | sand                  | 240.1 s |
+            | cycleway | sand                  | 240 s   |
             | cycleway | sett                  | 72 s    |
 
     Scenario: Bicycle - Good surfaces on small paths
         Then routability should be
-        | highway  | surface | bothw |
+        | highway  | surface | bothw  |
-        | cycleway |         | 48 s  |
+        | cycleway |         | 48 s   |
-        | path     |         | 60 s  |
+        | path     |         | 59.9 s |
-        | track    |         | 60 s  |
+        | track    |         | 60 s   |
-        | track    | asphalt | 60 s  |
+        | track    | asphalt | 60 s   |
-        | path     | asphalt | 60 s  |
+        | path     | asphalt | 60 s   |
 
     Scenario: Bicycle - Surfaces should not make unknown ways routable
         Then routability should be

features/bicycle/turn_penalty.feature

@@ -37,6 +37,6 @@ Feature: Turn Penalties
             | from | to | distance  | weight | #                                         |
             | a    | c  | 900m +- 1 | 216    | Going straight has no penalties           |
             | a    | d  | 900m +- 1 | 220.2  | Turning right had penalties               |
-            | e    | g  | 2100m +- 4| 503.9  | Going straght has no penalties            |
+            | e    | g  | 2100m +- 5| 503.9  | Going straght has no penalties            |
-            | e    | h  | 2100m +- 4| 515.1  | Turn sharp right has even higher penalties|
+            | e    | h  | 2100m +- 5| 515.1  | Turn sharp right has even higher penalties|
 

features/car/access.feature

@@ -185,7 +185,7 @@ Feature: Car - Restricted access
         Then routability should be
             | highway | hov        | bothw | forw_rate  | backw_rate  |
             | primary | designated | x     | 18.2       | 18.2        |
-            | primary | yes        | x     | 18.2       | 18.2        |
+            | primary | yes        | x     | 18.3       | 18.3        |
             | primary | no         | x     | 18.2       | 18.2        |
 
     # Models:
@@ -196,7 +196,7 @@ Feature: Car - Restricted access
         Then routability should be
             | highway  | hov         | hov:lanes                          | lanes | access     | oneway | forw | backw | forw_rate  |
             | motorway | designated  | designated\|designated\|designated | 3     | hov        | yes    | x    |       | 25         |
-            | motorway | lane        |                                    | 3     | designated | yes    | x    |       | 25         |
+            | motorway | lane        |                                    | 3     | designated | yes    | x    |       | 25.3       |
 
     @hov
     Scenario: Car - a way with all lanes HOV-designated is highly penalized by default (similar to hov=designated)
@@ -206,7 +206,7 @@ Feature: Car - Restricted access
             # This test is flaky because non-deterministic turn generation sometimes emits a NoTurn here that is marked as restricted. #3769
             #| primary |                        | designated             |                        |        | x    | x     | 18.2      | 18.2       |
             #| primary | designated             |                        |                        |        | x    | x     | 18.2      | 18.2       |
-            | primary | designated\|designated | designated\|designated |                        |        | x    | x     | 18.2      | 18.2       |
+            | primary | designated\|designated | designated\|designated |                        |        | x    | x     | 18.3      | 18.3       |
             | primary | designated\|no         | designated\|no         |                        |        | x    | x     | 18.2      | 18.2       |
             | primary | yes\|no                | yes\|no                |                        |        | x    | x     | 18.2      | 18.2       |
             | primary |                        |                        |                        |        | x    | x     | 18.2      | 18.2       |

features/car/ferry.feature

@@ -46,10 +46,10 @@ Feature: Car - Handle ferry routes
 
         When I route I should get
             | from | to | route           | modes                         | speed   | time    |
-            | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving | 12 km/h | 173.4s  |
+            | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving | 12 km/h | 173.5s  |
-            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 9 km/h  | 162.4s  |
+            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 9 km/h  | 162.5s  |
-            | c    | e  | cde,cde         | ferry,ferry                   | 5 km/h  | 151.4s  |
+            | c    | e  | cde,cde         | ferry,ferry                   | 5 km/h  | 151.5s  |
-            | e    | c  | cde,cde         | ferry,ferry                   | 5 km/h  | 151.4s  |
+            | e    | c  | cde,cde         | ferry,ferry                   | 5 km/h  | 151.5s  |
 
     Scenario: Car - Properly handle simple durations
         Given the node map
@@ -117,4 +117,4 @@ Feature: Car - Handle ferry routes
         # Note that matching *should* work across unsnappable ferries
         When I match I should get
           | trace | geometry             | duration |
-          | abcdef| 1,1,1.000899,1,1.000899,1,1.002697,1,1.002697,1,1.003596,1,1.003596,1,1.005394,1,1.005394,1,1.006293,1 | 610.9      |
+          | abcdef| 1,1,1.000898,1,1.000898,1,1.002695,1,1.002695,1,1.003594,1,1.003594,1,1.005391,1,1.005391,1,1.006289,1 | 611      |

features/car/maxspeed.feature

@@ -86,57 +86,57 @@ OSRM will use 4/5 of the projected free-flow speed.
         Then routability should be
 
             | highway | maxspeed | width | maxspeed:forward | maxspeed:backward | forw    | backw   | forw_rate | backw_rate |
-            | primary |          |       |                  |                   | 64 km/h | 64 km/h | 18        | 18         |
+            | primary |          |       |                  |                   | 64 km/h | 64 km/h | 18.1      | 18.1       |
             | primary |          |   3   |                  |                   | 64 km/h | 64 km/h | 9         | 9          |
-            | primary | 60       |       |                  |                   | 47 km/h | 47 km/h | 13.3      | 13.3       |
+            | primary | 60       |       |                  |                   | 48 km/h | 48 km/h | 13.3      | 13.3       |
-            | primary | 60       |   3   |                  |                   | 47 km/h | 47 km/h | 6.7       | 6.7        |
+            | primary | 60       |   3   |                  |                   | 48 km/h | 48 km/h | 6.7       | 6.7        |
-            | primary |          |       | 60               |                   | 47 km/h | 64 km/h | 13.3      | 18         |
+            | primary |          |       | 60               |                   | 48 km/h | 64 km/h | 13.3      | 18.1       |
-            | primary |          |   3   | 60               |                   | 47 km/h | 64 km/h | 6.7       | 9          |
+            | primary |          |   3   | 60               |                   | 48 km/h | 64 km/h | 6.7       | 9          |
-            | primary |          |       |                  | 60                | 64 km/h | 47 km/h | 18        | 13.3       |
+            | primary |          |       |                  | 60                | 64 km/h | 48 km/h | 18.1      | 13.3       |
-            | primary |          |   3   |                  | 60                | 64 km/h | 47 km/h | 9         | 6.7        |
+            | primary |          |   3   |                  | 60                | 64 km/h | 48 km/h | 9         | 6.7        |
-            | primary | 15       |       | 60               |                   | 47 km/h | 11 km/h | 13.3      | 3.3        |
+            | primary | 15       |       | 60               |                   | 48 km/h | 12 km/h | 13.3      | 3.3        |
             | primary | 15       |   3   | 60               |                   | 48 km/h | 12 km/h | 6.7       | 1.7        |
-            | primary | 15       |       |                  | 60                | 12 km/h | 47 km/h | 3.3       | 13.3       |
+            | primary | 15       |       |                  | 60                | 12 km/h | 48 km/h | 3.3       | 13.3       |
-            | primary | 15       |   3   |                  | 60                | 12 km/h | 47 km/h | 1.7       | 6.7        |
+            | primary | 15       |   3   |                  | 60                | 12 km/h | 48 km/h | 1.7       | 6.7        |
-            | primary | 15       |       | 30               | 60                | 23 km/h | 47 km/h | 6.7       | 13.3       |
+            | primary | 15       |       | 30               | 60                | 24 km/h | 48 km/h | 6.7       | 13.3       |
-            | primary | 15       |   3   | 30               | 60                | 23 km/h | 47 km/h | 3.3       | 6.7        |
+            | primary | 15       |   3   | 30               | 60                | 24 km/h | 48 km/h | 3.3       | 6.7        |
 
     Scenario: Car - Single lane streets be ignored or incur a penalty
         Then routability should be
 
             | highway | maxspeed | lanes | maxspeed:forward | maxspeed:backward | forw    | backw   | forw_rate | backw_rate |
-            | primary |          |       |                  |                   | 64 km/h | 64 km/h | 18        | 18         |
+            | primary |          |       |                  |                   | 64 km/h | 64 km/h | 18.1      | 18.1       |
             | primary |          |   1   |                  |                   | 64 km/h | 64 km/h | 9         | 9          |
-            | primary | 60       |       |                  |                   | 47 km/h | 47 km/h | 13.3      | 13.3       |
+            | primary | 60       |       |                  |                   | 48 km/h | 48 km/h | 13.3      | 13.3       |
-            | primary | 60       |   1   |                  |                   | 47 km/h | 47 km/h | 6.7       | 6.7        |
+            | primary | 60       |   1   |                  |                   | 48 km/h | 48 km/h | 6.7       | 6.7        |
-            | primary |          |       | 60               |                   | 47 km/h | 64 km/h | 13.3      | 18         |
+            | primary |          |       | 60               |                   | 48 km/h | 64 km/h | 13.3      | 18.1       |
-            | primary |          |   1   | 60               |                   | 47 km/h | 64 km/h | 6.7       | 9          |
+            | primary |          |   1   | 60               |                   | 48 km/h | 64 km/h | 6.7       | 9          |
-            | primary |          |       |                  | 60                | 64 km/h | 47 km/h | 18        | 13.3       |
+            | primary |          |       |                  | 60                | 64 km/h | 48 km/h | 18.1      | 13.3       |
-            | primary |          |   1   |                  | 60                | 64 km/h | 47 km/h | 9         | 6.7        |
+            | primary |          |   1   |                  | 60                | 64 km/h | 48 km/h | 9         | 6.7        |
-            | primary | 15       |       | 60               |                   | 47 km/h | 11 km/h | 13.3      | 3.3        |
+            | primary | 15       |       | 60               |                   | 48 km/h | 12 km/h | 13.3      | 3.3        |
             | primary | 15       |   1   | 60               |                   | 48 km/h | 12 km/h | 6.7       | 1.7        |
-            | primary | 15       |       |                  | 60                | 12 km/h | 47 km/h | 3.3       | 13.3       |
+            | primary | 15       |       |                  | 60                | 12 km/h | 48 km/h | 3.3       | 13.3       |
-            | primary | 15       |   1   |                  | 60                | 12 km/h | 47 km/h | 1.7       | 6.7        |
+            | primary | 15       |   1   |                  | 60                | 12 km/h | 48 km/h | 1.7       | 6.7        |
-            | primary | 15       |       | 30               | 60                | 23 km/h | 47 km/h | 6.7       | 13.3       |
+            | primary | 15       |       | 30               | 60                | 24 km/h | 48 km/h | 6.7       | 13.3       |
-            | primary | 15       |   1   | 30               | 60                | 23 km/h | 47 km/h | 3.3       | 6.7        |
+            | primary | 15       |   1   | 30               | 60                | 24 km/h | 48 km/h | 3.3       | 6.7        |
 
     Scenario: Car - Single lane streets only incur a penalty for two-way streets
         Then routability should be
             | highway | maxspeed | lanes  | oneway | forw    | backw   | forw_rate | backw_rate |
-            | primary |   30     |   1    | yes    | 23 km/h |         | 6.7       |            |
+            | primary |   30     |   1    | yes    | 24 km/h |         | 6.7       |            |
-            | primary |   30     |   1    | -1     |         | 23 km/h |           | 6.7        |
+            | primary |   30     |   1    | -1     |         | 24 km/h |           | 6.7        |
-            | primary |   30     |   1    |        | 23 km/h | 23 km/h | 3.3       | 3.3        |
+            | primary |   30     |   1    |        | 24 km/h | 24 km/h | 3.3       | 3.3        |
-            | primary |   30     |   2    |        | 23 km/h | 23 km/h | 6.7       | 6.7        |
+            | primary |   30     |   2    |        | 24 km/h | 24 km/h | 6.7       | 6.7        |
 
     Scenario: Car - Forward/backward maxspeed on reverse oneways
         Then routability should be
             | highway | maxspeed | maxspeed:forward | maxspeed:backward | oneway | forw    | backw   | forw_rate | backw_rate |
-            | primary |          |                  |                   | -1     |         | 64 km/h |           | 18         |
+            | primary |          |                  |                   | -1     |         | 64 km/h |           | 18.1       |
-            | primary | 30       |                  |                   | -1     |         | 23 km/h |           | 6.7        |
+            | primary | 30       |                  |                   | -1     |         | 24 km/h |           | 6.7        |
-            | primary |          | 30               |                   | -1     |         | 64 km/h |           | 18         |
+            | primary |          | 30               |                   | -1     |         | 64 km/h |           | 18.1       |
-            | primary |          |                  | 30                | -1     |         | 23 km/h |           | 6.7        |
+            | primary |          |                  | 30                | -1     |         | 24 km/h |           | 6.7        |
-            | primary | 20       | 30               |                   | -1     |         | 15 km/h |           | 4.4        |
+            | primary | 20       | 30               |                   | -1     |         | 16 km/h |           | 4.4        |
-            | primary | 20       |                  | 30                | -1     |         | 23 km/h |           | 6.7        |
+            | primary | 20       |                  | 30                | -1     |         | 24 km/h |           | 6.7        |
 
 
     Scenario: Car - Respect source:maxspeed

features/car/speed.feature

@@ -9,29 +9,29 @@ Feature: Car - speeds
     Scenario: Car - speed of various way types
         Then routability should be
             | highway        | oneway | bothw   |
-            | motorway       | no     | 89 km/h |
+            | motorway       | no     | 90 km/h |
-            | motorway_link  | no     | 44 km/h |
+            | motorway_link  | no     | 45 km/h |
-            | trunk          | no     | 85 km/h |
+            | trunk          | no     | 84 km/h |
-            | trunk_link     | no     | 39 km/h |
+            | trunk_link     | no     | 40 km/h |
             | primary        | no     | 64 km/h |
-            | primary_link   | no     | 29 km/h |
+            | primary_link   | no     | 30 km/h |
-            | secondary      | no     | 55 km/h |
+            | secondary      | no     | 54 km/h |
-            | secondary_link | no     | 24 km/h |
+            | secondary_link | no     | 25 km/h |
-            | tertiary       | no     | 39 km/h |
+            | tertiary       | no     | 40 km/h |
             | tertiary_link  | no     | 20 km/h |
-            | unclassified   | no     | 24 km/h |
+            | unclassified   | no     | 25 km/h |
-            | residential    | no     | 24 km/h |
+            | residential    | no     | 25 km/h |
-            | living_street  | no     | 9 km/h  |
+            | living_street  | no     | 10 km/h  |
             | service        | no     | 15 km/h |
 
     # Alternating oneways scale rates but not speeds
     Scenario: Car - scaled speeds for oneway=alternating
         Then routability should be
             | highway        | oneway      | junction   | forw    | backw   | #              |
-            | tertiary       |             |            | 39 km/h | 39 km/h |                |
+            | tertiary       |             |            | 40 km/h | 40 km/h |                |
-            | tertiary       | alternating |            | 39 km/h | 39 km/h |                |
+            | tertiary       | alternating |            | 40 km/h | 40 km/h |                |
-            | motorway       |             |            | 89 km/h |         | implied oneway |
+            | motorway       |             |            | 90 km/h |         | implied oneway |
-            | motorway       | alternating |            | 89 km/h |         | implied oneway |
+            | motorway       | alternating |            | 90 km/h |         | implied oneway |
             | motorway       | reversible  |            |         |         | unroutable     |
             | primary        |             | roundabout | 64 km/h |         | implied oneway |
             | primary        | alternating | roundabout | 64 km/h |         | implied oneway |
@@ -42,12 +42,12 @@ Feature: Car - speeds
 
             | highway | maxspeed | forw    | backw    |
             | primary |          | 64 km/h | 64 km/h  |
-            | primary | 60       | 47 km/h | 47 km/h  |
+            | primary | 60       | 48 km/h | 48 km/h  |
-            | primary | 60       | 47 km/h | 47 km/h  |
+            | primary | 60       | 48 km/h | 48 km/h  |
-            | primary | 60       | 47 km/h | 47 km/h  |
+            | primary | 60       | 48 km/h | 48 km/h  |
 
     Scenario: Car - Side road penalties
         Then routability should be
 
             | highway | side_road | forw    | backw    | forw_rate | backw_rate |
-            | primary | yes       | 64 km/h | 64 km/h  | 14.4      | 14.4       |
+            | primary | yes       | 64 km/h | 64 km/h  | 14.5      | 14.5       |

features/car/startpoint.feature

@@ -53,8 +53,8 @@ Feature: Car - Allowed start/end modes
 
         When I request a travel time matrix I should get
             |   | 2    | c    |
-            | 1 | 59.1 | 35.1 |
+            | 1 | 59.1 | 35.2 |
-            | b | 35.1 | 11.1 |
+            | b | 35   | 11.1 |
 
         When I route I should get
             | from | to | route    |
@@ -121,5 +121,5 @@ Feature: Car - Allowed start/end modes
 
         When I request a travel time matrix I should get
             |   | 2    | c    |
-            | 1 | 59.1 | 35.1 |
+            | 1 | 59.1 | 35.2 |
-            | b | 35.1 | 11.1 |
+            | b | 35   | 11.1 |

features/car/surface.feature

@@ -65,7 +65,7 @@ Feature: Car - Surfaces
         Then routability should be
             | highway  | oneway | surface         | forw        | backw       |
             | motorway | no     |                 | 90 km/h     | 90 km/h     |
-            | motorway | no     | asphalt         | 90 km/h     | 90 km/h +-1 |
+            | motorway | no     | asphalt         | 91 km/h     | 90 km/h +-1 |
             | motorway | no     | concrete        | 90 km/h +-1 | 90 km/h +-1 |
             | motorway | no     | concrete:plates | 90 km/h +-1 | 90 km/h +-1 |
             | motorway | no     | concrete:lanes  | 90 km/h +-1 | 90 km/h +-1 |

features/car/traffic_light_penalties.feature

@@ -59,7 +59,7 @@ Feature: Car - Handle traffic lights
 
         When I route I should get
             | from | to | route   | geometry       |
-            | a    | c  | abc,abc | _ibE_ibE?gJ?gJ |
+            | a    | c  | abc,abc | _ibE_ibE?gJ?eJ |
 
     @traffic
     Scenario: Traffic update on the edge with a traffic signal
@@ -89,5 +89,5 @@ Feature: Car - Handle traffic lights
 
         When I route I should get
           | from | to | route   | speed   | weights | time  | distances | a:datasources | a:nodes | a:speed | a:duration |  a:weight |
-          | a    | c  | abc,abc | 59 km/h | 24.2,0  | 24.2s | 399.9m,0m |           1:0 |  1:2:3  |   18:18 |  11.1:11.1 | 11.1:11.1 |
+          | a    | c  | abc,abc | 60 km/h | 24.2,0  | 24.2s | 400m,0m   |           1:0 |  1:2:3  |   18:18 |  11.1:11.1 | 11.1:11.1 |
-          | c    | a  | abc,abc | 59 km/h | 24.2,0  | 24.2s | 399.9m,0m |           0:1 |  3:2:1  |   18:18 |  11.1:11.1 | 11.1:11.1 |
+          | c    | a  | abc,abc | 60 km/h | 24.2,0  | 24.2s | 400m,0m   |           0:1 |  3:2:1  |   18:18 |  11.1:11.1 | 11.1:11.1 |

features/car/weight.feature

@@ -83,4 +83,4 @@ Feature: Car - weights
             | waypoints | bearings | route     | distance | weights   | times          |
             | a,b       | 90 90    | abc,abc   | 200m     | 200,0     | 11.1s,0s       |
             | b,c       | 90 90    | abc,abc   | 200m     | 200,0     | 11.1s,0s       |
-            | a,d       | 90 180   | abc,bd,bd | 399.9m   | 200,200,0 | 13.2s,11.1s,0s |
+            | a,d       | 90 180   | abc,bd,bd | 400m     | 200,200,0 | 13.2s,11.1s,0s |

features/foot/names.feature

@@ -20,3 +20,20 @@ Feature: Foot - Street names in instructions
         When I route I should get
             | from | to | route    | ref    |
             | a    | c  | My Way,, | ,A7,A7 |
+
+
+    Scenario: Foot - Combines named roads with suffix changes
+        Given the node map
+            """
+            a b c d
+            """
+
+        And the ways
+            | nodes | name           |
+            | ab    | High Street W  |
+            | bc    | High Street E  |
+            | cd    | Market Street  |
+
+        When I route I should get
+            | from | to | route                                     |
+            | a    | d  | High Street W,Market Street,Market Street |

features/foot/restrictions.feature

@@ -29,7 +29,7 @@ Feature: Foot - Turn restrictions
         When I route I should get
             | from | to | route    |
             | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
+            | s    | n  | sj,nj    |
             | s    | e  | sj,ej,ej |
 
     @only_turning
@@ -55,7 +55,7 @@ Feature: Foot - Turn restrictions
         When I route I should get
             | from | to | route    |
             | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
+            | s    | n  | sj,nj    |
             | s    | e  | sj,ej,ej |
 
     @except

features/guidance/anticipate-lanes.feature

@@ -103,7 +103,7 @@ Feature: Turn Lane Guidance
 
        When I route I should get
             | waypoints | route          | turns                                           | lanes                                                                 |
-            | a,d       | On,Hwy,Off,Off | depart,merge slight right,off ramp right,arrive | ,slight left:false slight left:true,straight:false slight right:true, |
+            | a,d       | On,Hwy,Off,Off | depart,merge slight right,off ramp right,arrive | ,slight left:true slight left:true,straight:false slight right:true,  |
 
 
     @anticipate
@@ -364,8 +364,8 @@ Feature: Turn Lane Guidance
 
           When I route I should get
                | waypoints | route            | turns                           | lanes                                                                                                                                                         |
-               | a,d       | main,left,left   | depart,end of road left,arrive  | ;left:false straight:false straight:true straight:false straight:false right:false;left:false straight:true straight:false right:false,left:true right:false, |
+               | a,d       | main,left,left   | depart,end of road left,arrive  | ;left:false straight:true straight:true straight:true straight:true right:false;left:false straight:true straight:true right:false,left:true right:false,     |
-               | a,e       | main,right,right | depart,end of road right,arrive | ;left:false straight:false straight:false straight:true straight:false right:false;left:false straight:false straight:true right:false,left:false right:true, |
+               | a,e       | main,right,right | depart,end of road right,arrive | ;left:false straight:true straight:true straight:true straight:true right:false;left:false straight:true straight:true right:false,left:false right:true,     |
 
        @anticipate
        Scenario: Anticipate Lanes for through with turn before / after
@@ -390,15 +390,15 @@ Feature: Turn Lane Guidance
                | il    |                                                              | il    |        |
 
           When I route I should get
-               | waypoints | route          | turns                                      | lanes                                                                                                                                                                                               | #           |
+               | waypoints | route          | turns                                      | lanes                                                                                                                                                                                             | #           |
-               | a,f       | ab,bdehi,ef,ef | depart,turn right,turn right,arrive        | ,right:false right:false right:true right:true,left:false left:false straight:false straight:false straight:false straight:false right:true right:true,                                             |             |
+               | a,f       | ab,bdehi,ef,ef | depart,turn right,turn right,arrive        | ,right:true right:true right:true right:true,left:false left:false straight:false straight:false straight:false straight:false right:true right:true,                                             |             |
-               | a,g       | ab,bdehi,eg,eg | depart,turn right,turn left,arrive         | ,right:true right:true right:false right:false,left:true left:true straight:false straight:false straight:false straight:false right:false right:false,                                             |             |
+               | a,g       | ab,bdehi,eg,eg | depart,turn right,turn left,arrive         | ,right:true right:true right:true right:true,left:true left:true straight:false straight:false straight:false straight:false right:false right:false,                                             |             |
-               | a,j       | ab,bdehi,ij,ij | depart,turn right,end of road right,arrive | ,right:true right:true right:false right:false;left:false left:false straight:false straight:false straight:true straight:true right:false right:false,left:false left:false right:true right:true, |             |
+               | a,j       | ab,bdehi,ij,ij | depart,turn right,end of road right,arrive | ,right:true right:true right:true right:true;left:false left:false straight:false straight:false straight:true straight:true right:false right:false,left:false left:false right:true right:true, |             |
-               | a,l       | ab,bdehi,il,il | depart,turn right,end of road left,arrive  | ,right:false right:false right:true right:true;left:false left:false straight:true straight:true straight:false straight:false right:false right:false,left:true left:true right:false right:false, | not perfect |
+               | a,l       | ab,bdehi,il,il | depart,turn right,end of road left,arrive  | ,right:true right:true right:true right:true;left:false left:false straight:true straight:true straight:false straight:false right:false right:false,left:true left:true right:false right:false, | not perfect |
-               | c,g       | cb,bdehi,eg,eg | depart,turn left,turn left,arrive          | ,left:true left:true left:false left:false,left:true left:true straight:false straight:false straight:false straight:false right:false right:false,                                                 |             |
+               | c,g       | cb,bdehi,eg,eg | depart,turn left,turn left,arrive          | ,left:true left:true left:true left:true,left:true left:true straight:false straight:false straight:false straight:false right:false right:false,                                                 |             |
-               | c,f       | cb,bdehi,ef,ef | depart,turn left,turn right,arrive         | ,left:false left:false left:true left:true,left:false left:false straight:false straight:false straight:false straight:false right:true right:true,                                                 |             |
+               | c,f       | cb,bdehi,ef,ef | depart,turn left,turn right,arrive         | ,left:true left:true left:true left:true,left:false left:false straight:false straight:false straight:false straight:false right:true right:true,                                                 |             |
-               | c,l       | cb,bdehi,il,il | depart,turn left,end of road left,arrive   | ,left:false left:false left:true left:true;left:false left:false straight:true straight:true straight:false straight:false right:false right:false,left:true left:true right:false right:false,     |             |
+               | c,l       | cb,bdehi,il,il | depart,turn left,end of road left,arrive   | ,left:true left:true left:true left:true;left:false left:false straight:true straight:true straight:false straight:false right:false right:false,left:true left:true right:false right:false,     |             |
-               | c,j       | cb,bdehi,ij,ij | depart,turn left,end of road right,arrive  | ,left:true left:true left:false left:false;left:false left:false straight:false straight:false straight:true straight:true right:false right:false,left:false left:false right:true right:true,     | not perfect |
+               | c,j       | cb,bdehi,ij,ij | depart,turn left,end of road right,arrive  | ,left:true left:true left:true left:true;left:false left:false straight:false straight:false straight:true straight:true right:false right:false,left:false left:false right:true right:true,     | not perfect |
 
        @anticipate
        Scenario: Anticipate Lanes for turns with through before and after
@@ -811,9 +811,9 @@ Feature: Turn Lane Guidance
             | hj    | 7th  |                    | no     |
 
         When I route I should get
-            | waypoints | route        | turns                    | locations | lanes                                                                                                                                                                                                                                                                                        |
+            | waypoints | route        | turns                    | locations | lanes                                                                                                                                                                                                                                                                                      |
-            | a,i       | road,road    | depart,arrive            | a,i       | ;left:false none:true none:true none:true;left:false none:true none:true none:true;left:false none:true none:true none:true;left:false none:true none:true none:true;left:false none:true none:true none:true;left:false none:true none:true none:false;none:true none:true right:false,     |
+            | a,i       | road,road    | depart,arrive            | a,i       | ;left:false none:true none:true none:true;left:false none:true none:true none:true;left:false none:true none:true none:true;left:false none:true none:true none:true;left:false none:true none:true none:true;left:false none:true none:true none:true;none:true none:true right:false,    |
-            | a,j       | road,7th,7th | depart,turn right,arrive | a,h,j     | ;left:false none:true none:true none:true;left:false none:true none:true none:true;left:false none:true none:true none:true;left:false none:true none:true none:true;left:false none:false none:false none:true;left:false none:false none:false none:true,none:false none:false right:true, |
+            | a,j       | road,7th,7th | depart,turn right,arrive | a,h,j     | ;left:false none:true none:true none:true;left:false none:true none:true none:true;left:false none:true none:true none:true;left:false none:true none:true none:true;left:false none:true none:true none:true;left:false none:false none:false none:true,none:false none:false right:true, |
 
     @anticipate
     Scenario: Oak St, Franklin St

features/guidance/dedicated-turn-roads.feature

@@ -687,7 +687,7 @@ Feature: Slipways and Dedicated Turn Lanes
 
        When I route I should get
             | waypoints | route             | turns                                      | locations |
-            | s,f       | sabc,ae,dbef,dbef | depart,fork slight right,turn right,arrive | s,a,e,f   |
+            | s,f       | sabc,ae,dbef,dbef | depart,turn straight,turn right,arrive     | s,a,e,f   |
 
     @sliproads
     Scenario: Traffic Signal on Sliproad

features/guidance/merge-segregated-roads.feature

@@ -64,7 +64,7 @@ Feature: Merge Segregated Roads
 
         When I route I should get
             | waypoints | route               | intersections                                                                                      |
-            | a,f       | road,road,road,road | true:90,false:45 true:135 false:270;true:45 true:180 false:315;true:90 false:225 true:315;true:270 |
+            | a,f       | road,road,road      | true:90,false:45 true:135 false:270;true:45 true:180 false:315,true:90 false:225 true:315;true:270 |
 
     #https://www.openstreetmap.org/#map=19/52.50003/13.33915
     @negative
@@ -193,7 +193,7 @@ Feature: Merge Segregated Roads
 
         When I route I should get
             | waypoints | route     | intersections                                                           |
-            | a,g       | road,road | true:90,false:90 true:150 false:270,true:90 false:270 true:345;true:270 |
+            | a,g       | road,road | true:90,false:90 true:165 false:270,true:90 false:270 true:345;true:270 |
 
     Scenario: Merging parallel roads with intermediate bridges
     # https://www.mapillary.com/app/?lat=52.466483333333336&lng=13.431908333333332&z=17&focus=photo&pKey=LWXnKqoGqUNLnG0lofiO0Q

features/guidance/obvious-turn-discovery.feature

@@ -277,7 +277,7 @@ Feature: Simple Turns
     When I route I should get
         | from | to | route       | turns                        |
         | a    | c  | menz,rem    | depart,arrive                |
-        | d    | c  | rem,rem,rem | depart,continue left,arrive  |
+        | d    | c  | rem,rem     | depart,arrive                |
         | c    | d  | rem,rem,rem | depart,continue right,arrive |
         | c    | a  | rem,menz    | depart,arrive                |
 

features/guidance/ramp.feature

@@ -160,8 +160,8 @@ Feature: Ramp Guidance
 
        When I route I should get
             | waypoints | route    | turns                          |
-            | a,d       | ab,bd,bd | depart,on ramp right,arrive |
+            | a,d       | ab,bd,bd | depart,on ramp right,arrive    |
-            | a,c       | ab,bc,bc | depart,turn left,arrive        |
+            | a,c       | ab,bc    | depart,arrive                  |
 
     Scenario: Fork Slight Ramp
         Given the node map
@@ -179,8 +179,8 @@ Feature: Ramp Guidance
 
        When I route I should get
             | waypoints | route    | turns                                 |
-            | a,d       | ab,bd,bd | depart,on ramp slight right,arrive |
+            | a,d       | ab,bd,bd | depart,on ramp slight right,arrive    |
-            | a,c       | ab,bc,bc | depart,turn slight left,arrive        |
+            | a,c       | ab,bc    | depart,arrive                         |
 
     Scenario: Fork Slight Ramp on Through Street
         Given the node map

features/guidance/roundabout.feature

@@ -791,10 +791,10 @@ Feature: Basic Roundabout
         # the turn angles here are quite strange, so we do get uturns for exiting
         When I route I should get
             | from | to | route       | turns                                                 | distance |
-            | e    | f  | ed,af,af,af | depart,roundabout-exit-1,exit roundabout left,arrive  | 80.1m    |
+            | e    | f  | ed,af,af,af | depart,roundabout-exit-1,exit roundabout left,arrive  | 80m      |
-            | f    | e  | af,ed,ed,ed | depart,roundabout-exit-1,exit roundabout uturn,arrive | 120.1m   |
+            | f    | e  | af,ed,ed,ed | depart,roundabout-exit-1,exit roundabout uturn,arrive | 120m     |
-            | k    | l  | kg,hl,hl,hl | depart,roundabout-exit-1,exit roundabout right,arrive | 80.1m    |
+            | k    | l  | kg,hl,hl,hl | depart,roundabout-exit-1,exit roundabout right,arrive | 80m      |
-            | l    | k  | hl,kg,kg,kg | depart,roundabout-exit-1,exit roundabout uturn,arrive | 120.1m   |
+            | l    | k  | hl,kg,kg,kg | depart,roundabout-exit-1,exit roundabout uturn,arrive | 120m     |
 
     @4030 @4075
     Scenario: Service roundabout with service exits
@@ -846,5 +846,5 @@ Feature: Basic Roundabout
 
         When I route I should get
             | from | to | route                      | turns                                                   | distance |
-            | e    | k  | ebds,ufghl,ufghl,jhik,jhik | depart,rstur-exit-2,exit rotary right,turn right,arrive | 189.1m   |
+            | e    | k  | ebds,ufghl,ufghl,jhik,jhik | depart,rstur-exit-2,exit rotary right,turn right,arrive | 189.2m   |
             | 1    | k  | ebds,ufghl,ufghl,jhik,jhik | depart,rstur-exit-2,exit rotary right,turn right,arrive | 159.1m   |

features/guidance/turn-lanes.feature

@@ -836,9 +836,9 @@ Feature: Turn Lane Guidance
             | cf    | secondary | bottom |                    |
 
         When I route I should get
-            | waypoints | turns                                       | route               | lanes                        |
+            | waypoints | turns                        | route          | lanes                        |
-            | a,d       | depart,continue right,continue right,arrive | road,road,road,road | ,straight:false right:true,, |
+            | a,d       | depart,continue uturn,arrive | road,road,road | ,straight:false right:true;, |
-            | d,a       | depart,continue left,continue left,arrive   | road,road,road,road | ,left:true straight:false,,  |
+            | d,a       | depart,continue uturn,arrive | road,road,road | ,left:true straight:false;,  |
 
     @simple
     Scenario: Merge Lanes Onto Freeway

features/lib/osrm_loader.js

@@ -45,11 +45,12 @@ class OSRMBaseLoader{
         var retryCount = 0;
         let retry = (err) => {
           if (err) {
-            if (retryCount < 10) {
+            if (retryCount < this.scope.OSRM_CONNECTION_RETRIES) {
+              const timeoutMs = 10 * Math.pow(this.scope.OSRM_CONNECTION_EXP_BACKOFF_COEF, retryCount);
               retryCount++;
-              setTimeout(() => { tryConnect(this.scope.OSRM_IP, this.scope.OSRM_PORT, retry); }, 10);
+              setTimeout(() => { tryConnect(this.scope.OSRM_IP, this.scope.OSRM_PORT, retry); }, timeoutMs);
             } else {
-              callback(new Error("Could not connect to osrm-routed after ten retries."));
+              callback(new Error(`Could not connect to osrm-routed after ${this.scope.OSRM_CONNECTION_RETRIES} retries.`));
             }
           }
           else

features/raster/extract.feature

@@ -20,6 +20,6 @@ Feature: osrm-extract with a profile containing raster source
         And the data has been saved to disk
         When I run "osrm-extract {osm_file} -p {profile_file}"
         Then stdout should contain "source loader"
-        Then stdout should contain "slope: 0.0899"
+        Then stdout should contain "slope: 0.0904"
-        Then stdout should contain "slope: -0.0899"
+        Then stdout should contain "slope: -0.0904"
         And it should exit successfully

features/step_definitions/routability.js

@@ -1,6 +1,6 @@
-var util = require('util');
+const util = require('util');
-var d3 = require('d3-queue');
+const d3 = require('d3-queue');
-var classes = require('../support/data_classes');
+const classes = require('../support/data_classes');
 
 module.exports = function () {
     this.Then(/^routability should be$/, (table, callback) => {
@@ -115,8 +115,11 @@ module.exports = function () {
         var result = {};
 
         var testDirection = (dir, callback) => {
-            var a = new classes.Location(this.origin[0] + (1+this.WAY_SPACING*i) * this.zoom, this.origin[1]),
+            const coordA = this.offsetOriginBy(1+this.WAY_SPACING*i, 0);
-                b = new classes.Location(this.origin[0] + (3+this.WAY_SPACING*i) * this.zoom, this.origin[1]),
+            const coordB = this.offsetOriginBy(3+this.WAY_SPACING*i, 0);
+
+            var a = new classes.Location(coordA[0], coordA[1]),
+                b = new classes.Location(coordB[0], coordB[1]),
                 r = {};
 
             r.which = dir;

features/support/cache.js

@@ -114,9 +114,12 @@ module.exports = function() {
         let dependencies = [
             this.OSRM_EXTRACT_PATH,
             this.OSRM_CONTRACT_PATH,
+            this.OSRM_CUSTOMIZE_PATH,
+            this.OSRM_PARTITION_PATH,
             this.LIB_OSRM_EXTRACT_PATH,
-            this.LIB_OSRM_GUIDANCE_PATH,
+            this.LIB_OSRM_CONTRACT_PATH,
-            this.LIB_OSRM_CONTRACT_PATH
+            this.LIB_OSRM_CUSTOMIZE_PATH,
+            this.LIB_OSRM_PARTITION_PATH
         ];
 
         var addLuaFiles = (directory, callback) => {

features/support/data.js

@@ -9,17 +9,27 @@ const classes = require('./data_classes');
 const tableDiff = require('../lib/table_diff');
 const ensureDecimal = require('../lib/utils').ensureDecimal;
 const errorReason = require('../lib/utils').errorReason;
+const CheapRuler = require('cheap-ruler');
 
 module.exports = function () {
     this.setGridSize = (meters) => {
+        this.gridSize = parseFloat(meters);
+
         // the constant is calculated (with BigDecimal as: 1.0/(DEG_TO_RAD*EARTH_RADIUS_IN_METERS
         // see ApproximateDistance() in ExtractorStructs.h
         // it's only accurate when measuring along the equator, or going exactly north-south
-        this.zoom = parseFloat(meters) * 0.8990679362704610899694577444566908445396483347536032203503E-5;
+        this.zoom = this.gridSize * 0.8990679362704610899694577444566908445396483347536032203503E-5;
     };
 
     this.setOrigin = (origin) => {
         this.origin = origin;
+        // we use C++ version of `cheap-ruler` inside OSRM in order to do distance calculations,
+        // so here we use it too to have a bit more precise assertions
+        this.ruler = new CheapRuler(this.origin[1], 'meters');
+    };
+
+    this.offsetOriginBy = (xCells, yCells) => {
+        return this.ruler.offset(this.origin, xCells * this.gridSize, yCells * this.gridSize);
     };
 
     this.buildWaysFromTable = (table, callback) => {
@@ -35,9 +45,10 @@ module.exports = function () {
             // add some nodes
 
             var makeFakeNode = (namePrefix, offset) => {
+                const coord = this.offsetOriginBy(offset + this.WAY_SPACING * ri, 0);
                 return new OSM.Node(this.makeOSMId(), this.OSM_USER, this.OSM_TIMESTAMP,
-                    this.OSM_UID, this.origin[0]+(offset + this.WAY_SPACING * ri) * this.zoom,
+                    this.OSM_UID, coord[0],
-                    this.origin[1], {name: util.format('%s%d', namePrefix, ri)});
+                    coord[1], {name: util.format('%s%d', namePrefix, ri)});
             };
 
             var nodes = ['a','b','c','d','e'].map((l, i) => makeFakeNode(l, i));
@@ -98,7 +109,7 @@ module.exports = function () {
     };
 
     this.tableCoordToLonLat = (ci, ri) => {
-        return [this.origin[0] + ci * this.zoom, this.origin[1] - ri * this.zoom].map(ensureDecimal);
+        return this.offsetOriginBy(ci, -ri).map(ensureDecimal);
     };
 
     this.addOSMNode = (name, lon, lat, id) => {

features/support/env.js

@@ -40,6 +40,9 @@ module.exports = function () {
 
         this.OSRM_PORT = process.env.OSRM_PORT && parseInt(process.env.OSRM_PORT) || 5000;
         this.OSRM_IP = process.env.OSRM_IP || '127.0.0.1';
+        this.OSRM_CONNECTION_RETRIES = process.env.OSRM_CONNECTION_RETRIES && parseInt(process.env.OSRM_CONNECTION_RETRIES) || 10;
+        this.OSRM_CONNECTION_EXP_BACKOFF_COEF = process.env.OSRM_CONNECTION_EXP_BACKOFF_COEF && parseFloat(process.env.OSRM_CONNECTION_EXP_BACKOFF_COEF) || 1.0;
+        
         this.HOST = `http://${this.OSRM_IP}:${this.OSRM_PORT}`;
 
         this.OSRM_PROFILE = process.env.OSRM_PROFILE;
@@ -67,10 +70,13 @@ module.exports = function () {
 
         this.OSRM_EXTRACT_PATH = path.resolve(util.format('%s/%s%s', this.BIN_PATH, 'osrm-extract', this.EXE));
         this.OSRM_CONTRACT_PATH = path.resolve(util.format('%s/%s%s', this.BIN_PATH, 'osrm-contract', this.EXE));
+        this.OSRM_CUSTOMIZE_PATH = path.resolve(util.format('%s/%s%s', this.BIN_PATH, 'osrm-customize', this.EXE));
+        this.OSRM_PARTITION_PATH = path.resolve(util.format('%s/%s%s', this.BIN_PATH, 'osrm-partition', this.EXE));
         this.OSRM_ROUTED_PATH = path.resolve(util.format('%s/%s%s', this.BIN_PATH, 'osrm-routed', this.EXE));
         this.LIB_OSRM_EXTRACT_PATH = util.format('%s/' + this.LIB, this.BIN_PATH, 'osrm_extract'),
-        this.LIB_OSRM_GUIDANCE_PATH = util.format('%s/' + this.LIB, this.BIN_PATH, 'osrm_guidance'),
         this.LIB_OSRM_CONTRACT_PATH = util.format('%s/' + this.LIB, this.BIN_PATH, 'osrm_contract'),
+        this.LIB_OSRM_CUSTOMIZE_PATH = util.format('%s/' + this.LIB, this.BIN_PATH, 'osrm_customize'),
+        this.LIB_OSRM_PARTITION_PATH = util.format('%s/' + this.LIB, this.BIN_PATH, 'osrm_partition'),
         this.LIB_OSRM_PATH = util.format('%s/' + this.LIB, this.BIN_PATH, 'osrm');
 
         // eslint-disable-next-line no-console
@@ -111,7 +117,7 @@ module.exports = function () {
         };
 
         var q = d3.queue();
-        [this.OSRM_EXTRACT_PATH, this.OSRM_CONTRACT_PATH, this.OSRM_ROUTED_PATH].forEach(bin => { q.defer(verify, bin); });
+        [this.OSRM_EXTRACT_PATH, this.OSRM_CONTRACT_PATH, this.OSRM_CUSTOMIZE_PATH, this.OSRM_PARTITION_PATH, this.OSRM_ROUTED_PATH].forEach(bin => { q.defer(verify, bin); });
         q.awaitAll(callback);
     };
 

features/testbot/annotations.feature

@@ -115,4 +115,4 @@ Feature: Annotations
 
         When I route I should get
             | from | to | route    | a:speed | a:distance            | a:duration | a:nodes |
-            | a    | c  | abc,abc  | 10:10   | 249.998641:299.931643 | 25:30      | 1:2:3   |
+            | a    | c  | abc,abc  | 10:10   | 249.987619:299.962882 | 25:30      | 1:2:3   |

features/testbot/bearing_param.feature

@@ -108,12 +108,12 @@ Feature: Bearing parameter
             | ha    | yes    | ring |
 
         When I route I should get
-            | from | to | bearings | route                       | bearing                                   |
+            | from | to | bearings | route                            | bearing                                        |
-            |    0 | q  | 0 90     | ia,ring,ring,ring,ring,ring | 0->0,0->90,180->270,270->0,0->90,90->0    |
+            |    0 | q  | 0 90     | ia,ring,ring,ring,ring,ring,ring | 0->0,0->90,90->180,180->270,270->0,0->90,90->0 |
-            |    0 | a  | 45 90    | jb,ring,ring,ring,ring,ring | 0->45,45->180,180->270,270->0,0->90,90->0 |
+            |    0 | a  | 45 90    | jb,ring,ring,ring,ring,ring      | 0->45,45->180,180->270,270->0,0->90,90->0      |
-            |    0 | q  | 90 90    | kc,ring,ring,ring,ring      | 0->90,90->180,270->0,0->90,90->0          |
+            |    0 | q  | 90 90    | kc,ring,ring,ring,ring,ring      | 0->90,90->180,180->270,270->0,0->90,90->0      |
-            |    0 | a  | 135 90   | ld,ring,ring,ring,ring      | 0->135,135->270,270->0,0->90,90->0        |
+            |    0 | a  | 135 90   | ld,ring,ring,ring,ring           | 0->135,135->270,270->0,0->90,90->0             |
-            |    0 | a  | 180 90   | me,ring,ring,ring,ring      | 0->180,180->270,270->0,0->90,90->0        |
+            |    0 | a  | 180 90   | me,ring,ring,ring                | 0->180,180->270,0->90,90->0                    |
-            |    0 | a  | 225 90   | nf,ring,ring,ring           | 0->225,225->0,0->90,90->0                 |
+            |    0 | a  | 225 90   | nf,ring,ring,ring                | 0->225,225->0,0->90,90->0                      |
-            |    0 | a  | 270 90   | og,ring,ring,ring           | 0->270,270->0,0->90,90->0                 |
+            |    0 | a  | 270 90   | og,ring,ring                     | 0->270,270->0,90->0                            |
-            |    0 | a  | 315 90   | ph,ring,ring                | 0->315,315->90,90->0                      |
+            |    0 | a  | 315 90   | ph,ring,ring                     | 0->315,315->90,90->0                           |

features/testbot/compression.feature

@@ -20,5 +20,5 @@ Feature: Geometry Compression
 
         When I route I should get
             | from | to | route         | distance | speed   |
-            | b    | e  | abcdef,abcdef | 588.5m   | 36 km/h |
+            | b    | e  | abcdef,abcdef | 588.7m   | 36 km/h |
-            | e    | b  | abcdef,abcdef | 588.5m   | 36 km/h |
+            | e    | b  | abcdef,abcdef | 588.7m   | 36 km/h |

features/testbot/distance.feature

@@ -90,8 +90,8 @@ Feature: Distance calculation
             | b    | a  | abc,abc | 100m     |
             | b    | c  | abc,abc | 100m     |
             | c    | b  | abc,abc | 100m     |
-            | a    | c  | abc,abc | 200m     |
+            | a    | c  | abc,abc | 199.9m   |
-            | c    | a  | abc,abc | 200m     |
+            | c    | a  | abc,abc | 199.9m   |
 
     Scenario: 1km distance
         Given a grid size of 1000 meters
@@ -134,7 +134,7 @@ Feature: Distance calculation
             | a    | c  | abcdefgh,abcdefgh | 20m      |
             | a    | d  | abcdefgh,abcdefgh | 30m      |
             | a    | e  | abcdefgh,abcdefgh | 40m      |
-            | a    | f  | abcdefgh,abcdefgh | 50m      |
+            | a    | f  | abcdefgh,abcdefgh | 50.1m    |
             | a    | g  | abcdefgh,abcdefgh | 60m +-1  |
             | a    | h  | abcdefgh,abcdefgh | 70m +-1  |
 
@@ -154,9 +154,9 @@ Feature: Distance calculation
             | from | to | route             | distance |
             | a    | b  | abcdefgh,abcdefgh | 10m      |
             | a    | c  | abcdefgh,abcdefgh | 20m      |
-            | a    | d  | abcdefgh,abcdefgh | 30m      |
+            | a    | d  | abcdefgh,abcdefgh | 29.9m    |
-            | a    | e  | abcdefgh,abcdefgh | 40m      |
+            | a    | e  | abcdefgh,abcdefgh | 39.9m    |
-            | a    | f  | abcdefgh,abcdefgh | 50m      |
+            | a    | f  | abcdefgh,abcdefgh | 49.9m    |
             | a    | g  | abcdefgh,abcdefgh | 60m +-1  |
             | a    | h  | abcdefgh,abcdefgh | 70m +-1  |
 

features/testbot/distance_matrix.feature

@@ -22,10 +22,10 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   |    a    |    b    |     e   |   f    |
-            | a |    0    |  100.1  |  199.5  |  299.5 |
+            | a |    0    |  100    |  199.9  |  300   |
-            | b |  100.1  |   0     |  99.4   |  199.5 |
+            | b |  100    |   0     |  100    |  200   |
-            | e |  199.5  |  99.4   |   0     |  100.1 |
+            | e |  199.9  |  100    |   0     |  100.1 |
-            | f |  299.5  |  199.5  |  100.1  |   0    |
+            | f |  300    |  200    |  100.1  |   0    |
 
     Scenario: Testbot - Travel distance matrix of minimal network exact distances
         Given the node map
@@ -43,11 +43,11 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   |   a    |   z     |   b     |   c     |   d     |
-            | a |   0    |  100.1  |  199.5  |  298.9  |  398.3  |
+            | a |   0    |  100    |  199.9  |  300    |  399.9  |
-            | z |  100.1 |  0      |  99.4   |  198.8  |  298.2  |
+            | z |  100   |  0      |  100    |  200    |  300    |
-            | b |  199.5 |  99.4   |  0      |  99.4   |  198.8  |
+            | b |  199.9 |  100    |  0      |  100.1  |  200    |
-            | c |  298.9 |  198.8  |  99.4   |  0      |  99.4   |
+            | c |  300   |  200    |  100.1  |  0      |  100    |
-            | d |  398.3 |  298.2  |  198.8  |  99.4   |  0      |
+            | d |  399.9 |  300    |  200    |  100    |  0      |
 
     Scenario: Testbot - Travel distance matrix of minimal network with toll exclude
         Given the query options
@@ -68,10 +68,10 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | a     | b     | c     | d     |
-            | a | 0     | 100.1 |       |       |
+            | a | 0     | 100   |       |       |
-            | b | 100.1 | 0     |       |       |
+            | b | 100   | 0     |       |       |
-            | c |       |       | 0     | 100.1 |
+            | c |       |       | 0     | 100   |
-            | d |       |       | 100.1 | 0     |
+            | d |       |       | 100   | 0     |
 
     Scenario: Testbot - Travel distance matrix of minimal network with motorway exclude
         Given the query options
@@ -92,7 +92,7 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | a |   b    |  c   |   d   |
-            | a | 0 |  298.9 | 99.4 | 199.5 |
+            | a | 0 |  299.9 | 100  | 199.9 |
 
     Scenario: Testbot - Travel distance matrix of minimal network disconnected motorway exclude
         Given the query options
@@ -113,7 +113,7 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | a | b    | e |
-            | a | 0 | 50.1 |   |
+            | a | 0 | 50   |   |
 
     Scenario: Testbot - Travel distance matrix of minimal network with motorway and toll excludes
         Given the query options
@@ -134,7 +134,7 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | a | b      | e | g |
-            | a | 0 | 100.1  |   |   |
+            | a | 0 | 100    |   |   |
 
     Scenario: Testbot - Travel distance matrix with different way speeds
         Given the node map
@@ -150,21 +150,21 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | a     | b     | c     | d     |
-            | a | 0     | 100.1 | 200.1 | 300.2 |
+            | a | 0     | 100   | 200   | 300   |
-            | b | 100.1 | 0     | 100.1 | 200.1 |
+            | b | 100   | 0     | 100.1 | 200   |
-            | c | 200.1 | 100.1 | 0     | 100.1 |
+            | c | 200   | 100.1 | 0     | 100   |
-            | d | 300.2 | 200.1 | 100.1 | 0     |
+            | d | 300   | 200   | 100   | 0     |
 
         When I request a travel distance matrix I should get
             |   | a | b     | c     | d     |
-            | a | 0 | 100.1 | 200.1 | 300.2 |
+            | a | 0 | 100   | 200   | 300   |
 
         When I request a travel distance matrix I should get
             |   | a     |
             | a | 0     |
-            | b | 100.1 |
+            | b | 100   |
-            | c | 200.1 |
+            | c | 200   |
-            | d | 300.2 |
+            | d | 300   |
 
     Scenario: Testbot - Travel distance matrix of small grid
         Given the node map
@@ -183,10 +183,10 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | a     | b     | e     | f     |
-            | a | 0     | 100.1 | 199.5 | 299.5 |
+            | a | 0     | 100   | 199.9 | 300   |
-            | b | 100.1 | 0     | 99.4  | 199.5 |
+            | b | 100   | 0     | 100   | 200   |
-            | e | 199.5 | 99.4  | 0     | 100.1 |
+            | e | 199.9 | 100   | 0     | 100.1 |
-            | f | 299.5 | 199.5 | 100.1 | 0     |
+            | f | 300   | 200   | 100.1 | 0     |
 
     Scenario: Testbot - Travel distance matrix of network with unroutable parts
         Given the node map
@@ -200,7 +200,7 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | a | b      |
-            | a | 0 | 100.1  |
+            | a | 0 | 100    |
             | b |   | 0      |
 
     Scenario: Testbot - Travel distance matrix of network with oneways
@@ -218,10 +218,10 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | x     | y     | d     | e     |
-            | x | 0     | 300.2 | 399.6 | 299.5 |
+            | x | 0     | 300   | 400   | 300   |
-            | y | 499   | 0     | 299.5 | 199.5 |
+            | y | 499.9 | 0     | 300   | 199.9 |
-            | d | 199.5 | 299.5 | 0     | 298.9 |
+            | d | 199.9 | 300   | 0     | 300   |
-            | e | 299.5 | 399.6 | 100.1 | 0     |
+            | e | 300   | 400   | 100.1 | 0     |
 
     Scenario: Testbot - Rectangular travel distance matrix
         Given the node map
@@ -240,53 +240,53 @@ Feature: Basic Distance Matrix
 
         When I route I should get
             | from | to | distance  |
-            | e    | a  | 200m      |
+            | e    | a  | 199.9m    |
             | e    | b  | 100m      |
-            | f    | a  | 299.9m    |
+            | f    | a  | 300m      |
             | f    | b  | 200m      |
 
         When I request a travel distance matrix I should get
             |   | a | b      | e      | f      |
-            | a | 0 |  100.1 |  199.5 |  299.5 |
+            | a | 0 |  100   | 199.9  |  300   |
 
         When I request a travel distance matrix I should get
             |   | a     |
             | a | 0     |
-            | b | 100.1 |
+            | b | 100   |
-            | e | 199.5 |
+            | e | 199.9 |
-            | f | 299.5 |
+            | f | 300   |
 
         When I request a travel distance matrix I should get
             |   | a     | b     | e     | f     |
-            | a | 0     | 100.1 | 199.5 | 299.5 |
+            | a | 0     | 100   | 199.9 | 300   |
-            | b | 100.1 | 0     | 99.4  | 199.5 |
+            | b | 100   | 0     | 100   | 200   |
 
         When I request a travel distance matrix I should get
             |   | a     | b     |
-            | a | 0     | 100.1 |
+            | a | 0     | 100   |
-            | b | 100.1 | 0     |
+            | b | 100   | 0     |
-            | e | 199.5 | 99.4  |
+            | e | 199.9 | 100   |
-            | f | 299.5 | 199.5 |
+            | f | 300   | 200   |
 
         When I request a travel distance matrix I should get
             |   | a     | b     | e     | f     |
-            | a | 0     | 100.1 | 199.5 | 299.5 |
+            | a | 0     | 100   | 199.9 | 300   |
-            | b | 100.1 | 0     | 99.4  | 199.5 |
+            | b | 100   | 0     | 100   | 200   |
-            | e | 199.5 | 99.4  | 0     | 100.1 |
+            | e | 199.9 | 100   | 0     | 100.1 |
 
         When I request a travel distance matrix I should get
              |   | a     | b     | e     |
-             | a | 0     | 100.1 | 199.5 |
+             | a | 0     | 100   | 199.9 |
-             | b | 100.1 | 0     | 99.4  |
+             | b | 100   | 0     | 100   |
-             | e | 199.5 | 99.4  | 0     |
+             | e | 199.9 | 100   | 0     |
-             | f | 299.5 | 199.5 | 100.1 |
+             | f | 300   | 200   | 100.1 |
 
         When I request a travel distance matrix I should get
              |   | a     | b     | e     | f     |
-             | a | 0     | 100.1 | 199.5 | 299.5 |
+             | a | 0     | 100   | 199.9 | 300   |
-             | b | 100.1 | 0     | 99.4  | 199.5 |
+             | b | 100   | 0     | 100   | 200   |
-             | e | 199.5 | 99.4  | 0     | 100.1 |
+             | e | 199.9 | 100   | 0     | 100.1 |
-             | f | 299.5 | 199.5 | 100.1 | 0     |
+             | f | 300   | 200   | 100.1 | 0     |
 
      Scenario: Testbot - Travel distance 3x2 matrix
         Given the node map
@@ -306,8 +306,8 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | b     | e     | f     |
-            | a | 100.1 | 199.5 | 299.5 |
+            | a | 100   | 199.9 | 300   |
-            | b | 0     | 99.4  | 199.5 |
+            | b | 0     | 100   | 200   |
 
     Scenario: Testbot - All coordinates are from same small component
         Given a grid size of 300 meters
@@ -328,8 +328,8 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | f     | g     |
-            | f | 0     | 298.2 |
+            | f | 0     | 300   |
-            | g | 298.2 | 0     |
+            | g | 300   | 0     |
 
     Scenario: Testbot - Coordinates are from different small component and snap to big CC
         Given a grid size of 300 meters
@@ -362,10 +362,10 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | f     | g     | h     | i     |
-            | f | 0     | 298.2 | 0     | 298.2 |
+            | f | 0     | 300   | 0     | 300   |
-            | g | 298.2 | 0     | 298.2 | 0     |
+            | g | 300   | 0     | 300   | 0     |
-            | h | 0     | 298.2 | 0     | 298.2 |
+            | h | 0     | 300   | 0     | 300   |
-            | i | 298.2 | 0     | 298.2 | 0     |
+            | i | 300   | 0     | 300   | 0     |
 
     Scenario: Testbot - Travel distance matrix with loops
         Given the node map
@@ -383,10 +383,10 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | 1     | 2     | 3     | 4     |
-            | 1 | 0     | 100.1 | 399.6 | 499.7 |
+            | 1 | 0     | 100.1 | 399.9 | 500   |
-            | 2 | 699.1 | 0     | 299.5 | 399.6 |
+            | 2 | 699.8 | 0     | 299.9 | 399.9 |
-            | 3 | 399.6 | 499.7 | 0     | 100.1 |
+            | 3 | 399.9 | 500   | 0     | 100.1 |
-            | 4 | 299.5 | 399.6 | 699.1 | 0     |
+            | 4 | 299.9 | 399.9 | 699.8 | 0     |
 
 
     Scenario: Testbot - Travel distance matrix based on segment durations
@@ -424,11 +424,11 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | a     | b     | c     | d     | e     |
-            | a | 0     | 100.1 | 200.1 | 300.2 | 398.9 |
+            | a | 0     | 100   | 200   | 300   | 400   |
-            | b | 100.1 | 0     | 100.1 | 200.1 | 298.9 |
+            | b | 100   | 0     | 100.1 | 200   | 300.1 |
-            | c | 200.1 | 100.1 | 0     | 100.1 | 198.8 |
+            | c | 200   | 100.1 | 0     | 100   | 200   |
-            | d | 300.2 | 200.1 | 100.1 | 0     | 298.9 |
+            | d | 300   | 200   | 100   | 0     | 300   |
-            | e | 398.9 | 298.9 | 198.8 | 298.9 | 0     |
+            | e | 400   | 300.1 | 200   | 300   | 0     |
 
     Scenario: Testbot - Travel distance matrix for alternative loop paths
         Given the profile file
@@ -468,25 +468,25 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
              |   | 1     | 2      | 3     | 4      | 5     | 6      | 7     | 8      |
-             | 1 | 0     | 1096.7 | 298.9 | 199.5  | 598.4 | 498.3  | 897.3 | 797.9  |
+             | 1 | 0     | 1099.8 | 300   | 199.9  | 600   | 499.9  | 899.9 | 799.9  |
-             | 2 | 100.1 | 0      | 398.9 | 299.5  | 698.5 | 598.4  | 997.3 | 897.9  |
+             | 2 | 100.1 | 0      | 400   | 300    | 700   | 600    | 1000  | 899.9  |
-             | 3 | 897.9 | 797.9  | 0     | 1097.4 | 299.5 | 199.5  | 598.4 | 499    |
+             | 3 | 899.9 | 799.9  | 0     | 1099.8 | 300   | 199.9  | 600   | 499.9  |
-             | 4 | 997.3 | 897.3  | 99.4  | 0      | 398.9 | 298.9  | 697.8 | 598.4  |
+             | 4 | 1000  | 899.9  | 100.1 | 0      | 400   | 300    | 700   | 600    |
-             | 5 | 598.4 | 498.3  | 897.3 | 797.9  | 0     | 1096.7 | 298.9 | 199.5  |
+             | 5 | 600   | 499.9  | 899.9 | 799.9  | 0     | 1099.8 | 300   | 199.9  |
-             | 6 | 698.5 | 598.4  | 997.3 | 897.9  | 100.1 | 0      | 398.9 | 299.5  |
+             | 6 | 700   | 600    | 1000  | 899.9  | 100.1 | 0      | 400   | 300    |
-             | 7 | 299.5 | 199.5  | 598.4 | 499    | 897.9 | 797.9  | 0     | 1097.4 |
+             | 7 | 300   | 199.9  | 600   | 499.9  | 899.9 | 799.9  | 0     | 1099.8 |
-             | 8 | 398.9 | 298.9  | 697.8 | 598.4  | 997.3 | 897.3  | 99.4  | 0      |
+             | 8 | 400   | 300    | 700   | 600    | 1000  | 899.9  | 100.1 | 0      |
 
         When I request a travel distance matrix I should get
              |   | 1     |
              | 1 | 0     |
              | 2 | 100.1 |
-             | 3 | 897.9 |
+             | 3 | 899.9 |
-             | 4 | 997.3 |
+             | 4 | 1000  |
-             | 5 | 598.4 |
+             | 5 | 600   |
-             | 6 | 698.5 |
+             | 6 | 700   |
-             | 7 | 299.5 |
+             | 7 | 300   |
-             | 8 | 398.9 |
+             | 8 | 400   |
 
     Scenario: Testbot - Travel distance matrix with ties
         Given the node map
@@ -511,23 +511,23 @@ Feature: Basic Distance Matrix
             | from | to | route    | distance |
             | a    | b  | ab,ab    | 450m     |
             | a    | c  | ac,ac    | 200m     |
-            | a    | d  | ac,dc,dc | 499.9m   |
+            | a    | d  | ac,dc,dc | 500m     |
 
         When I request a travel distance matrix I should get
             |   | a | b     | c     | d   |
-            | a | 0 | 450.3 | 198.8 | 499 |
+            | a | 0 | 450   | 200   | 500 |
 
         When I request a travel distance matrix I should get
             |   | a     |
             | a | 0     |
-            | b | 450.3 |
+            | b | 450   |
-            | c | 198.8 |
+            | c | 200   |
-            | d | 499   |
+            | d | 500   |
 
         When I request a travel distance matrix I should get
             |   | a     | c     |
-            | a | 0     | 198.8 |
+            | a | 0     | 200   |
-            | c | 198.8 | 0     |
+            | c | 200   | 0     |
 
 
     # Check rounding errors
@@ -544,7 +544,7 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | a | b      | c      | d      |
-            | a | 0 | 1000.7 | 2001.4 | 3002.1 |
+            | a | 0 | 1000.1 | 2000 | 3000.1 |
 
 
     Scenario: Testbot - OneToMany vs ManyToOne
@@ -562,12 +562,12 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   |   a   | b      |
-            | b | 240.4 | 0      |
+            | b | 241.3 | 0      |
 
         When I request a travel distance matrix I should get
             |   |   a   |
             | a |   0   |
-            | b | 240.4 |
+            | b | 241.3 |
 
     Scenario: Testbot - Varying distances between nodes
         Given the node map
@@ -589,12 +589,13 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | a      | b     | c      | d      | e      | f      |
-            | a | 0      | 100.1 | 300.2  | 650.5  | 1930.6 | 1533   |
+            | a | 0      | 100   | 300    | 650    | 1934.5 | 1534.6 |
-            | b | 759    | 0     | 200.1  | 550.4  | 1830.5 | 1432.9 |
+            | b | 760.6  | 0     | 200    | 550.1  | 1834.6 | 1434.6 |
-            | c | 558.8  | 658.9 | 0      | 350.3  | 1630.4 | 1232.8 |
+            | c | 560.6  | 660.5 | 0      | 350    | 1634.6 | 1234.6 |
-            | d | 1478.9 | 1579  | 1779.1 | 0      | 1280.1 | 882.5  |
+            | d | 1484.6 | 1584.5| 1784.5 | 0      | 1284.5 | 884.6  |
-            | e | 198.8  | 298.9 | 499    | 710.3  | 0      | 1592.8 |
+            | e | 200    | 300   | 500    | 710.6  | 0      | 1595.2 |
-            | f | 596.4  | 696.5 | 896.6  | 1107.9 | 397.6  | 0      |
+            | f | 600    | 699.9 | 899.9  | 1110.5 | 399.9  | 0      |
+
 
     Scenario: Testbot - Filling in noroutes with estimates (defaults to input coordinate location)
         Given a grid size of 300 meters
@@ -614,21 +615,21 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | a      | b      | f     | 1      |
-            | a | 0      | 300.2  | 900.7 | 1501.1 |
+            | a | 0      | 300    | 900   | 1500   |
-            | b | 300.2  | 0      | 600.5 | 1200.9 |
+            | b | 300    | 0      | 600   | 1200.1 |
-            | f | 900.7  | 600.5  | 0     | 300.2  |
+            | f | 900    | 600    | 0     | 300    |
-            | 1 | 1501.1 | 1200.9 | 300.2 | 0      |
+            | 1 | 1500   | 1200.1 | 300   | 0      |
 
         When I request a travel distance matrix I should get
             |   | a      | b      | f     | 1      |
-            | a | 0      | 300.2  | 900.7 | 1501.1 |
+            | a | 0      | 300    | 900   | 1500   |
 
         When I request a travel distance matrix I should get
             |   | a      |
             | a | 0      |
-            | b | 300.2  |
+            | b | 300    |
-            | f | 900.7  |
+            | f | 900    |
-            | 1 | 1501.1 |
+            | 1 | 1500   |
 
     Scenario: Testbot - Fise input coordinate
         Given a grid size of 300 meters
@@ -649,21 +650,21 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | a      | b      | f     | 1      |
-            | a | 0      | 300.2  | 900.7 | 1501.1 |
+            | a | 0      | 300    | 900   | 1500   |
-            | b | 300.2  | 0      | 600.5 | 1200.9 |
+            | b | 300    | 0      | 600   | 1200.1 |
-            | f | 900.7  | 600.5  | 0     | 300.2  |
+            | f | 900    | 600    | 0     | 300    |
-            | 1 | 1501.1 | 1200.9 | 300.2 | 0      |
+            | 1 | 1500   | 1200.1 | 300   | 0      |
 
         When I request a travel distance matrix I should get
             |   | a      | b     | f     | 1      |
-            | a | 0      | 300.2 | 900.7 | 1501.1 |
+            | a | 0      | 300   | 900   | 1500   |
 
         When I request a travel distance matrix I should get
             |   | a      |
             | a | 0      |
-            | b | 300.2  |
+            | b | 300    |
-            | f | 900.7  |
+            | f | 900    |
-            | 1 | 1501.1 |
+            | 1 | 1500   |
 
 
     Scenario: Testbot - Filling in noroutes with estimates - use snapped coordinate
@@ -685,28 +686,28 @@ Feature: Basic Distance Matrix
 
         When I request a travel distance matrix I should get
             |   | a      | b     | f     | 1      |
-            | a | 0      | 300.2 | 900.7 | 1200.9 |
+            | a | 0      | 300   | 900   | 1200   |
-            | b | 300.2  | 0     | 600.5 | 900.7  |
+            | b | 300    | 0     | 600   | 900    |
-            | f | 900.7  | 600.5 | 0     | 300.2  |
+            | f | 900    | 600   | 0     | 300  |
-            | 1 | 1200.9 | 900.7 | 300.2 | 0      |
+            | 1 | 1200   | 900   | 300   | 0      |
 
         When I request a travel distance matrix I should get
             |   | a      | b     | f     | 1      |
-            | a | 0      | 300.2 | 900.7 | 1200.9 |
+            | a | 0      | 300   | 900   | 1200   |
 
         When I request a travel distance matrix I should get
             |   | a      |
             | a | 0      |
-            | b | 300.2  |
+            | b | 300    |
-            | f | 900.7  |
+            | f | 900    |
-            | 1 | 1200.9 |
+            | 1 | 1200   |
 
     Scenario: Ensure consistency with route, and make sure offsets work in both directions
         Given a grid size of 100 meters
         Given the node map
             """
             a   b   c   d   e   f   g   h  i  j
-                  1                   2
+                  1                   2       3
             """
 
         And the ways
@@ -715,11 +716,14 @@ Feature: Basic Distance Matrix
             | fghij  |
 
         When I route I should get
-            | from | to | route              | distance |
+            | from | to | route              | distance   |
-            | 1    | 2  | abcdef,fghij,fghij | 999.9m  |
+            | 1    | 2  | abcdef,fghij,fghij | 1000.1m    |
+            | 1    | 3  | abcdef,fghij,fghij | 1400.1m    |
+            | 2    | 3  | fghij,fghij        | 400m       |
+            
 
-        # TODO: this is "correct", but inconsistent with viaroute
         When I request a travel distance matrix I should get
-            |   |   1    | 2      |
+            |   |   1    | 2      | 3      |   
-            | 1 |   0    | 1000.7 |
+            | 1 |   0    | 1000.1 | 1400.1 |
-            | 2 | 1000.7 | 0      |
+            | 2 | 1000.1 | 0      | 400    |
+            | 3 | 1400.1 | 400    | 0      |

features/testbot/duration_matrix.feature

@@ -446,15 +446,15 @@ Feature: Basic Duration Matrix
             | ca    | yes    |
 
         When I request a travel time matrix I should get
-          |   |   1 |   2 |   3 |   4 |    5 |   6 |   7 |   8 |
+          |   | 1    | 2    | 3    | 4    | 5    | 6    | 7    | 8    |
-          | 1 |   0 |  11 |   3 |   2 |    6 |   5 | 8.9 | 7.9 |
+          | 1 | 0    | 10.9 | 3    | 1.9  | 6    | 4.9  | 9    | 7.9  |
-          | 2 |   1 |   0 |   4 |   3 |    7 |   6 | 9.9 | 8.9 |
+          | 2 | 1.1  | 0    | 4.1  | 3    | 7.1  | 6    | 10.1 | 9    |
-          | 3 |   9 |   8 |   0 |  11 |    3 |   2 | 5.9 | 4.9 |
+          | 3 | 9    | 7.9  | 0    | 10.9 | 3    | 1.9  | 6    | 4.9  |
-          | 4 |  10 |   9 |   1 |   0 |    4 |   3 | 6.9 | 5.9 |
+          | 4 | 10.1 | 9    | 1.1  | 0    | 4.1  | 3    | 7.1  | 6    |
-          | 5 |   6 |   5 |   9 |   8 |    0 |  11 | 2.9 | 1.9 |
+          | 5 | 6    | 4.9  | 9    | 7.9  | 0    | 10.9 | 3    | 1.9  |
-          | 6 |   7 |   6 |  10 |   9 |    1 |   0 | 3.9 | 2.9 |
+          | 6 | 7.1  | 6    | 10.1 | 9    | 1.1  | 0    | 4.1  | 3    |
-          | 7 | 3.1 | 2.1 | 6.1 | 5.1 |  9.1 | 8.1 |   0 |  11 |
+          | 7 | 3    | 1.9  | 6    | 4.9  | 9    | 7.9  | 0    | 10.9 |
-          | 8 | 4.1 | 3.1 | 7.1 | 6.1 | 10.1 | 9.1 |   1 | 0   |
+          | 8 | 4.1  | 3    | 7.1  | 6    | 10.1 | 9    | 1.1  | 0    |
 
 
     Scenario: Testbot - Travel time matrix with ties
@@ -543,22 +543,22 @@ Feature: Basic Duration Matrix
             | fhigf |
 
         When I request a travel time matrix I should get
-            |   | a  | b  | f  | 1  |
+            |   | a    | b  | f    | 1  |
-            | a | 0  | 30 | 18 | 30 |
+            | a | 0    | 30 | 17.9 | 30 |
-            | b | 30 | 0  | 12 | 24 |
+            | b | 30   | 0  | 12   | 24 |
-            | f | 18 | 12 | 0  | 30 |
+            | f | 17.9 | 12 | 0    | 30 |
-            | 1 | 30 | 24 | 30 | 0  |
+            | 1 | 30   | 24 | 30   | 0  |
 
         When I request a travel time matrix I should get
-            |   | a  | b  | f  | 1  |
+            |   | a  | b  | f    | 1  |
-            | a | 0  | 30 | 18 | 30 |
+            | a | 0  | 30 | 17.9 | 30 |
 
         When I request a travel time matrix I should get
-            |   | a  |
+            |   | a    |
-            | a | 0  |
+            | a | 0    |
-            | b | 30 |
+            | b | 30   |
-            | f | 18 |
+            | f | 17.9 |
-            | 1 | 30 |
+            | 1 | 30   |
 
         When I request a travel time matrix I should get estimates for
             |   | a | b | f | 1 |
@@ -596,22 +596,22 @@ Feature: Basic Duration Matrix
             | fhigf |
 
         When I request a travel time matrix I should get
-            |   | a  | b  | f  | 1  |
+            |   | a    | b  | f    | 1  |
-            | a | 0  | 30 | 18 | 30 |
+            | a | 0    | 30 | 17.9 | 30 |
-            | b | 30 | 0  | 12 | 24 |
+            | b | 30   | 0  | 12   | 24 |
-            | f | 18 | 12 | 0  | 30 |
+            | f | 17.9 | 12 | 0    | 30 |
-            | 1 | 30 | 24 | 30 | 0  |
+            | 1 | 30   | 24 | 30   | 0  |
 
         When I request a travel time matrix I should get
-            |   | a  | b  | f  | 1  |
+            |   | a  | b  | f    | 1  |
-            | a | 0  | 30 | 18 | 30 |
+            | a | 0  | 30 | 17.9 | 30 |
 
         When I request a travel time matrix I should get
-            |   | a  |
+            |   | a    |
-            | a | 0  |
+            | a | 0    |
-            | b | 30 |
+            | b | 30   |
-            | f | 18 |
+            | f | 17.9 |
-            | 1 | 30 |
+            | 1 | 30   |
 
         When I request a travel time matrix I should get estimates for
             |   | a | b | f | 1 |
@@ -650,22 +650,22 @@ Feature: Basic Duration Matrix
             | fhigf |
 
         When I request a travel time matrix I should get
-            |   | a  | b  | f  | 1  |
+            |   | a    | b    | f    | 1    |
-            | a | 0  | 30 | 18 | 24 |
+            | a | 0    | 30   | 17.9 | 23.9 |
-            | b | 30 | 0  | 12 | 18 |
+            | b | 30   | 0    | 12   | 17.9 |
-            | f | 18 | 12 | 0  | 30 |
+            | f | 17.9 | 12   | 0    | 30   |
-            | 1 | 24 | 18 | 30 | 0  |
+            | 1 | 23.9 | 17.9 | 30   | 0    |
 
         When I request a travel time matrix I should get
-            |   | a  | b  | f  | 1  |
+            |   | a  | b  | f    | 1    |
-            | a | 0  | 30 | 18 | 24 |
+            | a | 0  | 30 | 17.9 | 23.9 |
 
         When I request a travel time matrix I should get
-            |   | a  |
+            |   | a    |
-            | a | 0  |
+            | a | 0    |
-            | b | 30 |
+            | b | 30   |
-            | f | 18 |
+            | f | 17.9 |
-            | 1 | 24 |
+            | 1 | 23.9 |
 
         When I request a travel time matrix I should get estimates for
             |   | a | b | f | 1 |
@@ -719,22 +719,22 @@ Feature: Basic Duration Matrix
             | fhigf |
 
         When I request a travel time matrix I should get
-            |   | a  | b  | f  | 1  |
+            |   | a    | b    | f    | 1    |
-            | a | 0  | 60 | 36 | 48 |
+            | a | 0    | 60   | 35.8 | 47.8 |
-            | b | 60 | 0  | 24 | 36 |
+            | b | 60   | 0    | 24   | 35.8 |
-            | f | 36 | 24 | 0  | 60 |
+            | f | 35.8 | 24   | 0    | 60   |
-            | 1 | 48 | 36 | 60 | 0  |
+            | 1 | 47.8 | 35.8 | 60   | 0    |
 
         When I request a travel time matrix I should get
-            |   | a  | b  | f  | 1  |
+            |   | a  | b  | f    | 1    |
-            | a | 0  | 60 | 36 | 48 |
+            | a | 0  | 60 | 35.8 | 47.8 |
 
         When I request a travel time matrix I should get
-            |   | a  |
+            |   | a    |
-            | a | 0  |
+            | a | 0    |
-            | b | 60 |
+            | b | 60   |
-            | f | 36 |
+            | f | 35.8 |
-            | 1 | 48 |
+            | 1 | 47.8 |
 
         When I request a travel time matrix I should get estimates for
             |   | a | b | f | 1 |

features/testbot/matching.feature

@@ -279,8 +279,8 @@ Feature: Basic Map Matching
             | fb    | yes    |
 
         When I match I should get
-            | trace | matchings | geometry                                      |
+            | trace | matchings | geometry                                           |
-            | efbc  | efbc      | 1,0.99964,1.00036,0.99964,1.00036,1,1.000719,1 |
+            | efbc  | efbc      | 1,0.999638,1.000359,0.999638,1.000359,1,1.000719,1 |
 
     Scenario: Testbot - Geometry details using geojson
         Given the query options
@@ -356,7 +356,7 @@ Feature: Basic Map Matching
 
         When I match I should get
             | trace  | matchings | alternatives         |
-            | abcdef | abcde     | 0,0,0,0,1,1          |
+            | abcdef | abcde     | 0,0,0,1,1,1          |
 
     Scenario: Testbot - Speed greater than speed threshold
         Given a grid size of 100 meters
@@ -652,7 +652,7 @@ Feature: Basic Map Matching
 
         When I match I should get
             | trace    | geometry                           | code |
-            | defgh    | 1,1,1,0.999461,1.000674,0.999461   | Ok   |
+            | defgh    | 1,1,1,0.999457,1.000674,0.999457   | Ok   |
 
     @match @testbot
     Scenario: Regression test - waypoints trimming too much geometry
@@ -682,8 +682,8 @@ Feature: Basic Map Matching
           | waypoints | 0;3  |
           | overview  | full |
         When I match I should get
-          | trace | geometry                                      | code |
+          | trace | geometry                                       | code |
-          | bgkj  | 1.000135,1,1.000135,0.99964,1.000387,0.999137 | Ok   |
+          | bgkj  | 1.000135,1,1.000135,0.999638,1.000386,0.999132 | Ok   |
 
 
     @match @testbot
@@ -712,12 +712,12 @@ Feature: Basic Map Matching
           | overview  | full |
           | steps     | true |
         When I match I should get
-          | trace | geometry                                   | turns                    | code |
+          | trace | geometry                                       | turns                    | code |
-          | abc   | 1,0.99973,1.00027,0.99973,1.000539,0.99973 | depart,arrive            | Ok   |
+          | abc   | 1,0.999729,1.000269,0.999729,1.000539,0.999729 | depart,arrive            | Ok   |
-          | abd   | 1,0.99973,1.00027,0.99973,1.00027,0.999461 | depart,turn right,arrive | Ok   |
+          | abd   | 1,0.999729,1.000269,0.999729,1.000269,0.999457 | depart,turn right,arrive | Ok   |
-          | abe   | 1,0.99973,1.00027,0.99973,1.00027,1        | depart,turn left,arrive  | Ok   |
+          | abe   | 1,0.999729,1.000269,0.999729,1.000269,1        | depart,turn left,arrive  | Ok   |
-          | ahd   | 1,0.99973,1.00027,0.99973,1.00027,0.999461 | depart,turn right,arrive | Ok   |
+          | ahd   | 1,0.999729,1.000269,0.999729,1.000269,0.999457 | depart,turn right,arrive | Ok   |
-          | ahe   | 1,0.99973,1.00027,0.99973,1.00027,1        | depart,turn left,arrive  | Ok   |
+          | ahe   | 1,0.999729,1.000269,0.999729,1.000269,1        | depart,turn left,arrive  | Ok   |
 
     @match @testbot
     Scenario: Regression test - add source phantoms properly (one phantom on one edge)
@@ -740,9 +740,9 @@ Feature: Basic Map Matching
           | annotations    | duration,weight |
           | generate_hints | false           |
         When I match I should get
-          | trace | geometry                                             | a:duration    | a:weight      | duration |
+          | trace | geometry                                               | a:duration    | a:weight      | duration |
-          | 123   | 1.000135,1,1.000225,1,1.00036,1,1.000405,1,1.00045,1 | 1:1.5:0.5:0.5 | 1:1.5:0.5:0.5 | 3.5      |
+          | 123   | 1.000135,1,1.000225,1,1.000359,1,1.000404,1,1.000449,1 | 1:1.5:0.5:0.4 | 1:1.5:0.5:0.4 | 3.4      |
-          | 321   | 1.00045,1,1.000405,1,1.00036,1,1.000225,1,1.000135,1 | 0.5:0.5:1.5:1 | 0.5:0.5:1.5:1 | 3.5      |
+          | 321   | 1.000449,1,1.000404,1,1.000359,1,1.000225,1,1.000135,1 | 0.4:0.5:1.5:1 | 0.4:0.5:1.5:1 | 3.4      |
 
     @match @testbot
     Scenario: Regression test - add source phantom properly (two phantoms on one edge)
@@ -765,9 +765,9 @@ Feature: Basic Map Matching
           | annotations    | duration,weight |
           | generate_hints | false           |
         When I match I should get
-          | trace | geometry                                   | a:duration | a:weight | duration |
+          | trace | geometry                                    | a:duration | a:weight | duration |
-          | 1234  | 1.000135,1,1.000225,1,1.000405,1,1.00045,1 | 1:2:0.5    | 1:2:0.5  | 3.5      |
+          | 1234  | 1.000135,1,1.000225,1,1.000404,1,1.000449,1 | 1:2:0.4    | 1:2:0.4  | 3.4      |
-          | 4321  | 1.00045,1,1.000405,1,1.000225,1,1.000135,1 | 0.5:2:1    | 0.5:2:1  | 3.5      |
+          | 4321  | 1.000449,1,1.000404,1,1.000225,1,1.000135,1 | 0.4:2:1    | 0.4:2:1  | 3.4      |
 
     @match @testbot
     Scenario: Regression test - add source phantom properly (two phantoms on one edge)
@@ -791,5 +791,5 @@ Feature: Basic Map Matching
         # These should have the same weights/duration in either direction
         When I match I should get
           | trace | geometry             | a:distance | a:duration | a:weight | duration |
-          | 2345  | 1.00018,1,1.000315,1 | 15.013264  | 1.5        | 1.5      | 1.5      |
+          | 2345  | 1.00018,1,1.000314,1 | 14.914666  | 1.4        | 1.4      | 1.4      |
-          | 4321  | 1.00027,1,1.000135,1 | 15.013264  | 1.5        | 1.5      | 1.5      |
+          | 4321  | 1.00027,1,1.000135,1 | 15.02597   | 1.5        | 1.5      | 1.5      |

features/testbot/multi_level_routing.feature

@@ -110,33 +110,34 @@ Feature: Multi level routing
 
         When I request a travel distance matrix I should get
             |   | a      | f      | l      | o      |
-            | a | 0      | 2383.7 | 1566.9 | 1366.8 |
+            | a | 0      | 2391.6 | 1570.8 | 1370.9 |
-            | f | 2383.7 | 0      | 1293.3 | 1617.3 |
+            | f | 2391.6 | 0      | 1297.2 | 1620.9 |
-            | l | 1566.9 | 1293.3 | 0      | 800.5  |
+            | l | 1570.8 | 1297.2 | 0      | 800    |
-            | o | 1366.8 | 1617.3 | 800.5  | 0      |
+            | o | 1370.9 | 1620.9 | 800    | 0      |
+
 
         When I request a travel distance matrix I should get
             |   | a | f      | l      | o      |
-            | a | 0 | 2383.7 | 1566.9 | 1366.8 |
+            | a | 0 | 2391.6 | 1570.8 | 1370.9 |
 
         When I request a travel distance matrix I should get
             |   | a      |
             | a | 0      |
-            | f | 2383.7 |
+            | f | 2391.6 |
-            | l | 1566.9 |
+            | l | 1570.8 |
-            | o | 1366.8 |
+            | o | 1370.9 |
 
         When I request a travel distance matrix I should get
             |   | a      | f      | l      | o      |
-            | a | 0      | 2383.7 | 1566.9 | 1366.8 |
+            | a | 0      | 2391.6 | 1570.8 | 1370.9 |
-            | f | 2383.7 | 0      | 1293.3 | 1617.3 |
+            | f | 2391.6 | 0      | 1297.2 | 1620.9 |
 
         When I request a travel distance matrix I should get
             |   | a      | o      |
-            | a | 0      | 1366.8 |
+            | a | 0      | 1370.9 |
-            | f | 2383.7 | 1617.3 |
+            | f | 2391.6 | 1620.9 |
-            | l | 1566.9 | 800.5  |
+            | l | 1570.8 | 800    |
-            | o | 1366.8 | 0      |
+            | o | 1370.9 | 0      |
 
     Scenario: Testbot - Multi level routing: horizontal road
         Given the node map

features/testbot/origin.feature

@@ -53,7 +53,7 @@ Feature: Routing close to the [0,0] origin
 
         When I route I should get
             | from | to | route       | distance |
-            | b    | d  | abcde,abcde | 200m     |
+            | b    | d  | abcde,abcde | 198.8m   |
             | d    | b  |             |          |
 
     Scenario: North-south oneways crossing the origin
@@ -71,5 +71,5 @@ Feature: Routing close to the [0,0] origin
 
         When I route I should get
             | from | to | route       | distance |
-            | b    | d  | abcde,abcde | 200m     |
+            | b    | d  | abcde,abcde | 200.2m   |
             | d    | b  |             |          |

features/testbot/planetary.feature

@@ -26,8 +26,8 @@ Feature: Distance calculation
             | cd    |
 
         When I route I should get
-            | from | to | route | distance       |
+            | from | to | route | distance         |
-            | c    | d  | cd,cd | 6028844m ~4.5% |
+            | c    | d  | cd,cd | 6310675.7m ~4.5% |
 
     Scenario: Approximated Longitudinal distances at latitude 80
         Given the node locations
@@ -54,8 +54,8 @@ Feature: Distance calculation
             | ab    |
 
         When I route I should get
-            | from | to | route | distance       |
+            | from | to | route | distance         |
-            | a    | b  | ab,ab | 8905559m ~0.1% |
+            | a    | b  | ab,ab | 8882574.6m ~0.1% |
 
     Scenario: Approximated Latitudinal distances at longitude 45
         Given the node locations
@@ -68,8 +68,8 @@ Feature: Distance calculation
             | ab    |
 
         When I route I should get
-            | from | to | route | distance       |
+            | from | to | route | distance         |
-            | a    | b  | ab,ab | 8905559m ~0.1% |
+            | a    | b  | ab,ab | 8882574.6m ~0.1% |
 
     Scenario: Approximated Latitudinal distances at longitude 80
         Given the node locations
@@ -83,4 +83,4 @@ Feature: Distance calculation
 
         When I route I should get
             | from | to | route | distance       |
-            | a    | b  | ab,ab | 8905559m ~0.1% |
+            | a    | b  | ab,ab | 8882574.6m ~0.1% |

features/testbot/projection.feature

@@ -23,13 +23,13 @@ Feature: Projection to nearest point on road
 
     Scenario: Projection onto way at high latitudes, 1km distance
         When I route I should get
-            | from | to | route   | bearing       | distance   |
+            | from | to | route   | bearing       | distance     |
-            | b    | a  | abc,abc | 0->225,225->0 | 1000m      |
+            | b    | a  | abc,abc | 0->225,225->0 | 1002.9m      |
-            | b    | c  | abc,abc | 0->45,45->0   | 1000m +- 3 |
+            | b    | c  | abc,abc | 0->45,45->0   | 1005m +- 3   |
-            | a    | d  | abc,abc | 0->45,45->0   | 1000m      |
+            | a    | d  | abc,abc | 0->45,45->0   | 1002.9m      |
-            | d    | a  | abc,abc | 0->225,225->0 | 1000m      |
+            | d    | a  | abc,abc | 0->225,225->0 | 1002.9m      |
-            | c    | d  | abc,abc | 0->225,225->0 | 1000m +- 3 |
+            | c    | d  | abc,abc | 0->225,225->0 | 1005m +- 3   |
-            | d    | c  | abc,abc | 0->45,45->0   | 1000m +- 3 |
+            | d    | c  | abc,abc | 0->45,45->0   | 1005m +- 3   |
 
     Scenario: Projection onto way at high latitudes, no distance
         When I route I should get

features/testbot/traffic_speeds.feature

@@ -48,13 +48,13 @@ Feature: Traffic - speeds
 
         When I route I should get
           | from | to | route       | speed   | weights              | a:datasources |
-          | a    | b  | ad,de,eb,eb | 30 km/h | 1275.7,400.4,378.2,0 | 1:0:0         |
+          | a    | b  | ad,de,eb,eb | 30 km/h | 1273.9,400.8,378.5,0 | 1:0:0         |
-          | a    | c  | ad,dc,dc    | 31 km/h | 1275.7,956.8,0       | 1:0           |
+          | a    | c  | ad,dc,dc    | 31 km/h | 1273.9,955.4,0       | 1:0           |
-          | b    | c  | bc,bc       | 27 km/h | 741.5,0              | 1             |
+          | b    | c  | bc,bc       | 27 km/h | 737.2,0              | 1             |
-          | a    | d  | ad,ad       | 27 km/h | 1275.7,0             | 1             |
+          | a    | d  | ad,ad       | 27 km/h | 1273.9,0             | 1             |
-          | d    | c  | dc,dc       | 36 km/h | 956.8,0              | 0             |
+          | d    | c  | dc,dc       | 36 km/h | 955.4,0              | 0             |
-          | g    | b  | fb,fb       | 36 km/h | 164.7,0              | 0             |
+          | g    | b  | fb,fb       | 36 km/h | 164.4,0              | 0             |
-          | a    | g  | ad,df,fb,fb | 30 km/h | 1295.7,487.5,304.7,0 | 1:0:0         |
+          | a    | g  | ad,df,fb,fb | 30 km/h | 1293.9,486.8,304.3,0 | 1:0:0         |
 
 
     Scenario: Weighting based on speed file weights, ETA based on file durations
@@ -74,13 +74,13 @@ Feature: Traffic - speeds
 
         When I route I should get
           | from | to | route       | speed   | weights              | a:datasources |
-          | a    | b  | ad,de,eb,eb | 30 km/h | 1275.7,400.4,378.2,0 | 1:0:0         |
+          | a    | b  | ad,de,eb,eb | 30 km/h | 1273.9,400.8,378.5,0 | 1:0:0         |
-          | a    | c  | ad,dc,dc    | 31 km/h | 1275.7,956.8,0       | 1:0           |
+          | a    | c  | ad,dc,dc    | 31 km/h | 1273.9,955.4,0       | 1:0           |
-          | b    | c  | bc,bc       | 27 km/h | 741.5,0              | 1             |
+          | b    | c  | bc,bc       | 27 km/h | 737.2,0              | 1             |
-          | a    | d  | ad,ad       | 27 km/h | 1275.7,0             | 1             |
+          | a    | d  | ad,ad       | 27 km/h | 1273.9,0             | 1             |
-          | d    | c  | dc,dc       | 36 km/h | 956.8,0              | 0             |
+          | d    | c  | dc,dc       | 36 km/h | 955.4,0              | 0             |
-          | g    | b  | ab,ab       | 1 km/h  | 10010.4,0            | 1             |
+          | g    | b  | ab,ab       | 1 km/h  | 9951.7,0             | 1             |
-          | a    | g  | ab,ab       | 1 km/h  | 10010.3,0            | 1             |
+          | a    | g  | ab,ab       | 1 km/h  | 9951.7,0             | 1             |
 
 
     Scenario: Weighting based on speed file weights, ETA based on file durations
@@ -106,14 +106,14 @@ Feature: Traffic - speeds
 
         When I route I should get
           | from | to | route       | speed   | weights                  | a:datasources |
-          | a    | b  | ab,ab       | 1 km/h  | 20020.73,0               | 1             |
+          | a    | b  | ab,ab       | 1 km/h  | 19903.37,0               | 1             |
-          | a    | c  | ab,bc,bc    | 2 km/h  | 20020.73,741.51,0        | 1:1           |
+          | a    | c  | ab,bc,bc    | 2 km/h  | 19903.37,737.16,0        | 1:1           |
-          | b    | c  | bc,bc       | 27 km/h | 741.51,0                 | 1             |
+          | b    | c  | bc,bc       | 27 km/h | 737.16,0                 | 1             |
-          | a    | d  | ab,eb,de,de | 2 km/h  | 20020.73,378.17,400.41,0 | 1:0:0         |
+          | a    | d  | ab,eb,de,de | 2 km/h  | 19903.37,378.49,400.75,0 | 1:0:0         |
-          | d    | c  | dc,dc       | 36 km/h | 956.8,0                  | 0             |
+          | d    | c  | dc,dc       | 36 km/h | 955.45,0                 | 0             |
-          | g    | b  | ab,ab       | 1 km/h  | 10010.37,0               | 1             |
+          | g    | b  | ab,ab       | 1 km/h  | 9951.69,0                | 1             |
-          | a    | g  | ab,ab       | 1 km/h  | 10010.36,0               | 1             |
+          | a    | g  | ab,ab       | 1 km/h  | 9951.68,0                | 1             |
-          | g    | a  | ab,ab       | 1 km/h  | 10010.36,0               | 1             |
+          | g    | a  | ab,ab       | 1 km/h  | 9951.68,0                | 1             |
 
 
     Scenario: Speeds that isolate a single node (a)
@@ -136,13 +136,13 @@ Feature: Traffic - speeds
 
         When I route I should get
           | from | to | route    | speed   | weights       | a:datasources | a:speed | a:nodes|
-          | a    | b  | fb,fb    | 36 km/h | 329.4,0       | 0             | 10      | 6:2    |
+          | a    | b  | fb,fb    | 36 km/h | 328.9,0       | 0             | 10      | 6:2    |
-          | a    | c  | fb,bc,bc | 30 km/h | 329.4,741.5,0 | 0:1           | 10:7.5  | 6:2:3  |
+          | a    | c  | fb,bc,bc | 30 km/h | 328.9,737.2,0 | 0:1           | 10:7.5  | 6:2:3  |
-          | b    | c  | bc,bc    | 27 km/h | 741.5,0       | 1             | 7.5     | 2:3    |
+          | b    | c  | bc,bc    | 27 km/h | 737.2,0       | 1             | 7.5     | 2:3    |
-          | a    | d  | fb,df,df | 36 km/h | 140,487.5,0   | 0:0           | 10:10   | 2:6:4  |
+          | a    | d  | fb,df,df | 36 km/h | 139.8,486.8,0 | 0:0           | 10:10   | 2:6:4  |
-          | d    | c  | dc,dc    | 36 km/h | 956.8,0       | 0             | 10      | 4:3    |
+          | d    | c  | dc,dc    | 36 km/h | 955.4,0       | 0             | 10      | 4:3    |
-          | g    | b  | fb,fb    | 36 km/h | 164.7,0       | 0             | 10      | 6:2    |
+          | g    | b  | fb,fb    | 36 km/h | 164.4,0       | 0             | 10      | 6:2    |
-          | a    | g  | fb,fb    | 36 km/h | 164.7,0       | 0             | 10      | 6:2    |
+          | a    | g  | fb,fb    | 36 km/h | 164.5,0       | 0             | 10      | 6:2    |
 
 
     Scenario: Verify that negative values cause an error, they're not valid at all

features/testbot/traffic_turn_penalties.feature

@@ -62,8 +62,8 @@ Feature: Traffic - turn penalties applied to turn onto which a phantom node snap
         When I route I should get
             | from | to | route    | speed    | time    | weights    |
             | a    | e  | ab,be,be | 36 km/h  | 40s +-1 | 16.7,20,0  |
-            | 1    | e  | ab,be,be | 36 km/h  | 30s +-1 | 6.7,20,0   |
+            | 1    | e  | ab,be,be | 36 km/h  | 30s +-1 | 6.8,20,0   |
             | b    | f  | bc,cf,cf | 36 km/h  | 40s +-1 | 20,20,0    |
-            | 2    | f  | bc,cf,cf | 36 km/h  | 30s +-1 | 10,20,0    |
+            | 2    | f  | bc,cf,cf | 36 km/h  | 30s +-1 | 10.1,20,0  |
             | c    | g  | cd,dg,dg | 144 km/h | 10s +-1 | 120.8,20,0 |
-            | 3    | g  | cd,dg,dg | 54 km/h  | 20s +-1 | 110.8,20,0 |
+            | 3    | g  | cd,dg,dg | 54 km/h  | 20s +-1 | 110.9,20,0 |

features/testbot/trip.feature

@@ -221,7 +221,7 @@ Feature: Basic trip planning
 
         When I plan a trip I should get
             |  waypoints  | source | destination |roundtrip | trips  | durations         | distance               |
-            |  a,b,d,e,c  | first  | last        | false    | abedc  | 8.200000000000001 | 81.6                   |
+            |  a,b,d,e,c  | first  | last        | false    | abedc  | 8.200000000000001 | 81.4                   |
 
 
     Scenario: Testbot - Trip: FSE with waypoints (more than 10)

features/testbot/weight.feature

@@ -28,12 +28,12 @@ Feature: Weight tests
             | cde   |
 
         When I route I should get
-            | waypoints | route   | a:weight  |
+            | waypoints | route   | a:weight    |
-            | s,t       | abc,cde | 1.1:2:2:1 |
+            | s,t       | abc,cde | 1.1:2:2:0.9 |
 
         When I route I should get
             | waypoints | route   | times   | weight_name | weights |
-            | s,t       | abc,cde | 6.1s,0s | duration    | 6.1,0   |
+            | s,t       | abc,cde | 6s,0s   | duration    | 6,0     |
 
     # FIXME include/engine/guidance/assemble_geometry.hpp:95
     Scenario: Start and target on the same and adjacent edge
@@ -53,10 +53,10 @@ Feature: Weight tests
 
         When I route I should get
             | waypoints | route   | distances | weights | times   | a:distance          | a:duration | a:weight | a:speed |
-            | s,t       | abc,abc | 20m,0m    | 2.1,0   | 2.1s,0s | 20.017685           | 2.1        | 2.1      | 9.5     |
+            | s,t       | abc,abc | 20m,0m    | 2,0     | 2s,0s   | 20.034627           | 2          | 2        | 10      |
-            | t,s       | abc,abc | 20m,0m    | 2.1,0   | 2.1s,0s | 20.017685           | 2.1        | 2.1      | 9.5     |
+            | t,s       | abc,abc | 20m,0m    | 2,0     | 2s,0s   | 20.034627           | 2          | 2        | 10      |
-            | s,e       | abc,abc | 40m,0m    | 4.1,0   | 4.1s,0s | 30.026527:10.008842 | 3.1:1      | 3.1:1    | 9.7:10  |
+            | s,e       | abc,abc | 40m,0m    | 3.9,0   | 3.9s,0s | 29.940636:10.017313 | 3:0.9      | 3:0.9    | 10:11.1  |
-            | e,s       | abc,abc | 40m,0m    | 4.1,0   | 4.1s,0s | 10.008842:30.026527 | 1:3.1      | 1:3.1    | 10:9.7  |
+            | e,s       | abc,abc | 40m,0m    | 3.9,0   | 3.9s,0s | 10.017313:29.940636 | 0.9:3      | 0.9:3    | 11.1:10  |
 
 
     Scenario: Step weights -- way_function: fail if no weight or weight_per_meter property
@@ -173,13 +173,13 @@ Feature: Weight tests
             | fgh      |
 
         When I route I should get
-            | waypoints | route | distance | weights | times  |
+            | waypoints | route | distance   | weights   | times  |
-            | a,f       | ,     | 100m     | 99.9,0  | 30s,0s |
+            | a,f       | ,     | 100m       | 99.8,0    | 30s,0s |
-            | f,a       | ,     | 100m     | 199.8,0 | 30s,0s |
+            | f,a       | ,     | 100m       | 199.9,0   | 30s,0s |
-            | a,h       | ,     | 140m     | 139.9,0 | 42s,0s |
+            | a,h       | ,     | 140m       | 139.8,0   | 42s,0s |
-            | h,a       | ,     | 140m     | 279.8,0 | 42s,0s |
+            | h,a       | ,     | 140m       | 280.1,0   | 42s,0s |
-            | f,h       | ,     | 40m      | 40,0    | 12s,0s |
+            | f,h       | ,     | 40.1m      | 40,0      | 12s,0s |
-            | h,f       | ,     | 40m      | 80,0    | 12s,0s |
+            | h,f       | ,     | 40.1m      | 80.2,0    | 12s,0s |
 
     Scenario: Step weights -- segment_function
         Given the profile file
@@ -281,11 +281,11 @@ Feature: Weight tests
 
         When I route I should get
             | waypoints | route | distance | weights      | times          |
-            | a,c       | ,     | 40m +-.1 | 5.119,0      | 289.9s,0s      |
+            | a,c       | ,     | 40m +-.1 | 5.12,0       | 290s,0s        |
-            | a,e       | ,,    | 60m +-.1 | 5.119,1.11,0 | 289.9s,100s,0s |
+            | a,e       | ,,    | 60m +-.1 | 5.12,1.11,0  | 290s,100s,0s   |
-            | e,a       | ,,    | 60m +-.1 | 2.21,2.22,0  | 10.1s,200s,0s  |
+            | e,a       | ,,    | 60m +-.1 | 2.21,2.22,0  | 10s,200s,0s    |
-            | e,d       | ,,    | 40m +-.1 | 4.009,1.11,0 | 189.9s,100s,0s |
+            | e,d       | ,,    | 40m +-.1 | 4.01,1.11,0  | 190s,100s,0s   |
-            | d,e       | ,,    | 40m +-.1 | 2.21,1.11,0  | 10.1s,100s,0s  |
+            | d,e       | ,,    | 40m +-.1 | 2.21,1.11,0  | 10s,100s,0s    |
 
     @traffic @speed
     Scenario: Step weights -- segment_function with speed and turn updates
@@ -341,9 +341,9 @@ Feature: Weight tests
 
         When I route I should get
             | waypoints | route | distance | weights   | times        |
-            | a,d       | ,     | 59.9m    | 20.5,0    | 24s,0s       |
+            | a,d       | ,     | 60m      | 20.5,0    | 24s,0s       |
-            | a,e       | ,,    | 60.1m    | 27.2,10,0 | 38.5s,11s,0s |
+            | a,e       | ,,    | 60m      | 27.2,10,0 | 38.5s,11s,0s |
-            | d,e       | ,,    | 39.9m    | 10,10,0   | 11s,11s,0s   |
+            | d,e       | ,,    | 40m      | 10,10,0   | 11s,11s,0s   |
 
     @traffic @speed
     Scenario: Step weights -- segment_function with speed and turn updates with fallback to durations
@@ -375,10 +375,10 @@ Feature: Weight tests
         And the customize extra arguments "--segment-speed-file {speeds_file} --turn-penalty-file {penalties_file}"
 
         When I route I should get
-            | waypoints | route      | distance | weights       | times    |
+            | waypoints | route      | distance | weights        | times    |
-            | a,d       | abcd,abcd  | 59.9m    | 6.996,0       | 7s,0s    |
+            | a,d       | abcd,abcd  | 60m      | 7,0            | 7s,0s    |
-            | a,e       | abcd,ce,ce | 60.1m    | 6.005,2.002,0 | 6s,2s,0s |
+            | a,e       | abcd,ce,ce | 60m      | 5.997,2.001,0  | 6s,2s,0s |
-            | d,e       | abcd,ce,ce | 39.9m    | 1.991,2.002,0 | 2s,2s,0s |
+            | d,e       | abcd,ce,ce | 40m      | 2.003,2.001,0  | 2s,2s,0s |
 
     @traffic @speed
     Scenario: Updating speeds without affecting weights.
@@ -410,5 +410,5 @@ Feature: Weight tests
         And the customize extra arguments "--segment-speed-file {speeds_file}"
 
         When I route I should get
-            | waypoints | route      | distance | weights       | times    |
+            | waypoints | route     | distance | weights  | times    |
-            | a,b       | acdb,acdb  | 78.3m    | 11.744,0      | 56.4s,0s  |
+            | a,b       | acdb,acdb | 78.3m    | 11.742,0 | 56.4s,0s |

fuzz/CMakeLists.txt

@@ -38,8 +38,7 @@ if (ENABLE_FUZZING)
 	  "table_parameters"
 	  "tile_parameters"
 	  "trip_parameters"
-	  "url_parser"
+	  "url_parser")
-	  "request_parser")
 
   foreach (target ${ServerTargets})
 	  add_fuzz_target(${target})

fuzz/request_parser.cc

@@ -1,28 +0,0 @@
-#include "server/request_parser.hpp"
-#include "server/http/request.hpp"
-
-#include "util.hpp"
-
-#include <iterator>
-#include <string>
-
-using osrm::server::RequestParser;
-using osrm::server::http::request;
-
-extern "C" int LLVMFuzzerTestOneInput(const unsigned char *data, unsigned long size)
-{
-    std::string in(reinterpret_cast<const char *>(data), size);
-
-    auto first = begin(in);
-    auto last = end(in);
-
-    RequestParser parser;
-    request req;
-
-    // &(*it) is needed to go from iterator to underlying item to pointer to underlying item
-    parser.parse(req, &(*first), &(*last));
-
-    escape(&req);
-
-    return 0;
-}

include/contractor/contract_excludable_graph.hpp

@@ -18,7 +18,7 @@ inline auto contractFullGraph(ContractorGraph contractor_graph,
                               std::vector<EdgeWeight> node_weights)
 {
     auto num_nodes = contractor_graph.GetNumberOfNodes();
-    contractGraph(contractor_graph, node_weights);
+    contractGraph(contractor_graph, std::move(node_weights));
 
     auto edges = toEdges<QueryEdge>(std::move(contractor_graph));
     std::vector<bool> edge_filter(edges.size(), true);

include/contractor/contractor_config.hpp

@@ -43,10 +43,8 @@ namespace contractor
 struct ContractorConfig final : storage::IOConfig
 {
     ContractorConfig()
-        : IOConfig({".osrm.ebg", ".osrm.ebg_nodes", ".osrm.properties"},
+        : IOConfig(
-                   {},
+              {".osrm.ebg", ".osrm.ebg_nodes", ".osrm.properties"}, {}, {".osrm.hsgr", ".osrm.enw"})
-                   {".osrm.hsgr", ".osrm.enw"}),
-          requested_num_threads(0)
     {
     }
 
@@ -62,16 +60,16 @@ struct ContractorConfig final : storage::IOConfig
     updater::UpdaterConfig updater_config;
 
     // DEPRECATED to be removed in v6.0
-    bool use_cached_priority;
+    bool use_cached_priority = false;
 
-    unsigned requested_num_threads;
+    unsigned requested_num_threads = 0;
 
     // DEPRECATED to be removed in v6.0
     // A percentage of vertices that will be contracted for the hierarchy.
     // Offers a trade-off between preprocessing and query time.
     // The remaining vertices form the core of the hierarchy
     //(e.g. 0.8 contracts 80 percent of the hierarchy, leaving a core of 20%)
-    double core_factor;
+    double core_factor = 1.0;
 };
 } // namespace contractor
 } // namespace osrm

include/contractor/query_graph.hpp

@@ -15,7 +15,7 @@ namespace detail
 {
 template <storage::Ownership Ownership>
 using QueryGraph = util::StaticGraph<typename QueryEdge::EdgeData, Ownership>;
-}
+} // namespace detail
 
 using QueryGraph = detail::QueryGraph<storage::Ownership::Container>;
 using QueryGraphView = detail::QueryGraph<storage::Ownership::View>;

include/engine/api/base_api.hpp

@@ -56,8 +56,8 @@ class BaseAPI
             // TODO: check forward/reverse
             return json::makeWaypoint(
                 phantom.location,
-                util::coordinate_calculation::fccApproximateDistance(phantom.location,
+                util::coordinate_calculation::greatCircleDistance(phantom.location,
-                                                                     phantom.input_location),
+                                                                  phantom.input_location),
                 facade.GetNameForID(facade.GetNameIndex(phantom.forward_segment_id.id)).to_string(),
                 Hint{phantom, facade.GetCheckSum()});
         }
@@ -66,8 +66,8 @@ class BaseAPI
             // TODO: check forward/reverse
             return json::makeWaypoint(
                 phantom.location,
-                util::coordinate_calculation::fccApproximateDistance(phantom.location,
+                util::coordinate_calculation::greatCircleDistance(phantom.location,
-                                                                     phantom.input_location),
+                                                                  phantom.input_location),
                 facade.GetNameForID(facade.GetNameIndex(phantom.forward_segment_id.id))
                     .to_string());
         }
@@ -114,7 +114,7 @@ class BaseAPI
 
         auto waypoint = std::make_unique<fbresult::WaypointBuilder>(*builder);
         waypoint->add_location(&location);
-        waypoint->add_distance(util::coordinate_calculation::fccApproximateDistance(
+        waypoint->add_distance(util::coordinate_calculation::greatCircleDistance(
             phantom.location, phantom.input_location));
         waypoint->add_name(name_string);
         if (parameters.generate_hints)

include/engine/api/match_parameters_tidy.hpp

@@ -122,7 +122,7 @@ inline Result tidy(const MatchParameters &params, Thresholds cfg = {15., 5})
     // Walk over adjacent (coord, ts)-pairs, with rhs being the candidate to discard or keep
     for (std::size_t current = 0, next = 1; next < params.coordinates.size() - 1; ++current, ++next)
     {
-        auto distance_delta = util::coordinate_calculation::haversineDistance(
+        auto distance_delta = util::coordinate_calculation::greatCircleDistance(
             params.coordinates[current], params.coordinates[next]);
         running.distance_in_meters += distance_delta;
         const auto over_distance = running.distance_in_meters >= cfg.distance_in_meters;

include/engine/api/route_api.hpp

@@ -688,7 +688,7 @@ class RouteAPI : public BaseAPI
                     intersection.classes.begin(),
                     intersection.classes.end(),
                     classes.begin(),
-                    [&fb_result](const std::string cls) { return fb_result.CreateString(cls); });
+                    [&fb_result](const std::string &cls) { return fb_result.CreateString(cls); });
                 auto classes_vector = fb_result.CreateVector(classes);
                 auto entry_vector = fb_result.CreateVector(intersection.entry);
 

include/engine/datafacade/contiguous_internalmem_datafacade.hpp

@@ -630,7 +630,7 @@ class ContiguousInternalMemoryDataFacade<CH>
       public ContiguousInternalMemoryAlgorithmDataFacade<CH>
 {
   public:
-    ContiguousInternalMemoryDataFacade(std::shared_ptr<ContiguousBlockAllocator> allocator,
+    ContiguousInternalMemoryDataFacade(const std::shared_ptr<ContiguousBlockAllocator> &allocator,
                                        const std::string &metric_name,
                                        const std::size_t exclude_index)
         : ContiguousInternalMemoryDataFacadeBase(allocator, metric_name, exclude_index),
@@ -752,7 +752,7 @@ class ContiguousInternalMemoryDataFacade<MLD> final
 {
   private:
   public:
-    ContiguousInternalMemoryDataFacade(std::shared_ptr<ContiguousBlockAllocator> allocator,
+    ContiguousInternalMemoryDataFacade(const std::shared_ptr<ContiguousBlockAllocator> &allocator,
                                        const std::string &metric_name,
                                        const std::size_t exclude_index)
         : ContiguousInternalMemoryDataFacadeBase(allocator, metric_name, exclude_index),

include/engine/datafacade/mmap_memory_allocator.hpp

@@ -22,7 +22,7 @@ namespace datafacade
 /**
  * This allocator uses file backed mmap memory block as the data location.
  */
-class MMapMemoryAllocator : public ContiguousBlockAllocator
+class MMapMemoryAllocator final : public ContiguousBlockAllocator
 {
   public:
     explicit MMapMemoryAllocator(const storage::StorageConfig &config);

include/engine/datafacade/process_memory_allocator.hpp

@@ -20,7 +20,7 @@ namespace datafacade
  * This class holds a unique_ptr to the memory block, so it
  * is auto-freed upon destruction.
  */
-class ProcessMemoryAllocator : public ContiguousBlockAllocator
+class ProcessMemoryAllocator final : public ContiguousBlockAllocator
 {
   public:
     explicit ProcessMemoryAllocator(const storage::StorageConfig &config);

include/engine/datafacade/shared_memory_allocator.hpp

@@ -20,7 +20,7 @@ namespace datafacade
  * Many SharedMemoryDataFacade objects can be created that point to the same shared
  * memory block.
  */
-class SharedMemoryAllocator : public ContiguousBlockAllocator
+class SharedMemoryAllocator final : public ContiguousBlockAllocator
 {
   public:
     explicit SharedMemoryAllocator(

include/engine/datafacade_factory.hpp

@@ -65,7 +65,7 @@ template <template <typename A> class FacadeT, typename AlgorithmT> class DataFa
 
         for (const auto &exclude_prefix : exclude_prefixes)
         {
-            auto index_begin = exclude_prefix.find_last_of("/");
+            auto index_begin = exclude_prefix.find_last_of('/');
             BOOST_ASSERT_MSG(index_begin != std::string::npos,
                              "The exclude prefix needs to be a valid data path.");
             std::size_t index =

include/engine/geospatial_query.hpp

@@ -467,11 +467,13 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
         const auto forward_geometry = datafacade.GetUncompressedForwardGeometry(geometry_id);
 
         const auto forward_weight_offset =
+            // NOLINTNEXTLINE(bugprone-fold-init-type)
             std::accumulate(forward_weights.begin(),
                             forward_weights.begin() + data.fwd_segment_position,
                             EdgeWeight{0});
 
         const auto forward_duration_offset =
+            // NOLINTNEXTLINE(bugprone-fold-init-type)
             std::accumulate(forward_durations.begin(),
                             forward_durations.begin() + data.fwd_segment_position,
                             EdgeDuration{0});
@@ -482,7 +484,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
              current < forward_geometry.begin() + data.fwd_segment_position;
              ++current)
         {
-            forward_distance_offset += util::coordinate_calculation::fccApproximateDistance(
+            forward_distance_offset += util::coordinate_calculation::greatCircleDistance(
                 datafacade.GetCoordinateOfNode(*current),
                 datafacade.GetCoordinateOfNode(*std::next(current)));
         }
@@ -492,7 +494,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
 
         EdgeWeight forward_weight = forward_weights[data.fwd_segment_position];
         EdgeDuration forward_duration = forward_durations[data.fwd_segment_position];
-        EdgeDistance forward_distance = util::coordinate_calculation::fccApproximateDistance(
+        EdgeDistance forward_distance = util::coordinate_calculation::greatCircleDistance(
             datafacade.GetCoordinateOfNode(forward_geometry(data.fwd_segment_position)),
             point_on_segment);
 
@@ -512,7 +514,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
              current != std::prev(forward_geometry.end());
              ++current)
         {
-            reverse_distance_offset += util::coordinate_calculation::fccApproximateDistance(
+            reverse_distance_offset += util::coordinate_calculation::greatCircleDistance(
                 datafacade.GetCoordinateOfNode(*current),
                 datafacade.GetCoordinateOfNode(*std::next(current)));
         }
@@ -521,7 +523,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
             reverse_weights[reverse_weights.size() - data.fwd_segment_position - 1];
         EdgeDuration reverse_duration =
             reverse_durations[reverse_durations.size() - data.fwd_segment_position - 1];
-        EdgeDistance reverse_distance = util::coordinate_calculation::fccApproximateDistance(
+        EdgeDistance reverse_distance = util::coordinate_calculation::greatCircleDistance(
             point_on_segment,
             datafacade.GetCoordinateOfNode(forward_geometry(data.fwd_segment_position + 1)));
 
@@ -590,8 +592,8 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
         Coordinate wsg84_coordinate =
             util::web_mercator::toWGS84(segment.fixed_projected_coordinate);
 
-        return util::coordinate_calculation::haversineDistance(input_coordinate, wsg84_coordinate) >
+        return util::coordinate_calculation::greatCircleDistance(input_coordinate,
-               max_distance;
+                                                                 wsg84_coordinate) > max_distance;
     }
 
     std::pair<bool, bool> CheckSegmentExclude(const CandidateSegment &segment) const

include/engine/guidance/assemble_geometry.hpp

@@ -67,7 +67,7 @@ inline LegGeometry assembleGeometry(const datafacade::BaseDataFacade &facade,
     {
         auto coordinate = facade.GetCoordinateOfNode(path_point.turn_via_node);
         current_distance =
-            util::coordinate_calculation::haversineDistance(prev_coordinate, coordinate);
+            util::coordinate_calculation::greatCircleDistance(prev_coordinate, coordinate);
         cumulative_distance += current_distance;
 
         // all changes to this check have to be matched with assemble_steps
@@ -103,7 +103,7 @@ inline LegGeometry assembleGeometry(const datafacade::BaseDataFacade &facade,
         }
     }
     current_distance =
-        util::coordinate_calculation::haversineDistance(prev_coordinate, target_node.location);
+        util::coordinate_calculation::greatCircleDistance(prev_coordinate, target_node.location);
     cumulative_distance += current_distance;
     // segment leading to the target node
     geometry.segment_distances.push_back(cumulative_distance);

include/engine/plugins/plugin_base.hpp

@@ -168,7 +168,7 @@ class BasePlugin
     std::vector<std::vector<PhantomNodeWithDistance>>
     GetPhantomNodesInRange(const datafacade::BaseDataFacade &facade,
                            const api::BaseParameters &parameters,
-                           const std::vector<double> radiuses,
+                           const std::vector<double> &radiuses,
                            bool use_all_edges = false) const
     {
         std::vector<std::vector<PhantomNodeWithDistance>> phantom_nodes(
@@ -190,7 +190,7 @@ class BasePlugin
             {
                 phantom_nodes[i].push_back(PhantomNodeWithDistance{
                     parameters.hints[i]->phantom,
-                    util::coordinate_calculation::haversineDistance(
+                    util::coordinate_calculation::greatCircleDistance(
                         parameters.coordinates[i], parameters.hints[i]->phantom.location),
                 });
                 continue;
@@ -240,7 +240,7 @@ class BasePlugin
             {
                 phantom_nodes[i].push_back(PhantomNodeWithDistance{
                     parameters.hints[i]->phantom,
-                    util::coordinate_calculation::haversineDistance(
+                    util::coordinate_calculation::greatCircleDistance(
                         parameters.coordinates[i], parameters.hints[i]->phantom.location),
                 });
                 continue;

include/engine/routing_algorithms/routing_base.hpp

@@ -336,7 +336,7 @@ void annotatePath(const FacadeT &facade,
 
 template <typename Algorithm>
 double getPathDistance(const DataFacade<Algorithm> &facade,
-                       const std::vector<PathData> unpacked_path,
+                       const std::vector<PathData> &unpacked_path,
                        const PhantomNode &source_phantom,
                        const PhantomNode &target_phantom)
 {
@@ -428,7 +428,7 @@ template <typename FacadeT> EdgeDistance computeEdgeDistance(const FacadeT &faca
     auto geometry_range = facade.GetUncompressedForwardGeometry(geometry_index.id);
     for (auto current = geometry_range.begin(); current < geometry_range.end() - 1; ++current)
     {
-        total_distance += util::coordinate_calculation::fccApproximateDistance(
+        total_distance += util::coordinate_calculation::greatCircleDistance(
             facade.GetCoordinateOfNode(*current), facade.GetCoordinateOfNode(*std::next(current)));
     }
 

include/engine/routing_algorithms/shortest_path_impl.hpp

@@ -304,6 +304,7 @@ InternalRouteResult shortestPathSearch(SearchEngineData<Algorithm> &engine_worki
                 {
                     BOOST_ASSERT(target_phantom.IsValidReverseTarget());
                     new_total_weight_to_reverse = new_total_weight_to_forward;
+                    // NOLINTNEXTLINE(bugprone-use-after-move)
                     packed_leg_to_reverse = std::move(packed_leg_to_forward);
                     new_total_weight_to_forward = INVALID_EDGE_WEIGHT;
 
@@ -354,6 +355,7 @@ InternalRouteResult shortestPathSearch(SearchEngineData<Algorithm> &engine_worki
         {
             bool forward_to_forward =
                 (new_total_weight_to_forward != INVALID_EDGE_WEIGHT) &&
+                // NOLINTNEXTLINE(bugprone-use-after-move)
                 packed_leg_to_forward.front() == source_phantom.forward_segment_id.id;
             bool reverse_to_forward =
                 (new_total_weight_to_forward != INVALID_EDGE_WEIGHT) &&

include/engine/trip/trip_farthest_insertion.hpp

@@ -48,13 +48,14 @@ GetShortestRoundTrip(const NodeID new_loc,
 
         const auto dist_from = dist_table(*from_node, new_loc);
         const auto dist_to = dist_table(new_loc, *to_node);
-        const auto trip_dist = dist_from + dist_to - dist_table(*from_node, *to_node);
-
         // If the edge_weight is very large (INVALID_EDGE_WEIGHT) then the algorithm will not choose
         // this edge in final minimal path. So instead of computing all the permutations after this
         // large edge, discard this edge right here and don't consider the path after this edge.
         if (dist_from == INVALID_EDGE_WEIGHT || dist_to == INVALID_EDGE_WEIGHT)
             continue;
+
+        const auto trip_dist = dist_from + dist_to - dist_table(*from_node, *to_node);
+
         // This is not neccessarily true:
         // Lets say you have an edge (u, v) with duration 100. If you place a coordinate exactly in
         // the middle of the segment yielding (u, v'), the adjusted duration will be 100 * 0.5 = 50.

include/extractor/extraction_relation.hpp

@@ -93,6 +93,10 @@ class ExtractionRelationContainer
     using RelationIDList = std::vector<ExtractionRelation::OsmIDTyped>;
     using RelationRefMap = std::unordered_map<std::uint64_t, RelationIDList>;
 
+    ExtractionRelationContainer() = default;
+    ExtractionRelationContainer(ExtractionRelationContainer &&) = default;
+    ExtractionRelationContainer(const ExtractionRelationContainer &) = delete;
+
     void AddRelation(ExtractionRelation &&rel)
     {
         rel.Prepare();

include/extractor/extractor_config.hpp

@@ -69,8 +69,7 @@ struct ExtractorConfig final : storage::IOConfig
                ".osrm.icd",
                ".osrm.cnbg",
                ".osrm.cnbg_to_ebg",
-               ".osrm.maneuver_overrides"}),
+               ".osrm.maneuver_overrides"})
-          requested_num_threads(0), parse_conditionals(false), use_locations_cache(true)
     {
     }
 
@@ -84,14 +83,12 @@ struct ExtractorConfig final : storage::IOConfig
     std::vector<boost::filesystem::path> location_dependent_data_paths;
     std::string data_version;
 
-    unsigned requested_num_threads;
+    unsigned requested_num_threads = 0;
-    unsigned small_component_size;
+    unsigned small_component_size = 1000;
 
-    bool generate_edge_lookup;
+    bool use_metadata = false;
-
+    bool parse_conditionals = false;
-    bool use_metadata;
+    bool use_locations_cache = true;
-    bool parse_conditionals;
-    bool use_locations_cache;
 };
 } // namespace extractor
 } // namespace osrm

include/extractor/intersection/node_based_graph_walker.hpp

@@ -301,7 +301,7 @@ struct DistanceToNextIntersectionAccumulator
         using namespace util::coordinate_calculation;
 
         const auto coords = extractor.GetForwardCoordinatesAlongRoad(start, onto);
-        distance += getLength(coords.begin(), coords.end(), &haversineDistance);
+        distance += getLength(coords.begin(), coords.end(), &greatCircleDistance);
     }
 
     const extractor::intersection::CoordinateExtractor &extractor;

include/extractor/intersection_bearings_container.hpp

@@ -17,7 +17,7 @@ namespace extractor
 namespace detail
 {
 template <storage::Ownership Ownership> class IntersectionBearingsContainer;
-}
+} // namespace detail
 
 namespace serialization
 {
@@ -46,42 +46,44 @@ template <storage::Ownership Ownership> class IntersectionBearingsContainer
     IntersectionBearingsContainer &operator=(IntersectionBearingsContainer &&) = default;
     IntersectionBearingsContainer &operator=(const IntersectionBearingsContainer &) = default;
 
-    IntersectionBearingsContainer(std::vector<BearingClassID> node_to_class_id_,
+    // NOLINTNEXTLINE(performance-unnecessary-value-param)
+    IntersectionBearingsContainer(std::vector<BearingClassID> node_to_class_id,
                                   const std::vector<util::guidance::BearingClass> &bearing_classes)
-        : node_to_class_id(std::move(node_to_class_id_))
+        : node_to_class_id_(std::move(node_to_class_id))
     {
         std::vector<unsigned> bearing_counts(bearing_classes.size());
         std::transform(bearing_classes.begin(),
                        bearing_classes.end(),
                        bearing_counts.begin(),
                        [](const auto &bearings) { return bearings.getAvailableBearings().size(); });
+        // NOLINTNEXTLINE(bugprone-fold-init-type)
         auto total_bearings = std::accumulate(bearing_counts.begin(), bearing_counts.end(), 0);
-        class_id_to_ranges_table = RangeTable<16>{bearing_counts};
+        class_id_to_ranges_table_ = RangeTable<16>{bearing_counts};
 
-        values.reserve(total_bearings);
+        values_.reserve(total_bearings);
         for (const auto &bearing_class : bearing_classes)
         {
             const auto &bearings = bearing_class.getAvailableBearings();
-            values.insert(values.end(), bearings.begin(), bearings.end());
+            values_.insert(values_.end(), bearings.begin(), bearings.end());
         }
     }
 
-    IntersectionBearingsContainer(Vector<DiscreteBearing> values_,
+    IntersectionBearingsContainer(Vector<DiscreteBearing> values,
-                                  Vector<BearingClassID> node_to_class_id_,
+                                  Vector<BearingClassID> node_to_class_id,
-                                  RangeTable<16> class_id_to_ranges_table_)
+                                  RangeTable<16> class_id_to_ranges_table)
-        : values(std::move(values_)), node_to_class_id(std::move(node_to_class_id_)),
+        : values_(std::move(values)), node_to_class_id_(std::move(node_to_class_id)),
-          class_id_to_ranges_table(std::move(class_id_to_ranges_table_))
+          class_id_to_ranges_table_(std::move(class_id_to_ranges_table))
     {
     }
 
     // Returns the bearing class for an intersection node
     util::guidance::BearingClass GetBearingClass(const NodeID node) const
     {
-        auto class_id = node_to_class_id[node];
+        auto class_id = node_to_class_id_[node];
-        auto range = class_id_to_ranges_table.GetRange(class_id);
+        auto range = class_id_to_ranges_table_.GetRange(class_id);
         util::guidance::BearingClass result;
-        std::for_each(values.begin() + range.front(),
+        std::for_each(values_.begin() + range.front(),
-                      values.begin() + range.back() + 1,
+                      values_.begin() + range.back() + 1,
                       [&](const DiscreteBearing &bearing) { result.add(bearing); });
         return result;
     }
@@ -95,9 +97,9 @@ template <storage::Ownership Ownership> class IntersectionBearingsContainer
                                     const IntersectionBearingsContainer &turn_data_container);
 
   private:
-    Vector<DiscreteBearing> values;
+    Vector<DiscreteBearing> values_;
-    Vector<BearingClassID> node_to_class_id;
+    Vector<BearingClassID> node_to_class_id_;
-    RangeTable<16> class_id_to_ranges_table;
+    RangeTable<16> class_id_to_ranges_table_;
 };
 } // namespace detail
 

include/extractor/maneuver_override_relation_parser.hpp

@@ -10,7 +10,7 @@
 namespace osmium
 {
 class Relation;
-}
+} // namespace osmium
 
 namespace osrm
 {

include/extractor/name_table.hpp

@@ -15,7 +15,7 @@ namespace extractor
 namespace detail
 {
 template <storage::Ownership Ownership> class NameTableImpl;
-}
+} // namespace detail
 
 namespace serialization
 {

include/extractor/node_based_edge.hpp

@@ -192,7 +192,7 @@ inline NodeBasedEdgeWithOSM::NodeBasedEdgeWithOSM(OSMNodeID source,
                     geometry_id,
                     annotation_data,
                     flags),
-      osm_source_id(std::move(source)), osm_target_id(std::move(target))
+      osm_source_id(source), osm_target_id(target)
 {
 }
 

include/extractor/node_data_container.hpp

@@ -24,7 +24,7 @@ class EdgeBasedGraphFactory;
 namespace detail
 {
 template <storage::Ownership Ownership> class EdgeBasedNodeDataContainerImpl;
-}
+} // namespace detail
 
 namespace serialization
 {

include/extractor/packed_osm_ids.hpp

@@ -12,7 +12,7 @@ namespace detail
 {
 template <storage::Ownership Ownership>
 using PackedOSMIDs = util::detail::PackedVector<OSMNodeID, 34, Ownership>;
-}
+} // namespace detail
 
 using PackedOSMIDsView = detail::PackedOSMIDs<storage::Ownership::View>;
 using PackedOSMIDs = detail::PackedOSMIDs<storage::Ownership::Container>;

include/extractor/raster_source.hpp

@@ -18,7 +18,6 @@
 #include <iterator>
 #include <string>
 #include <unordered_map>
-using namespace std;
 
 namespace osrm
 {

include/extractor/restriction.hpp

@@ -186,7 +186,7 @@ struct TurnRestriction
     }
 
     // construction for WayRestrictions
-    explicit TurnRestriction(WayRestriction way_restriction, bool is_only = false)
+    explicit TurnRestriction(const WayRestriction &way_restriction, bool is_only = false)
         : node_or_way(way_restriction), is_only(is_only)
     {
     }

include/extractor/restriction_parser.hpp

@@ -11,7 +11,7 @@
 namespace osmium
 {
 class Relation;
-}
+} // namespace osmium
 
 namespace osrm
 {

include/extractor/scripting_environment.hpp

@@ -26,7 +26,7 @@ namespace osrm
 namespace util
 {
 struct Coordinate;
-}
+} // namespace util
 
 namespace extractor
 {

include/extractor/scripting_environment_lua.hpp

@@ -12,7 +12,7 @@
 #include <mutex>
 #include <string>
 
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 namespace osrm
 {

include/extractor/segment_data_container.hpp

@@ -27,7 +27,7 @@ class CompressedEdgeContainer;
 namespace detail
 {
 template <storage::Ownership Ownership> class SegmentDataContainerImpl;
-}
+} // namespace detail
 
 namespace serialization
 {

include/extractor/serialization.hpp

@@ -30,11 +30,11 @@ inline void read(storage::tar::FileReader &reader,
                  const std::string &name,
                  detail::IntersectionBearingsContainer<Ownership> &intersection_bearings)
 {
-    storage::serialization::read(reader, name + "/bearing_values", intersection_bearings.values);
+    storage::serialization::read(reader, name + "/bearing_values", intersection_bearings.values_);
     storage::serialization::read(
-        reader, name + "/node_to_class_id", intersection_bearings.node_to_class_id);
+        reader, name + "/node_to_class_id", intersection_bearings.node_to_class_id_);
     util::serialization::read(
-        reader, name + "/class_id_to_ranges", intersection_bearings.class_id_to_ranges_table);
+        reader, name + "/class_id_to_ranges", intersection_bearings.class_id_to_ranges_table_);
 }
 
 template <storage::Ownership Ownership>
@@ -42,11 +42,11 @@ inline void write(storage::tar::FileWriter &writer,
                   const std::string &name,
                   const detail::IntersectionBearingsContainer<Ownership> &intersection_bearings)
 {
-    storage::serialization::write(writer, name + "/bearing_values", intersection_bearings.values);
+    storage::serialization::write(writer, name + "/bearing_values", intersection_bearings.values_);
     storage::serialization::write(
-        writer, name + "/node_to_class_id", intersection_bearings.node_to_class_id);
+        writer, name + "/node_to_class_id", intersection_bearings.node_to_class_id_);
     util::serialization::write(
-        writer, name + "/class_id_to_ranges", intersection_bearings.class_id_to_ranges_table);
+        writer, name + "/class_id_to_ranges", intersection_bearings.class_id_to_ranges_table_);
 }
 
 // read/write for properties file

include/guidance/motorway_handler.hpp

@@ -18,7 +18,7 @@ namespace guidance
 {
 
 // Intersection handlers deal with all issues related to intersections.
-class MotorwayHandler : public IntersectionHandler
+class MotorwayHandler final : public IntersectionHandler
 {
   public:
     MotorwayHandler(const util::NodeBasedDynamicGraph &node_based_graph,

include/guidance/roundabout_handler.hpp

@@ -35,7 +35,7 @@ struct RoundaboutFlags
 // The roundabout handler processes all roundabout related instructions.
 // It performs both the distinction between rotaries and roundabouts and
 // assigns appropriate entry/exit instructions.
-class RoundaboutHandler : public IntersectionHandler
+class RoundaboutHandler final : public IntersectionHandler
 {
   public:
     RoundaboutHandler(const util::NodeBasedDynamicGraph &node_based_graph,

include/guidance/segregated_intersection_classification.hpp

@@ -9,7 +9,7 @@ namespace osrm
 namespace extractor
 {
 class NodeBasedGraphFactory;
-}
+} // namespace extractor
 
 namespace guidance
 {

include/guidance/turn_bearing.hpp

@@ -9,15 +9,12 @@ namespace osrm
 {
 namespace guidance
 {
-namespace
-{
-const double bearing_scale = 360.0 / 256.0;
-}
 
 #pragma pack(push, 1)
 class TurnBearing
 {
   public:
+    static constexpr double bearing_scale = 360.0 / 256.0;
     // discretizes a bearing into distinct units of 1.4 degrees
     TurnBearing(const double value = 0) : bearing(value / bearing_scale)
     {

include/guidance/turn_data_container.hpp

@@ -19,7 +19,7 @@ namespace guidance
 namespace detail
 {
 template <storage::Ownership Ownership> class TurnDataContainerImpl;
-}
+} // namespace detail
 
 namespace serialization
 {

include/guidance/turn_handler.hpp

@@ -23,7 +23,7 @@ namespace guidance
 {
 
 // Intersection handlers deal with all issues related to intersections.
-class TurnHandler : public IntersectionHandler
+class TurnHandler final : public IntersectionHandler
 {
   public:
     TurnHandler(const util::NodeBasedDynamicGraph &node_based_graph,

include/guidance/turn_lane_data.hpp

@@ -28,7 +28,7 @@ typedef std::vector<TurnLaneData> LaneDataVector;
 
 // convertes a string given in the OSM format into a TurnLaneData vector
 OSRM_ATTR_WARN_UNUSED
-LaneDataVector laneDataFromDescription(extractor::TurnLaneDescription turn_lane_description);
+LaneDataVector laneDataFromDescription(const extractor::TurnLaneDescription &turn_lane_description);
 
 // Locate A Tag in a lane data vector (if multiple tags are set, the first one found is returned)
 LaneDataVector::const_iterator findTag(const extractor::TurnLaneType::Mask tag,

include/guidance/turn_lane_handler.hpp

@@ -52,15 +52,6 @@ typedef enum TurnLaneScenario
     NUM_SCENARIOS
 } TurnLaneScenario;
 
-const constexpr char *scenario_names[] = {"Simple",
-                                          "Partition Local",
-                                          "Simple Previous",
-                                          "Partition Previous",
-                                          "Sliproad",
-                                          "Merge",
-                                          "None",
-                                          "Invalid",
-                                          "Unknown"};
 } // namespace
 
 class TurnLaneHandler
@@ -150,9 +141,6 @@ class TurnLaneHandler
                          LaneDataVector &lane_data) const;
 };
 
-static_assert(sizeof(scenario_names) / sizeof(*scenario_names) == TurnLaneScenario::NUM_SCENARIOS,
-              "Number of scenarios needs to match the number of scenario names.");
-
 } // namespace lanes
 } // namespace guidance
 } // namespace osrm