3317 changed files with 126850 additions and 491320 deletions
--- a/.babelrc
+++ b/.babelrc
@ -1,7 +1,7 @@
 {
    "plugins": ["transform-class-properties"],
    "presets": [
-        "@babel/preset-env",
+        "stage-0",
-        "@babel/preset-react"
+        "es2015",
        "react"
    ]
 }
--- a/.clang-tidy
+++ b/.clang-tidy
@ -1,101 +1,4 @@
 ---
-Checks: >
+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'
-    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,
    -bugprone-throw-keyword-missing,
    -bugprone-chained-comparison,
    -bugprone-incorrect-enable-if,
    -bugprone-switch-missing-default-case,
    -bugprone-empty-catch,
    -bugprone-unchecked-optional-access,
    -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-const-correctness,
    -misc-non-private-member-variables-in-classes,
    -misc-unconventional-assign-operator,
    -misc-no-recursion,
    -misc-misplaced-const,
    -misc-definitions-in-headers,
    -misc-unused-parameters,
    -misc-include-cleaner,
    modernize-concat-nested-namespaces,
    modernize-use-using,
    performance-*,
    -performance-no-int-to-ptr,
    -performance-enum-size,
    -performance-avoid-endl,
    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-identifier-length,
    -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-redundant-inline-specifier,
    -readability-avoid-nested-conditional-operator,
    -readability-avoid-return-with-void-value,
    -readability-redundant-casting,
    -readability-static-accessed-through-instance
 WarningsAsErrors: '*'
 HeaderFilterRegex: '.*'
--- a/.dockerignore
+++ b/.dockerignore
@ -1,2 +0,0 @@
 test
 build
--- a/.editorconfig
+++ b/.editorconfig
@ -1,30 +0,0 @@
 # EditorConfig is awesome: http://EditorConfig.org
 #
 # NOTE: Keep settings in sync with the master .clang-format file
 #
 # top-most EditorConfig file
 root = true
 # CMake configuration files
 [{CMakeLists.txt,CMakeSettings.json,*.cmake}]
 indent_size = 2
 indent_style = space
 trim_trailing_whitespace = true
 # CI configuration files
 [{.travis.yml,appveyor.yml}]
 indent_size = 2
 indent_style = space
 trim_trailing_whitespace = true
 # Unix shell scripts
 [*.sh]
 end_of_line = lf
 indent_style = space
 trim_trailing_whitespace = true
 # Windows shell scripts
 [*.bat]
 end_of_line = crlf
 indent_style = space
 trim_trailing_whitespace = true
--- a/.eslintignore
+++ b/.eslintignore
@ -1,2 +0,0 @@
 features/support/flatbuffers.js
 features/support/fbresult_generated.js
--- a/.gitattributes
+++ b/.gitattributes
@ -1,18 +0,0 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
 * text=auto
 # Explicitly declare text files you want to always be normalized and converted
 # to native line endings on checkout.
 *.cpp text
 *.hpp text
 # Declare files that will always have CRLF line endings on checkout.
 *.bat text eol=crlf
 *.cmd text eol=crlf
 *.ps1 text eol=crlf
 # Declare files that will always have LF line endings on checkout.
 *.sh text eol=lf
 # https://eslint.org/docs/latest/rules/linebreak-style#using-this-rule-with-version-control-systems
 *.js text eol=lf
--- a/.gitea/workflows/publish-container.yaml
+++ b/.gitea/workflows/publish-container.yaml
@ -1,65 +0,0 @@
 name: Build and Publish Docker Image
 on:
  release:
    types: [published, prereleased]
 env:
  IMAGE_NAME: openharbor/osrm-backend
 jobs:
  publish:
    strategy:
      matrix:
        docker-base-image: ["debian", "alpine"]
    runs-on: ubuntu-latest
    steps:
      - name: Check out the repo
        uses: actions/checkout@v3
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v2
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v2
      - name: Docker meta
        id: meta
        uses: docker/metadata-action@v4
        with:
          images: ${{ env.IMAGE_NAME }}
      - name: Docker meta - debug
        id: metadebug
        uses: docker/metadata-action@v4
        with:
          images: ${{ env.IMAGE_NAME }}
          flavor: |
            latest=true
            suffix=-debug,onlatest=true
      - name: Log in to DockerHub
        uses: docker/login-action@v2
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
      - name: Build and push debug image
        uses: docker/build-push-action@v4
        with:
          push: true
          platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/riscv64
          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
          tags: ${{ steps.metadebug.outputs.tags }}
          build-args: |
            DOCKER_TAG=${{ join(steps.metadebug.outputs.tags) }}-${{ matrix.docker-base-image }}
      - name: Build and push normal image
        uses: docker/build-push-action@v4
        with:
          push: true
          platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/riscv64
          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
          tags: ${{ steps.meta.outputs.tags }}
          build-args: |
            DOCKER_TAG=${{ join(steps.meta.outputs.tags) }}-${{ matrix.docker-base-image }}
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,30 +0,0 @@
 ---
 name: Bug Report
 about: Report issue with osrm-backend
 labels: Bug Report
 ---
 # Issue
 Please describe the issue you are seeing with OSRM.
 Images are a good way to illustrate your problem.
 **Note**: If your issue relates to the demo site (https://map.project-osrm.org) or routing provided on openstreetmap.org, be aware that they use separate [profile settings](https://github.com/fossgis-routing-server/cbf-routing-profiles) from those provided by default in `osrm-backend`.
 If your issue relates to the demo site or openstreetmap.org behaviour, please check these profiles first to see if they explain the behaviour before creating an issue here.
 # Steps to reproduce
 Please provide the steps required to reproduce your problem.
 - `osrm-backend` version being used
 - OSM extract that was processed
 - Processing commands (e.g. CH vs MLD processing)
 - Server queries
 If you're reporting an issue with https://map.project-osrm.org, please provide a link to the problematic request.
 # Specifications
 Please provide details of your development environment.
 - Library/dependency versions
 - Operating system
 - Hardware
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@ -1,10 +0,0 @@
 ---
 name: Feature Request
 about: Request a new feature in osrm-backend
 labels: Feature Request
 ---
 # Feature
 Please describe the feature you would like to see in OSRM.
 Images are often a good way to illustrate your requested feature.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -2,18 +2,12 @@
 What issue is this PR targeting? If there is no issue that addresses the problem, please open a corresponding issue and link it here.
 Please read our [documentation](https://github.com/Project-OSRM/osrm-backend/blob/master/docs/releasing.md) on release and version management.
 If your PR is still work in progress please attach the relevant label.
 ## Tasklist
-
+ - [ ] ADD OWN TASKS HERE
 - [ ] 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 regression / cucumber cases (see docs/testing.md)
 - [ ] review
 - [ ] adjust for comments
 - [ ] cherry pick to release branch
 ## Requirements / Relations
 Link any requirements here. Other pull requests this PR is based on?
--- a/.github/workflows/osrm-backend-docker.yml
+++ b/.github/workflows/osrm-backend-docker.yml
@ -1,84 +0,0 @@
 name: build and publish container image
 on:
  push:
    tags:
      - 'v*'
 jobs:
  publish:
    strategy:
      matrix:
        docker-base-image: ["debian", "alpine"]
    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-${{ matrix.docker-base-image }}
          tags: ${{ steps.metadebug.outputs.tags  }}
          build-args: |
            DOCKER_TAG=${{ join(steps.metadebug.outputs.tags ) }}-${{ matrix.docker-base-image }}
      - name: Build container image - assertions
        uses: docker/build-push-action@v2
        with:
          push: true
          platforms: linux/amd64,linux/arm64
          file: ./docker/Dockerfile-${{ matrix.docker-base-image }}
          tags: ${{ steps.metaassertions.outputs.tags  }}
          build-args: |
            DOCKER_TAG=${{ join(steps.metaassertions.outputs.tags ) }}-${{ matrix.docker-base-image }}
      # 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-${{ matrix.docker-base-image }}
          tags: ${{ steps.meta.outputs.tags  }}
          build-args: |
            DOCKER_TAG=${{ join(steps.meta.outputs.tags ) }}-${{ matrix.docker-base-image }}
--- a/.github/workflows/osrm-backend.yml
+++ b/.github/workflows/osrm-backend.yml
@ -1,786 +0,0 @@
 name: osrm-backend CI
 on:
  push:
    branches:
      - master
    tags:
      - v[1-9]+.[0-9]+.[0-9]+
      - v[1-9]+.[0-9]+.[0-9]+-[a-zA-Z]+.[0-9]+
      - v[1-9]+.[0-9]+-[0-9a-zA-Z]+
  pull_request:
    branches:
      - master
 env:
  CCACHE_TEMPDIR: /tmp/.ccache-temp
  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
  CMAKE_VERSION: 3.21.2
  ENABLE_NODE_BINDINGS: "ON"
 concurrency:
  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true
 jobs:
  windows-release-node:
    needs: format-taginfo-docs
    runs-on: windows-2022
    continue-on-error: false
    env:
      BUILD_TYPE: Release
    steps:
    - uses: actions/checkout@v4
    - run: pip install "conan<2.0.0"
    - run: conan --version
    - run: cmake --version
    - uses: actions/setup-node@v4
      with:
        node-version: 18
    - run: node --version
    - run: npm --version
    - name: Prepare environment
      shell: bash
      run: |
        PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)")
        echo PUBLISH=$([[ "${GITHUB_REF:-}" == "refs/tags/v${PACKAGE_JSON_VERSION}" ]] && echo "On" || echo "Off") >> $GITHUB_ENV
    - run: npm install --ignore-scripts
    - run: npm link --ignore-scripts
    - name: Build
      shell: bash
      run: |
        mkdir build
        cd build
        cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON ..
        cmake --build . --config Release
    # TODO: MSVC goes out of memory when building our tests
    # - name: Run tests
    #   shell: bash
    #   run: |
    #     cd build
    #     cmake --build . --config Release --target tests
    #     # TODO: run tests
    # - name: Run node tests
    #   shell: bash
    #   run: |
    #     ./lib/binding/osrm-extract.exe -p profiles/car.lua test/data/monaco.osm.pbf
    #     mkdir -p test/data/ch
    #     cp test/data/monaco.osrm* test/data/ch/
    #     ./lib/binding/osrm-contract.exe test/data/ch/monaco.osrm
    #     ./lib/binding/osrm-datastore.exe test/data/ch/monaco.osrm
    #     node test/nodejs/index.js
    - name: Build Node package
      shell: bash
      run: ./scripts/ci/node_package.sh
    - name: Publish Node package
      if: ${{ env.PUBLISH == 'On' }}
      uses: ncipollo/release-action@v1
      with:
        allowUpdates: true
        artifactErrorsFailBuild: true
        artifacts: build/stage/**/*.tar.gz
        omitBody: true
        omitBodyDuringUpdate: true
        omitName: true
        omitNameDuringUpdate: true
        replacesArtifacts: true
        token: ${{ secrets.GITHUB_TOKEN }}
  format-taginfo-docs:
    runs-on: ubuntu-22.04
    steps:
    - uses: actions/checkout@v4
    - name: Use Node.js
      uses: actions/setup-node@v4
      with:
        node-version: 18
    - name: Enable Node.js cache
      uses: actions/cache@v4
      with:
        path: ~/.npm
        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
        restore-keys: |
          ${{ runner.os }}-node-
    - name: Prepare environment
      run: |
        npm ci --ignore-scripts
        clang-format-15 --version
    - name: Run checks
      run: |
        ./scripts/check_taginfo.py taginfo.json profiles/car.lua
        ./scripts/format.sh && ./scripts/error_on_dirty.sh
        node ./scripts/validate_changelog.js
        npm run docs && ./scripts/error_on_dirty.sh
        npm audit --production
  docker-image-matrix:
    strategy:
      matrix:
        docker-base-image: ["debian", "alpine"]
    needs: format-taginfo-docs
    runs-on: ubuntu-22.04
    continue-on-error: false
    steps:
      - name: Check out the repo
        uses: actions/checkout@v4
      - name: Enable osm.pbf cache
        uses: actions/cache@v4
        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-${{ matrix.docker-base-image }} .
      - 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 --dump-nbg-graph -p /opt/car.lua /data/berlin-latest.osm.pbf
          docker run $MEMORY_ARGS -t -v "${PWD}:/data" "${TAG}" osrm-components /data/berlin-latest.osrm.nbg /data/berlin-latest.geojson
          if [ ! -s "${PWD}/berlin-latest.geojson" ]
          then
            >&2 echo "No berlin-latest.geojson found"
            exit 1
          fi
          # removing `.osrm.nbg` to check that whole pipeline works without it
          rm -rf "${PWD}/berlin-latest.osrm.nbg"
          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-13-debug-cov
            continue-on-error: false
            node: 20
            runs-on: ubuntu-24.04
            BUILD_TOOLS: ON
            BUILD_TYPE: Debug
            CCOMPILER: gcc-13
            CUCUMBER_TIMEOUT: 20000
            CXXCOMPILER: g++-13
            ENABLE_COVERAGE: ON
          - name: clang-18-debug-asan-ubsan
            continue-on-error: false
            node: 20
            runs-on: ubuntu-24.04
            BUILD_TOOLS: ON
            BUILD_TYPE: Debug
            CCOMPILER: clang-18
            CUCUMBER_TIMEOUT: 20000
            CXXCOMPILER: clang++-18
            ENABLE_SANITIZER: ON
            TARGET_ARCH: x86_64-asan-ubsan
            OSRM_CONNECTION_RETRIES: 10
            OSRM_CONNECTION_EXP_BACKOFF_COEF: 1.5
          - name: clang-18-release
            continue-on-error: false
            node: 18
            runs-on: ubuntu-24.04
            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: clang-18
            CXXCOMPILER: clang++-18
            CUCUMBER_TIMEOUT: 60000
            ENABLE_LTO: OFF
          - name: clang-18-debug
            continue-on-error: false
            node: 18
            runs-on: ubuntu-24.04
            BUILD_TOOLS: ON
            BUILD_TYPE: Debug
            CCOMPILER: clang-18
            CXXCOMPILER: clang++-18
            CUCUMBER_TIMEOUT: 60000
            ENABLE_LTO: OFF
          - name: clang-18-debug-clang-tidy
            continue-on-error: false
            node: 18
            runs-on: ubuntu-24.04
            BUILD_TOOLS: ON
            BUILD_TYPE: Debug
            CCOMPILER: clang-18
            CXXCOMPILER: clang++-18
            CUCUMBER_TIMEOUT: 60000
            ENABLE_CLANG_TIDY: ON
          - name: clang-17-release
            continue-on-error: false
            node: 18
            runs-on: ubuntu-24.04
            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: clang-17
            CXXCOMPILER: clang++-17
            CUCUMBER_TIMEOUT: 60000
            ENABLE_LTO: OFF
          - name: clang-16-release
            continue-on-error: false
            node: 18
            runs-on: ubuntu-24.04
            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: clang-16
            CXXCOMPILER: clang++-16
            CUCUMBER_TIMEOUT: 60000
            ENABLE_LTO: OFF
          - name: conan-linux-debug-asan-ubsan
            continue-on-error: false
            node: 18
            runs-on: ubuntu-24.04
            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: clang-18
            CXXCOMPILER: clang++-18
            ENABLE_CONAN: ON
            ENABLE_SANITIZER: ON
            ENABLE_LTO: OFF
          - name: conan-linux-release
            continue-on-error: false
            node: 18
            runs-on: ubuntu-24.04
            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: clang-18
            CXXCOMPILER: clang++-18
            ENABLE_CONAN: ON
            ENABLE_LTO: OFF
          - name: gcc-14-release
            continue-on-error: false
            node: 20
            runs-on: ubuntu-24.04
            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: gcc-14
            CXXCOMPILER: g++-14
            CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized'
          - name: gcc-13-release
            continue-on-error: false
            node: 20
            runs-on: ubuntu-24.04
            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: gcc-13
            CXXCOMPILER: g++-13
            CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized'
          - name: gcc-12-release
            continue-on-error: false
            node: 20
            runs-on: ubuntu-22.04
            BUILD_TOOLS: ON
            BUILD_TYPE: Release
            CCOMPILER: gcc-12
            CXXCOMPILER: g++-12
            CXXFLAGS: '-Wno-array-bounds -Wno-uninitialized'
          - name: conan-linux-release-node
            build_node_package: true
            continue-on-error: false
            node: 20
            runs-on: ubuntu-24.04
            BUILD_TYPE: Release
            CCOMPILER: clang-16
            CXXCOMPILER: clang++-16
            ENABLE_CONAN: ON
            NODE_PACKAGE_TESTS_ONLY: ON
          - name: conan-linux-debug-node
            build_node_package: true
            continue-on-error: false
            node: 20
            runs-on: ubuntu-24.04
            BUILD_TYPE: Debug
            CCOMPILER: clang-16
            CXXCOMPILER: clang++-16
            ENABLE_CONAN: ON
            NODE_PACKAGE_TESTS_ONLY: ON
          - name: conan-macos-x64-release-node
            build_node_package: true
            continue-on-error: true
            node: 20
            runs-on: macos-13 # x86_64
            BUILD_TYPE: Release
            CCOMPILER: clang
            CXXCOMPILER: clang++
            CUCUMBER_TIMEOUT: 60000
            ENABLE_ASSERTIONS: ON
            ENABLE_CONAN: ON
          - name: conan-macos-arm64-release-node
            build_node_package: true
            continue-on-error: true
            node: 20
            runs-on: macos-14 # arm64 
            BUILD_TYPE: Release
            CCOMPILER: clang
            CXXCOMPILER: clang++
            CUCUMBER_TIMEOUT: 60000
            ENABLE_ASSERTIONS: ON
            ENABLE_CONAN: ON
    name: ${{ matrix.name}}
    continue-on-error: ${{ matrix.continue-on-error }}
    runs-on: ${{ matrix.runs-on }}
    env:
      BUILD_TOOLS: ${{ matrix.BUILD_TOOLS }}
      BUILD_TYPE: ${{ matrix.BUILD_TYPE }}
      BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS }}
      CCOMPILER: ${{ matrix.CCOMPILER }}
      CFLAGS: ${{ matrix.CFLAGS }}
      CUCUMBER_TIMEOUT: ${{ matrix.CUCUMBER_TIMEOUT }}
      CXXCOMPILER: ${{ matrix.CXXCOMPILER }}
      CXXFLAGS: ${{ matrix.CXXFLAGS }}
      ENABLE_ASSERTIONS: ${{ matrix.ENABLE_ASSERTIONS }}
      ENABLE_CLANG_TIDY: ${{ matrix.ENABLE_CLANG_TIDY }}
      ENABLE_COVERAGE: ${{ matrix.ENABLE_COVERAGE }}
      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 }}
      ENABLE_LTO: ${{ matrix.ENABLE_LTO }}
    steps:
    - uses: actions/checkout@v4
    - name: Build machine architecture
      run: uname -m
    - name: Use Node.js
      uses: actions/setup-node@v4
      with:
        node-version: ${{ matrix.node }}
    - name: Enable Node.js cache
      uses: actions/cache@v4
      with:
        path: ~/.npm
        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
        restore-keys: |
          ${{ runner.os }}-node-
    - name: Enable compiler cache
      uses: actions/cache@v4
      with:
        path: ~/.ccache
        key: ccache-${{ matrix.name }}-${{ github.sha }}
        restore-keys: |
          ccache-${{ matrix.name }}-
    - name: Enable Conan cache
      uses: actions/cache@v4
      with:
        path: ~/.conan
        key: v9-conan-${{ matrix.name }}-${{ github.sha }}
        restore-keys: |
          v9-conan-${{ matrix.name }}-
    - name: Enable test cache
      uses: actions/cache@v4
      with:
        path: ${{github.workspace}}/test/cache
        key: v4-test-${{ matrix.name }}-${{ github.sha }}
        restore-keys: |
          v4-test-${{ matrix.name }}-
    - name: Prepare environment
      run: |
        echo "CCACHE_DIR=$HOME/.ccache" >> $GITHUB_ENV
        mkdir -p $HOME/.ccache
        PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)")
        echo PUBLISH=$([[ "${GITHUB_REF:-}" == "refs/tags/v${PACKAGE_JSON_VERSION}" ]] && echo "On" || echo "Off") >> $GITHUB_ENV
        echo "OSRM_INSTALL_DIR=${GITHUB_WORKSPACE}/install-osrm" >> $GITHUB_ENV
        echo "OSRM_BUILD_DIR=${GITHUB_WORKSPACE}/build-osrm" >> $GITHUB_ENV
        if [[ "$ENABLE_SANITIZER" == 'ON' ]]; then
          # We can only set this after checkout once we know the workspace directory
          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
          echo "ASAN_OPTIONS=print_suppressions=0:suppressions=${GITHUB_WORKSPACE}/scripts/ci/addresssanitizer.conf" >> $GITHUB_ENV
        fi
        if [[ "${RUNNER_OS}" == "Linux" ]]; then
          echo "JOBS=$((`nproc` + 1))" >>  $GITHUB_ENV
        elif [[ "${RUNNER_OS}" == "macOS" ]]; then
          echo "JOBS=$((`sysctl -n hw.ncpu` + 1))" >>  $GITHUB_ENV
        fi
    # See: https://github.com/actions/toolkit/issues/946#issuecomment-1590016041
    # We need it to be able to access system folders while restoring cached Boost below
    - name: Give tar root ownership 
      if: runner.os == 'Linux' && matrix.ENABLE_CONAN != 'ON'
      run: sudo chown root /bin/tar && sudo chmod u+s /bin/tar
    - name: Cache Boost
      if: runner.os == 'Linux' && matrix.ENABLE_CONAN != 'ON'
      id: cache-boost
      uses: actions/cache@v4
      with:
        path: |
          /usr/local/include/boost
          /usr/local/lib/libboost*
        key: v1-boost-${{ runner.os }}-${{ runner.arch }}-${{ matrix.runs-on }}
        restore-keys: |
          v1-boost-${{ runner.os }}-${{ runner.arch }}-${{ matrix.runs-on }}
    - name: Install Boost
      if: steps.cache-boost.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ENABLE_CONAN != 'ON'
      run: |
        BOOST_VERSION="1.85.0"
        BOOST_VERSION_FLAVOR="${BOOST_VERSION}-b2-nodocs"
        wget -q https://github.com/boostorg/boost/releases/download/boost-${BOOST_VERSION}/boost-${BOOST_VERSION_FLAVOR}.tar.gz
        tar xzf boost-${BOOST_VERSION_FLAVOR}.tar.gz
        cd boost-${BOOST_VERSION}
        sudo ./bootstrap.sh
        sudo ./b2 install
        cd ..
        sudo rm -rf boost-${BOOST_VERSION}*
    - name: Install dev dependencies
      run: |
        python3 -m pip install "conan<2.0.0" || python3 -m pip install "conan<2.0.0" --break-system-packages
        # workaround for issue that GitHub Actions seems to not adding it to PATH after https://github.com/actions/runner-images/pull/6499
        # and that's why CI cannot find conan executable installed above
        if [[ "${RUNNER_OS}" == "macOS" ]]; then
          echo "/Library/Frameworks/Python.framework/Versions/Current/bin" >> $GITHUB_PATH
        fi
        # ccache
        if [[ "${RUNNER_OS}" == "Linux" ]]; then
          sudo apt-get update -y && sudo apt-get install ccache
        elif [[ "${RUNNER_OS}" == "macOS" ]]; then
          brew install ccache
        fi
        # Linux dev packages
        if [ "${ENABLE_CONAN}" != "ON" ]; then
          sudo apt-get update -y
          sudo apt-get install -y libbz2-dev libxml2-dev libzip-dev liblua5.2-dev
          if [[ "${CCOMPILER}" != clang-* ]]; then
            sudo apt-get install -y ${CXXCOMPILER}
          fi
          if [[ "${ENABLE_COVERAGE}" == "ON" ]]; then
            sudo apt-get install -y lcov
          fi
        fi
        # TBB
        TBB_VERSION=2021.12.0
        if [[ "${RUNNER_OS}" == "Linux" ]]; then
          TBB_URL="https://github.com/oneapi-src/oneTBB/releases/download/v${TBB_VERSION}/oneapi-tbb-${TBB_VERSION}-lin.tgz"
        elif [[ "${RUNNER_OS}" == "macOS" ]]; then
          TBB_URL="https://github.com/oneapi-src/oneTBB/releases/download/v${TBB_VERSION}/oneapi-tbb-${TBB_VERSION}-mac.tgz"
        fi
        wget --tries 5 ${TBB_URL} -O onetbb.tgz
        tar zxvf onetbb.tgz
        sudo cp -a oneapi-tbb-${TBB_VERSION}/lib/. /usr/local/lib/
        sudo cp -a oneapi-tbb-${TBB_VERSION}/include/. /usr/local/include/
    - name: Add Clang 18 to list of Conan compilers # workaround for the issue that Conan 1.x doesn't know about Clang 18
      if: ${{ matrix.ENABLE_CONAN == 'ON' && matrix.CCOMPILER == 'clang-18' }}
      run: |
        sudo wget https://github.com/mikefarah/yq/releases/download/v4.9.6/yq_linux_amd64 -O /usr/bin/yq && sudo chmod +x /usr/bin/yq
        conan config init
        yq eval '.compiler.clang.version += ["18"]' -i "$HOME/.conan/settings.yml"
    - name: Add Apple-clang 16 to list of Conan compilers # workaround for the issue that Conan 1.x doesn't know about Apple-clang 16
      if: ${{ matrix.ENABLE_CONAN == 'ON' && matrix.runs-on == 'macos-14' }}
      run: |
        sudo wget https://github.com/mikefarah/yq/releases/download/v4.9.6/yq_darwin_arm64 -O /usr/local/bin/yq && sudo chmod +x /usr/local/bin/yq
        conan config init
        yq eval '.compiler.apple-clang.version += ["16.0"]' -i "$HOME/.conan/settings.yml"
    - name: Prepare build
      run: |
        mkdir ${OSRM_BUILD_DIR}
        ccache --max-size=256M
        npm ci --ignore-scripts
        if [[ "${ENABLE_COVERAGE}" == "ON" ]]; then
          lcov --directory . --zerocounters # clean cached files
        fi
        echo "CC=${CCOMPILER}" >> $GITHUB_ENV
        echo "CXX=${CXXCOMPILER}" >> $GITHUB_ENV
        if [[ "${RUNNER_OS}" == "macOS" ]]; then
          # missing from GCC path, needed for conan builds of libiconv, for example.
          sudo xcode-select --switch /Library/Developer/CommandLineTools
          echo "LIBRARY_PATH=${LIBRARY_PATH}:/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib" >> $GITHUB_ENV
          echo "CPATH=${CPATH}:/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include" >> $GITHUB_ENV
        fi
    - name: Build and install OSRM
      run: |
        echo "Using ${JOBS} jobs"
        pushd ${OSRM_BUILD_DIR}
        ccache --zero-stats
        cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
                 -DENABLE_CONAN=${ENABLE_CONAN:-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} \
                 -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} \
                 -DBUILD_TOOLS=${BUILD_TOOLS:-OFF} \
                 -DENABLE_CCACHE=ON \
                 -DENABLE_LTO=${ENABLE_LTO:-ON} \
                 -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
        make --jobs=${JOBS}
        if [[ "${NODE_PACKAGE_TESTS_ONLY}" != "ON" ]]; then
          make tests --jobs=${JOBS}
          make benchmarks --jobs=${JOBS}
          sudo make install
          if [[ "${RUNNER_OS}" == "Linux" ]]; then
            echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${OSRM_INSTALL_DIR}/lib" >> $GITHUB_ENV
          fi
          echo "PKG_CONFIG_PATH=${OSRM_INSTALL_DIR}/lib/pkgconfig" >> $GITHUB_ENV
        fi
        popd
    - name: Build example
      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' }}
      run: |
        mkdir example/build && pushd example/build
        cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
        make --jobs=${JOBS}
        popd
    - name: Run all tests
      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' }}
      run: |
        make -C test/data benchmark
        # macOS SIP strips the linker path. Reset this inside the running shell
        export LD_LIBRARY_PATH=${{ env.LD_LIBRARY_PATH }}
        ./example/build/osrm-example test/data/mld/monaco.osrm
        # All tests assume to be run from the build directory
        pushd ${OSRM_BUILD_DIR}
        for i in ./unit_tests/*-tests ; do echo Running $i ; $i ; done
        if [ -z "${ENABLE_SANITIZER}" ]; then
          npm run nodejs-tests
        fi
        popd
        npm test
    - name: Use Node 18
      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }}
      uses: actions/setup-node@v4
      with:
        node-version: 18
    - name: Run Node package tests on Node 18
      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }}
      run: |
        node --version
        npm run nodejs-tests
    - name: Use Node 20
      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }}
      uses: actions/setup-node@v4
      with:
        node-version: 20
    - name: Run Node package tests on Node 20
      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }}
      run: |
        node --version
        npm run nodejs-tests
    - name: Use Node latest
      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }}
      uses: actions/setup-node@v4
      with:
        node-version: latest
    - name: Run Node package tests on Node-latest
      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY == 'ON' }}
      run: |
        node --version
        npm run nodejs-tests
    - name: Upload test logs
      uses: actions/upload-artifact@v4
      if: failure()
      with:
        name: logs
        path: test/logs/
    # - name: Generate code coverage
    #   if: ${{ matrix.ENABLE_COVERAGE == 'ON' }}
    #   run: |
    #     lcov --directory . --capture --output-file coverage.info # capture coverage info
    #     lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter out system
    #     lcov --list coverage.info #debug info
    # # Uploading report to CodeCov
    # - name: Upload code coverage
    #   if: ${{ matrix.ENABLE_COVERAGE == 'ON' }}
    #   uses: codecov/codecov-action@v4
    #   with:
    #     files: coverage.info
    #     name: codecov-osrm-backend
    #     fail_ci_if_error: true
    #     verbose: true
    - name: Build Node package
      if: ${{ matrix.build_node_package }}
      run: ./scripts/ci/node_package.sh
    - name: Publish Node package
      if: ${{ matrix.build_node_package && env.PUBLISH == 'On' }}
      uses: ncipollo/release-action@v1
      with:
        allowUpdates: true
        artifactErrorsFailBuild: true
        artifacts: build/stage/**/*.tar.gz
        omitBody: true
        omitBodyDuringUpdate: true
        omitName: true
        omitNameDuringUpdate: true
        replacesArtifacts: true
        token: ${{ secrets.GITHUB_TOKEN }}
    - name: Show CCache statistics
      run: |
        ccache -p
        ccache -s
  benchmarks:
    if: github.event_name == 'pull_request'
    needs: [format-taginfo-docs]
    runs-on: self-hosted
    env:
      CCOMPILER: clang-16
      CXXCOMPILER: clang++-16
      CC: clang-16
      CXX: clang++-16
      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      PR_NUMBER: ${{ github.event.pull_request.number }}
      GITHUB_REPOSITORY: ${{ github.repository }}
      RUN_BIG_BENCHMARK: ${{ contains(github.event.pull_request.labels.*.name, 'Performance') }}
    steps: 
      - name: Checkout PR Branch
        uses: actions/checkout@v4
        with:
          ref: ${{ github.head_ref }}
          path: pr
      - name: Activate virtualenv
        run: |
          python3 -m venv .venv
          source .venv/bin/activate
          echo PATH=$PATH >> $GITHUB_ENV
          pip install "conan<2.0.0" "requests==2.31.0" "numpy==1.26.4" 
      - name: Prepare data
        run: |
          if [ "$RUN_BIG_BENCHMARK" = "true" ]; then
              rm -rf ~/data.osm.pbf
              wget http://download.geofabrik.de/europe/poland-latest.osm.pbf -O ~/data.osm.pbf --quiet
              gunzip -c ./pr/test/data/poland_gps_traces.csv.gz > ~/gps_traces.csv
          else
              if [ ! -f "~/data.osm.pbf" ]; then
                wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf -O ~/data.osm.pbf
              else
                echo "Using cached data.osm.pbf"
              fi
              gunzip -c ./pr/test/data/berlin_gps_traces.csv.gz > ~/gps_traces.csv
          fi
      - name: Prepare environment
        run: |
          echo "CCACHE_DIR=$HOME/.ccache" >> $GITHUB_ENV
          mkdir -p $HOME/.ccache
          ccache --zero-stats
          ccache --max-size=256M
      - name: Checkout Base Branch
        uses: actions/checkout@v4
        with:
          ref: ${{ github.event.pull_request.base.ref }}
          path: base
      - name: Build Base Branch
        run: |
          cd base
          npm ci --ignore-scripts
          cd ..
          mkdir base/build
          cd base/build
          cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=ON ..
          make -j$(nproc)
          make -j$(nproc) benchmarks
          cd ..
          make -C test/data 
      - name: Build PR Branch
        run: |
          cd pr
          npm ci --ignore-scripts
          cd ..
          mkdir -p pr/build
          cd pr/build
          cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=ON ..
          make -j$(nproc) 
          make -j$(nproc) benchmarks
          cd ..
          make -C test/data 
      # we run benchmarks in tmpfs to avoid impact of disk IO
      - name: Create folder for tmpfs 
        run: |
          # if by any chance it was mounted before(e.g. due to previous job failed), unmount it
          sudo umount ~/benchmarks | true
          rm -rf ~/benchmarks 
          mkdir -p ~/benchmarks
      # see https://llvm.org/docs/Benchmarking.html
      - name: Run PR Benchmarks 
        run: |
          sudo cset shield -c 2-3 -k on
          sudo mount -t tmpfs -o size=4g none ~/benchmarks
          cp -rf pr/build ~/benchmarks/build
          cp -rf pr/lib ~/benchmarks/lib
          mkdir -p ~/benchmarks/test
          cp -rf pr/test/data ~/benchmarks/test/data
          cp -rf pr/profiles ~/benchmarks/profiles
          sudo cset shield --exec -- ./pr/scripts/ci/run_benchmarks.sh -f ~/benchmarks -r $(pwd)/pr_results -s $(pwd)/pr -b ~/benchmarks/build -o ~/data.osm.pbf -g ~/gps_traces.csv
          sudo umount ~/benchmarks
          sudo cset shield --reset
      - name: Run Base Benchmarks
        run: |
          sudo cset shield -c 2-3 -k on
          sudo mount -t tmpfs -o size=4g none ~/benchmarks
          cp -rf base/build ~/benchmarks/build
          cp -rf base/lib ~/benchmarks/lib
          mkdir -p ~/benchmarks/test
          cp -rf base/test/data ~/benchmarks/test/data
          cp -rf base/profiles ~/benchmarks/profiles
          # TODO: remove it when base branch will have this file at needed location
          if [ ! -f ~/benchmarks/test/data/portugal_to_korea.json ]; then
            cp base/src/benchmarks/portugal_to_korea.json ~/benchmarks/test/data/portugal_to_korea.json
          fi
          # we intentionally use scripts from PR branch to be able to update them and see results in the same PR
          sudo cset shield --exec -- cset shield --exec -- ./pr/scripts/ci/run_benchmarks.sh -f ~/benchmarks -r $(pwd)/base_results -s $(pwd)/pr -b ~/benchmarks/build -o ~/data.osm.pbf -g ~/gps_traces.csv
          sudo umount ~/benchmarks
          sudo cset shield --reset
      - name: Post Benchmark Results
        run: |
          python3 pr/scripts/ci/post_benchmark_results.py base_results pr_results
      - name: Show CCache statistics
        run: |
          ccache -p
          ccache -s
  ci-complete:
    runs-on: ubuntu-22.04
    needs: [build-test-publish, docker-image-matrix, windows-release-node, benchmarks]
    steps:
    - run: echo "CI complete"
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@ -1,29 +0,0 @@
 name: 'Close stale issues'
 on:
  # NOTE: uncomment if you want to test changes to this file in PRs CI
  # pull_request:
  #   branches:
  #     - master
  schedule:
    - cron: '30 1 * * *' # every day at 1:30am
 permissions:
  issues: write
  pull-requests: write
 jobs:
  stale:
    runs-on: ubuntu-24.04
    steps:
      - uses: actions/stale@v9
        with:
          operations-per-run: 3000
          stale-issue-message: 'This issue seems to be stale. It will be closed in 30 days if no further activity occurs.'
          stale-pr-message: 'This PR seems to be stale. Is it still relevant?'
          days-before-issue-stale: 180 # 6 months
          days-before-issue-close: 30 # 1 month
          days-before-pr-stale: 180 # 6 months
          days-before-pr-close: -1 # never close PRs
          exempt-issue-labels: 'Do Not Stale,Feature Request,Performance,Bug Report,CI,Starter Task,Refactor,Guidance'
--- a/.gitignore
+++ b/.gitignore
@ -1,9 +1,12 @@
 # mason #
 #########
 /.mason
 /mason_packages
 # pre compiled dependencies #
 #############################
 osrm-deps
 .ycm_extra_conf.py
 # Compiled source #
 ###################
 *.com
@ -41,12 +44,9 @@ Thumbs.db
 # build related files #
 #######################
 /_build*
 /build/
 /example/build/
-/test/data/monaco.osrm*
+/test/data/monaco*
 /test/data/ch
 /test/data/mld
 /cmake/postinst
 # Eclipse related files #
@ -56,16 +56,11 @@ Thumbs.db
 .cproject
 .project
-# Visual Studio (Code) related files #
+# stxxl related files #
-######################################
+#######################
-/.vs*
+.stxxl
-/*.local.bat
+stxxl.log
-/CMakeSettings.json
+stxxl.errlog
 /.cache
 # Jetbrains related files #
 ###########################
 .idea/
 # Compiled Binary Files #
 ####################################
@ -91,6 +86,7 @@ Thumbs.db
 /test/cache
 /test/speeds.csv
 /test/penalties.csv
 /test/data/monaco.*
 node_modules
 # Deprecated config file #
@ -100,8 +96,4 @@ node_modules
 *.swp
 # local lua debugging file
-debug.lua
+debug.lua
 # node-osrm artifacts
 lib/binding
--- a/.npmignore
+++ b/.npmignore
@ -1,16 +0,0 @@
 *
 !README.md
 !CHANGELOG.md
 !CONTRIBUTING.MD
 !LICENCE.TXT
 !package.json
 !package-lock.json
 !yarn.lock
 !docs
 !example
 !taginfo.json
 !lib/*.js
 !profiles/*
 !profiles/lib/*
 !profiles/examples/*
 !scripts/node_install.sh
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,202 @@
 language: cpp
 git:
  depth: 10
 # sudo:required is needed for trusty images
 sudo: required
 dist: trusty
 notifications:
  email: false
 branches:
  only:
    - master
 cache:
  ccache: true
  apt: true
  directories:
    - test/cache
 env:
  global:
   - CCACHE_TEMPDIR=/tmp/.ccache-temp
   - 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.6.2
   - MASON="$(pwd)/third_party/mason/mason"
 matrix:
  fast_finish: true
  # We override the compiler names here to yield better ccache behavior, which uses this as key
  include:
    # Debug Builds
    - os: linux
      compiler: "gcc-6-debug"
      addons: &gcc6
        apt:
          sources: ['ubuntu-toolchain-r-test']
          packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' TARGET_ARCH='x86_64-asan' ENABLE_COVERAGE=ON ENABLE_SANITIZER=ON BUILD_COMPONENTS=ON
    - os: linux
      compiler: "clang-3.9-debug"
      addons: &clang38
        apt:
          sources: ['ubuntu-toolchain-r-test']
          packages: ['libstdc++-5-dev', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
      env: CLANG_VERSION='3.9.1' BUILD_TYPE='Debug' BUILD_COMPONENTS=ON CUCUMBER_TIMEOUT=60000
    - os: osx
      osx_image: xcode8.2
      compiler: "mason-osx-release"
      # we use the xcode provides clang and don't install our own
      env: ENABLE_MASON=ON BUILD_TYPE='Release' CUCUMBER_TIMEOUT=60000 CCOMPILER='clang' CXXCOMPILER='clang++' ENABLE_ASSERTIONS=ON
    # Release Builds
    - os: linux
      compiler: "mason-linux-release"
      addons:
        apt:
          sources: ['ubuntu-toolchain-r-test']
          packages: ['libstdc++-5-dev']
      env: CLANG_VERSION='3.9.1' BUILD_TYPE='Release' ENABLE_MASON=ON RUN_CLANG_FORMAT=ON
    - os: linux
      compiler: "gcc-6-release"
      addons: &gcc6
        apt:
          sources: ['ubuntu-toolchain-r-test']
          packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' BUILD_COMPONENTS=ON
    - os: linux
      compiler: "gcc-6-release-i686"
      env: >
        TARGET_ARCH='i686' CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release'
        CFLAGS='-m32 -msse2 -mfpmath=sse' CXXFLAGS='-m32 -msse2 -mfpmath=sse' CHECK_HEADERS=yes
    - os: linux
      compiler: "gcc-4.9-release"
      addons: &gcc49
        apt:
          sources: ['ubuntu-toolchain-r-test']
          packages: ['g++-4.9', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
      env: CCOMPILER='gcc-4.9' CXXCOMPILER='g++-4.9' BUILD_TYPE='Release'
      # Disabled because of CI slowness
      #- os: linux
      #- compiler: clang
      #- addons: &clang38
      #-   apt:
      #-     sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
      #-     packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
      #- env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Release'
    # Shared Library
    - os: linux
      compiler: "gcc-6-release-shared"
      addons: &gcc6
        apt:
          sources: ['ubuntu-toolchain-r-test']
          packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON BUILD_COMPONENTS=ON
      # Disabled because CI slowness
      #- os: linux
      #- compiler: clang
      #- addons: &clang38
      #-   apt:
      #-     sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
      #-     packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
      #- env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
 before_install:
  - if [[ ! -z $TARGET_ARCH ]] ; then source ./scripts/travis/before_install.$TARGET_ARCH.sh ; fi
  - |
    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
      export JOBS=$((`nproc` + 1))
    fi
  - |
    if [ -n "${RUN_CLANG_FORMAT}" ]; then
      ${MASON} install clang-format 3.8.1 && PATH=$(${MASON} prefix clang-format 3.8.1)/bin:${PATH} ./scripts/format.sh
    fi
  - |
    if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
      export JOBS=$((`sysctl -n hw.ncpu` + 1))
      sudo mdutil -i off /
    fi
  - echo "Using ${JOBS} jobs"
  - source ./scripts/install_node.sh 4
  - npm install -g "npm@>=3" # Upgrade to npm >v2 to reduce size of downloaded dependencies
  - npm install
  - ${MASON} install ccache ${CCACHE_VERSION} && export PATH=$(${MASON} prefix ccache ${CCACHE_VERSION})/bin:${PATH}
  - ${MASON} install cmake ${CMAKE_VERSION} && export PATH=$(${MASON} prefix cmake ${CMAKE_VERSION})/bin:${PATH}
  - |
    if [[ ! -z ${CLANG_VERSION} ]]; then
      export CCOMPILER='clang'
      export CXXCOMPILER='clang++'
      ${MASON} install clang++ ${CLANG_VERSION} && export PATH=$(${MASON} prefix clang++ ${CLANG_VERSION})/bin:${PATH}
      # we only enable lto for release builds
      # and therefore don't need to us ld.gold or llvm tools for linking
      # for debug builds
      if [[ ${BUILD_TYPE} == 'Release' ]]; then
        ${MASON} install binutils 2.27 && export PATH=$(${MASON} prefix binutils 2.27)/bin:${PATH}
      fi
    fi
  - ccache --max-size=256M  # limiting the cache's size to roughly the previous job's object sizes
 install:
  - |
    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
      ./scripts/check_taginfo.py taginfo.json profiles/car.lua
    fi
  - export OSRM_BUILD_DIR="$(pwd)/build-osrm"
  - mkdir ${OSRM_BUILD_DIR} && pushd ${OSRM_BUILD_DIR}
  - export CC=${CCOMPILER} CXX=${CXXCOMPILER}
  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_MASON=${ENABLE_MASON:-OFF} -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS:-OFF} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DENABLE_COVERAGE=${ENABLE_COVERAGE:-OFF} -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} -DBUILD_TOOLS=ON -DBUILD_COMPONENTS=${BUILD_COMPONENTS:-OFF} -DENABLE_CCACHE=ON
  - echo "travis_fold:start:MAKE"
  - make --jobs=${JOBS}
  - make tests --jobs=${JOBS}
  - make benchmarks --jobs=${JOBS}
  - echo "travis_fold:end:MAKE"
  - ccache -s
  - sudo make install
  - |
    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
      sudo ldconfig
    fi
  - if [[ ${CHECK_HEADERS} == yes ]] ; then make check-headers ; fi
  - popd
  - mkdir example/build && pushd example/build
  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
  - make --jobs=${JOBS}
  - popd
  - npm run build-api-docs
 script:
  - if [[ $TARGET_ARCH == armhf ]] ; then echo "Skip tests for $TARGET_ARCH" && exit 0 ; fi
  - echo "travis_fold:start:BENCHMARK"
  - make -C test/data benchmark
  - echo "travis_fold:end:BENCHMARK"
  - ./example/build/osrm-example test/data/monaco.osrm
  # All tests assume to be run from the build directory
  - pushd ${OSRM_BUILD_DIR}
  - ./unit_tests/library-tests ../test/data/monaco.osrm
  - ./unit_tests/extractor-tests
  - ./unit_tests/engine-tests
  - ./unit_tests/util-tests
  - ./unit_tests/server-tests
  - popd
  - npm test
 after_success:
  - |
    if [ -n "${ENABLE_COVERAGE}" ]; then
      bash <(curl -s https://codecov.io/bash)
    fi
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,683 +1,3 @@
 # Unreleased
  - Changes from 5.27.1
    - Features
      - ADDED: Route pedestrians over highway=platform [#6993](https://github.com/Project-OSRM/osrm-backend/pull/6993)
      - REMOVED: Remove all core-CH left-overs [#6920](https://github.com/Project-OSRM/osrm-backend/pull/6920)
      - ADDED: Add support for a keepalive_timeout flag. [#6674](https://github.com/Project-OSRM/osrm-backend/pull/6674)
      - ADDED: Add support for a default_radius flag. [#6575](https://github.com/Project-OSRM/osrm-backend/pull/6575)
      - ADDED: Add support for disabling feature datasets. [#6666](https://github.com/Project-OSRM/osrm-backend/pull/6666)
      - ADDED: Add support for opposite approach request parameter. [#6842](https://github.com/Project-OSRM/osrm-backend/pull/6842)
      - ADDED: Add support for accessing edge flags in `process_segment` [#6658](https://github.com/Project-OSRM/osrm-backend/pull/6658)
    - Build:
      - CHANGED: Upgrade clang-format to version 15. [#6919](https://github.com/Project-OSRM/osrm-backend/pull/6919)
      - CHANGED: Use Debian Bookworm as base Docker image [#6904](https://github.com/Project-OSRM/osrm-backend/pull/6904)
      - CHANGED: Upgrade CI actions to latest versions [#6893](https://github.com/Project-OSRM/osrm-backend/pull/6893)
      - CHANGED:  Remove outdated warnings #6894 [#6894](https://github.com/Project-OSRM/osrm-backend/pull/6894)
      - ADDED: Add CI job which builds OSRM with gcc 12. [#6455](https://github.com/Project-OSRM/osrm-backend/pull/6455)
      - CHANGED: Upgrade to clang-tidy 15. [#6439](https://github.com/Project-OSRM/osrm-backend/pull/6439)
      - CHANGED: Update actions/cache to v3. [#6420](https://github.com/Project-OSRM/osrm-backend/pull/6420)
      - REMOVED: Drop support of Node 12 & 14. [#6431](https://github.com/Project-OSRM/osrm-backend/pull/6431)
      - ADDED: Add 'load directly' mode to default Cucumber test suite. [#6663](https://github.com/Project-OSRM/osrm-backend/pull/6663)
      - CHANGED: Fix compilation for Boost 1.85.0 [#6856](https://github.com/Project-OSRM/osrm-backend/pull/6856)
      - CHANGED: Drop support for Node 16 [#6855](https://github.com/Project-OSRM/osrm-backend/pull/6855)
      - REMOVED: Remove unused AppVeyor files [#6860](https://github.com/Project-OSRM/osrm-backend/pull/6860)
      - CHANGED: Upgrade clang-format to version 15 [#6859](https://github.com/Project-OSRM/osrm-backend/pull/6859)
    - NodeJS:
      - CHANGED: Use node-api instead of NAN. [#6452](https://github.com/Project-OSRM/osrm-backend/pull/6452)
    - Misc:
      - CHANGED: Use std::string_view for key type in json::Object. [#7062](https://github.com/Project-OSRM/osrm-backend/pull/7062)
      - CHANGED: Use thread_local instead of boost::thread_specific_ptr. [#6991](https://github.com/Project-OSRM/osrm-backend/pull/6991)
      - CHANGED: Bump flatbuffers to v24.3.25 version. [#6988](https://github.com/Project-OSRM/osrm-backend/pull/6988)
      - CHANGED: Add .reserve(...) to assembleGeometry function. [#6983](https://github.com/Project-OSRM/osrm-backend/pull/6983)
      - CHANGED: Get rid of boost::optional leftovers. [#6977](https://github.com/Project-OSRM/osrm-backend/pull/6977)
      - CHANGED: Use Link Time Optimisation whenever possible. [#6967](https://github.com/Project-OSRM/osrm-backend/pull/6967)
      - CHANGED: Use struct instead of tuple to define UnpackedPath. [#6974](https://github.com/Project-OSRM/osrm-backend/pull/6974)
      - CHANGED: Micro performance optimisation in map matching. [#6976](https://github.com/Project-OSRM/osrm-backend/pull/6976)
      - CHANGED: Re-use priority queue in StaticRTree. [#6952](https://github.com/Project-OSRM/osrm-backend/pull/6952)
      - CHANGED: Optimise encodePolyline function. [#6940](https://github.com/Project-OSRM/osrm-backend/pull/6940)
      - CHANGED: Avoid reallocations in base64 encoding. [#6951](https://github.com/Project-OSRM/osrm-backend/pull/6951)
      - CHANGED: Get rid of unused Boost dependencies. [#6960](https://github.com/Project-OSRM/osrm-backend/pull/6960)
      - CHANGED: Apply micro-optimisation for Table & Trip APIs. [#6949](https://github.com/Project-OSRM/osrm-backend/pull/6949)
      - CHANGED: Apply micro-optimisation for Route API. [#6948](https://github.com/Project-OSRM/osrm-backend/pull/6948)
      - CHANGED: Apply micro-optimisation for Match API. [#6945](https://github.com/Project-OSRM/osrm-backend/pull/6945)
      - CHANGED: Apply micro-optimisation for Nearest API. [#6944](https://github.com/Project-OSRM/osrm-backend/pull/6944)
      - CHANGED: Avoid copy of intersection in totalTurnAngle. [#6938](https://github.com/Project-OSRM/osrm-backend/pull/6938)
      - CHANGED: Use std::unordered_map::emplace instead of operator[] when producing JSONs. [#6936](https://github.com/Project-OSRM/osrm-backend/pull/6936)
      - CHANGED: Avoid copy of vectors in MakeRoute function. [#6939](https://github.com/Project-OSRM/osrm-backend/pull/6939)
      - FIXED: Fix bugprone-unused-return-value clang-tidy warning. [#6934](https://github.com/Project-OSRM/osrm-backend/pull/6934)
      - FIXED: Fix performance-noexcept-move-constructor clang-tidy warning. [#6931](https://github.com/Project-OSRM/osrm-backend/pull/6933)
      - FIXED: Fix performance-noexcept-swap clang-tidy warning. [#6931](https://github.com/Project-OSRM/osrm-backend/pull/6931)
      - CHANGED: Use custom struct instead of std::pair in QueryHeap. [#6921](https://github.com/Project-OSRM/osrm-backend/pull/6921)
      - CHANGED: Use std::string_view::starts_with instead of boost::starts_with. [#6918](https://github.com/Project-OSRM/osrm-backend/pull/6918)
      - CHANGED: Get rid of boost::math::constants::* and M_PI in favor of std::numbers. [#6916](https://github.com/Project-OSRM/osrm-backend/pull/6916)
      - CHANGED: Make constants in PackedVector constexpr. [#6917](https://github.com/Project-OSRM/osrm-backend/pull/6917)
      - CHANGED: Use std::variant instead of mapbox::util::variant. [#6903](https://github.com/Project-OSRM/osrm-backend/pull/6903)
      - CHANGED: Bump rapidjson to version f9d53419e912910fd8fa57d5705fa41425428c35 [#6906](https://github.com/Project-OSRM/osrm-backend/pull/6906)
      - CHANGED: Bump mapbox/variant to version 1.2.0 [#6898](https://github.com/Project-OSRM/osrm-backend/pull/6898)
      - CHANGED: Avoid copy of std::function-based callback in path unpacking [#6895](https://github.com/Project-OSRM/osrm-backend/pull/6895)
      - CHANGED: Replace boost::hash by std::hash [#6892](https://github.com/Project-OSRM/osrm-backend/pull/6892)
      - CHANGED: Partial fix migration from boost::optional to std::optional [#6551](https://github.com/Project-OSRM/osrm-backend/issues/6551)
      - CHANGED: Replace boost::filesystem with std::filesystem [#6432](https://github.com/Project-OSRM/osrm-backend/pull/6432)
      - CHANGED: Update Conan Boost version to 1.85.0. [#6868](https://github.com/Project-OSRM/osrm-backend/pull/6868)
      - FIXED: Fix an error in a RouteParameters AnnotationsType operator overload. [#6646](https://github.com/Project-OSRM/osrm-backend/pull/6646)
      - ADDED: Add support for "unlimited" to be passed as a value for the default-radius and max-matching-radius flags. [#6599](https://github.com/Project-OSRM/osrm-backend/pull/6599)
      - CHANGED: Allow -1.0 as unlimited for default_radius value. [#6599](https://github.com/Project-OSRM/osrm-backend/pull/6599)
      - CHANGED: keep libosrm* in the docker image for downstream linking [#6602](https://github.com/Project-OSRM/osrm-backend/pull/6602)
      - CHANGED: Move vector in CSVFilesParser instead copying it. [#6470](https://github.com/Project-OSRM/osrm-backend/pull/6470)
      - REMOVED: Get rid of unused functions in util/json_util.hpp. [#6446](https://github.com/Project-OSRM/osrm-backend/pull/6446)
      - FIXED: Apply workaround for Conan installation issue on CI. [#6442](https://github.com/Project-OSRM/osrm-backend/pull/6442)
      - FIXED: Fix `npm audit` warnings in NPM package. [#6437](https://github.com/Project-OSRM/osrm-backend/pull/6437)
      - FIXED: Handle snapping parameter for all plugins in NodeJs bindings, but not for Route only. [#6417](https://github.com/Project-OSRM/osrm-backend/pull/6417)
      - FIXED: Fix annotations=true handling in NodeJS bindings & libosrm. [#6415](https://github.com/Project-OSRM/osrm-backend/pull/6415/)
      - FIXED: Fix bindings compilation issue on the latest Node. Update NAN to 2.17.0. [#6416](https://github.com/Project-OSRM/osrm-backend/pull/6416)
      - CHANGED: Make edge metrics strongly typed [#6420](https://github.com/Project-OSRM/osrm-backend/pull/6420)
      - FIXED: Typo in file name src/util/timed_historgram.cpp -> src/util/timed_histogram.cpp [#6428](https://github.com/Project-OSRM/osrm-backend/issues/6428)
      - CHANGED: Replace boost::string_ref with std::string_view [#6433](https://github.com/Project-OSRM/osrm-backend/pull/6433)
      - ADDED: Print tracebacks for Lua runtime errors [#6564](https://github.com/Project-OSRM/osrm-backend/pull/6564)
      - FIXED: Added a variable to preprocessor guard in file osrm-backend/include/util/range_table.hpp to solve build error. [#6596](https://github.com/Project-OSRM/osrm-backend/pull/6596)
      - FIXED: Ensure required file check in osrm-routed is correctly enforced. [#6655](https://github.com/Project-OSRM/osrm-backend/pull/6655)
      - FIXED: Correct HTTP docs to reflect summary output dependency on steps parameter. [#6655](https://github.com/Project-OSRM/osrm-backend/pull/6655)
      - ADDED: Extract prerelease/build information from package semver [#6839](https://github.com/Project-OSRM/osrm-backend/pull/6839)
    - Profiles:
      - FIXED: Bicycle and foot profiles now don't route on proposed ways [#6615](https://github.com/Project-OSRM/osrm-backend/pull/6615)
      - ADDED: Add optional support of cargo bike exclusion and width to bicyle profile [#7044](https://github.com/Project-OSRM/osrm-backend/pull/7044)
    - Routing:
      - FIXED: Fix adding traffic signal penalties during compression [#6419](https://github.com/Project-OSRM/osrm-backend/pull/6419)
      - FIXED: Correctly handle compressed traffic signals. [#6724](https://github.com/Project-OSRM/osrm-backend/pull/6724)
      - FIXED: Fix bug when searching for maneuver overrides [#6739](https://github.com/Project-OSRM/osrm-backend/pull/6739)
      - FIXED: Remove force-loop checks for routes with u-turns [#6858](https://github.com/Project-OSRM/osrm-backend/pull/6858)
      - FIXED: Correctly check runtime search conditions for forcing routing steps [#6866](https://github.com/Project-OSRM/osrm-backend/pull/6866)
    - Map Matching:
      - CHANGED: Optimise path distance calculation in MLD map matching even more. [#6884](https://github.com/Project-OSRM/osrm-backend/pull/6884)
      - CHANGED: Optimise path distance calculation in MLD map matching. [#6876](https://github.com/Project-OSRM/osrm-backend/pull/6876)
      - CHANGED: Optimise R-tree queries in the case of map matching. [#6881](https://github.com/Project-OSRM/osrm-backend/pull/6876)
    - Debug tiles:
      - FIXED: Ensure speed layer features have unique ids. [#6726](https://github.com/Project-OSRM/osrm-backend/pull/6726)
 # 5.27.1
  - Changes from 5.27.0
    - Misc:
      - FIXED: Revert back to using custom HTTP parser instead of Boost.Beast. [#6407](https://github.com/Project-OSRM/osrm-backend/pull/6407)
      - FIXED: Fix bug with large HTTP requests leading to Bad Request in osrm-routed. [#6403](https://github.com/Project-OSRM/osrm-backend/pull/6403)
    - Routing:
      - CHANGED: Add support for surface=metal,grass_paver,woodchips in bicyle profile. [#6395](https://github.com/Project-OSRM/osrm-backend/pull/6395)
 # 5.27.0
  - Changes from 5.26.0
    - API:
      - ADDED: Add Flatbuffers support to NodeJS bindings. [#6338](https://github.com/Project-OSRM/osrm-backend/pull/6338)
      - CHANGED: Add `data_version` field to responses of all services. [#5387](https://github.com/Project-OSRM/osrm-backend/pull/5387)
      - 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)
      - FIXED: Fix HTTP compression precedence [#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:
      - ADDED: conanbuildinfo.json for easy reading of dependencies [#6388](https://github.com/Project-OSRM/osrm-backend/pull/6388)
      - CHANGED: Improve performance of JSON rendering. Fix undefined behaviour in JSON numbers formatting. [#6380](https://github.com/Project-OSRM/osrm-backend/pull/6380)
      - ADDED: Add timestamps for logs. [#6375](https://github.com/Project-OSRM/osrm-backend/pull/6375)
      - CHANGED: Improve performance of map matching via getPathDistance optimization. [#6378](https://github.com/Project-OSRM/osrm-backend/pull/6378)
      - CHANGED: Optimize RestrictionParser performance. [#6344](https://github.com/Project-OSRM/osrm-backend/pull/6344)
      - ADDED: Support floats for speed value in traffic updates CSV. [#6327](https://github.com/Project-OSRM/osrm-backend/pull/6327)
      - CHANGED: Use Lua 5.4 in Docker image. [#6346](https://github.com/Project-OSRM/osrm-backend/pull/6346)
      - CHANGED: Remove redundant nullptr check. [#6326](https://github.com/Project-OSRM/osrm-backend/pull/6326)
      - CHANGED: missing files list is included in exception message. [#5360](https://github.com/Project-OSRM/osrm-backend/pull/5360)
      - 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)
      - FIXED: Internal refactoring of identifier types used in data facade [#6044](https://github.com/Project-OSRM/osrm-backend/pull/6044)
      - CHANGED: Update docs to reflect recent build and dependency changes [#6383](https://github.com/Project-OSRM/osrm-backend/issues/6383)
    - Build:
      - REMOVED: Get rid of Mason. [#6387](https://github.com/Project-OSRM/osrm-backend/pull/6387)
      - CHANGED: Use clang-format from CI base image. [#6391](https://github.com/Project-OSRM/osrm-backend/pull/6391)
      - ADDED: Build Node bindings on Windows. [#6334](https://github.com/Project-OSRM/osrm-backend/pull/6334)
      - ADDED: Configure cross-compilation for Apple Silicon. [#6360](https://github.com/Project-OSRM/osrm-backend/pull/6360)
      - CHANGED: Use apt-get to install Clang on CI. [#6345](https://github.com/Project-OSRM/osrm-backend/pull/6345)
      - CHANGED: Fix TBB in case of Conan + NodeJS build. [#6333](https://github.com/Project-OSRM/osrm-backend/pull/6333)
      - CHANGED: Migrate to modern TBB version. [#6300](https://github.com/Project-OSRM/osrm-backend/pull/6300)
      - CHANGED: Enable performance-move-const-arg clang-tidy check. [#6319](https://github.com/Project-OSRM/osrm-backend/pull/6319)
      - 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)
      - FIXED: Bump CI complete meta job to ubuntu-20.04 [#6323](https://github.com/Project-OSRM/osrm-backend/pull/6323)
      - CHANGED: Node packages are now scoped by @project-osrm [#6386](https://github.com/Project-OSRM/osrm-backend/issues/6386)
    - Routing:
      - CHANGED: Lazily generate optional route path data [#6045](https://github.com/Project-OSRM/osrm-backend/pull/6045)
      - FIXED: Completed support for no_entry and no_exit turn restrictions. [#5988](https://github.com/Project-OSRM/osrm-backend/pull/5988)
      - ADDED: Add support for non-round-trips with a single fixed endpoint. [#6050](https://github.com/Project-OSRM/osrm-backend/pull/6050)
      - FIXED: Improvements to maneuver override processing [#6125](https://github.com/Project-OSRM/osrm-backend/pull/6125)
      - ADDED: Support snapping to multiple ways at an input location. [#5953](https://github.com/Project-OSRM/osrm-backend/pull/5953)
      - FIXED: Fix snapping target locations to ways used in turn restrictions. [#6339](https://github.com/Project-OSRM/osrm-backend/pull/6339)
      - ADDED: Support OSM traffic signal directions. [#6153](https://github.com/Project-OSRM/osrm-backend/pull/6153)
      - FIXED: Ensure u-turn exists in intersection view. [#6376](https://github.com/Project-OSRM/osrm-backend/pull/6376)
      - FIXED: Gracefully handle no-turn intersections in guidance processing. [#6382](https://github.com/Project-OSRM/osrm-backend/issues/6382)
    - Profile:
      - CHANGED: Bicycle surface speeds [#6212](https://github.com/Project-OSRM/osrm-backend/pull/6212)
    - Tools:
      - CHANGED: Do not generate intermediate .osrm file in osrm-extract. [#6354](https://github.com/Project-OSRM/osrm-backend/pull/6354)
 # 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)
      - FIXED: Set osrm-routed to immediately close bad connections [#6112](https://github.com/Project-OSRM/osrm-backend/pull/6112)
    - 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)
      - FIXED: Fixed test cache to consider MLD executable changes. [#6129](https://github.com/Project-OSRM/osrm-backend/pull/6129)
    - 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
    - Build:
      - CHANGED: Node binaries now use Github Releases for hosting [#6030](https://github.com/Project-OSRM/osrm-backend/pull/6030)
    - Misc:
      - FIXED: Upgrade to @mapbox/node-pre-gyp fix various bugs with Node 12/14 [#5991](https://github.com/Project-OSRM/osrm-backend/pull/5991)
      - FIXED: `valid` type in documentation examples [#5990](https://github.com/Project-OSRM/osrm-backend/issues/5990)
      - FIXED: Remove redundant loading of .osrm.cell_metrics [#6019](https://github.com/Project-OSRM/osrm-backend/issues/6019)
      - CHANGED: Increase PackedOSMIDs size to 34 bits. This breaks the **data format** [#6020](https://github.com/Project-OSRM/osrm-backend/issues/6020)
    - Profile:
      - FIXED: Add kerb barrier exception to default car profile. [#5999](https://github.com/Project-OSRM/osrm-backend/pull/5999)
 # 5.24.0
  - Changes from 5.23.0
    - Features
      - ADDED: Added support for multiple via-way restrictions. [#5907](https://github.com/Project-OSRM/osrm-backend/pull/5907)
      - ADDED: Add node bindings support for Node 12, 14, and publish binaries [#5918](https://github.com/Project-OSRM/osrm-backend/pull/5918)
      - REMOVED: we no longer publish Node 8 binary modules (they are still buildable from source) [#5918](https://github.com/Project-OSRM/osrm-backend/pull/5918)
    - Routing:
      - FIXED: Avoid copying ManyToMany table results [#5923](https://github.com/Project-OSRM/osrm-backend/pull/5923)
      - FIXED: Reduce copying in API parameter constructors [#5925](https://github.com/Project-OSRM/osrm-backend/pull/5925)
    - Misc:
      - CHANGED: Cleanup NodeJS dependencies [#5945](https://github.com/Project-OSRM/osrm-backend/pull/5945)
      - CHANGED: Unify `.osrm.turn_penalites_index` dump processing same with `.osrm.turn_weight_penalties` and `.osrm.turn_duration_penalties` [#5868](https://github.com/Project-OSRM/osrm-backend/pull/5868)
      - FIXED: Properly validate source/destination validation in NodeJS table service [#5595](https://github.com/Project-OSRM/osrm-backend/pull/5595/files)
      - FIXED: turn.roads_on_the_left not containing incoming roads and turn.roads_on_the_right not containing outgoing roads on two-way roads [#5128](https://github.com/Project-OSRM/osrm-backend/issues/5128)
    - Profile:
      - ADDED: Profile debug script which fetches a way from OSM then outputs the result of the profile. [#5908](https://github.com/Project-OSRM/osrm-backend/pull/5908)
    - Infrastructure
      - CHANGED: Bundled protozero updated to v1.7.0. [#5858](https://github.com/Project-OSRM/osrm-backend/pull/5858)
    - Windows:
      - FIXED: Fix bit-shift overflow in MLD partition step. [#5878](https://github.com/Project-OSRM/osrm-backend/pull/5878)
      - FIXED: Fix vector bool permutation in graph contraction step [#5882](https://github.com/Project-OSRM/osrm-backend/pull/5882)
    - API:
      - FIXED: Undo libosrm API break by adding old interface as method overload [#5861](https://github.com/Project-OSRM/osrm-backend/pull/5861)
      - FIXED: Fixed validation of sources/destinations when accessed via node bindings [#5595](https://github.com/Project-OSRM/osrm-backend/pull/5595)
 # 5.23.0
  - Changes from 5.22.0
    - Build:
      - FIXED: pessimistic calls to std::move [#5560](https://github.com/Project-OSRM/osrm-backend/pull/5561)
    - Features:
      - ADDED: new API parameter - `snapping=any|default` to allow snapping to previously unsnappable edges [#5361](https://github.com/Project-OSRM/osrm-backend/pull/5361)
      - ADDED: keepalive support to the osrm-routed HTTP server [#5518](https://github.com/Project-OSRM/osrm-backend/pull/5518)
      - ADDED: flatbuffers output format support [#5513](https://github.com/Project-OSRM/osrm-backend/pull/5513)
      - ADDED: Global 'skip_waypoints' option [#5556](https://github.com/Project-OSRM/osrm-backend/pull/5556)
      - FIXED: Install the libosrm_guidance library correctly [#5604](https://github.com/Project-OSRM/osrm-backend/pull/5604)
      - FIXED: Http Handler can now deal witch optional whitespace between header-key and -value [#5606](https://github.com/Project-OSRM/osrm-backend/issues/5606)
    - Routing:
      - CHANGED: allow routing past `barrier=arch` [#5352](https://github.com/Project-OSRM/osrm-backend/pull/5352)
      - CHANGED: default car weight was reduced to 2000 kg. [#5371](https://github.com/Project-OSRM/osrm-backend/pull/5371)
      - CHANGED: default car height was reduced to 2 meters. [#5389](https://github.com/Project-OSRM/osrm-backend/pull/5389)
      - FIXED: treat `bicycle=use_sidepath` as no access on the tagged way. [#5622](https://github.com/Project-OSRM/osrm-backend/pull/5622)
      - FIXED: fix table result when source and destination on same one-way segment. [#5828](https://github.com/Project-OSRM/osrm-backend/pull/5828)
      - FIXED: fix occasional segfault when swapping data with osrm-datastore and using `exclude=` [#5844](https://github.com/Project-OSRM/osrm-backend/pull/5844)
      - FIXED: fix crash in MLD alternative search if source or target are invalid [#5851](https://github.com/Project-OSRM/osrm-backend/pull/5851)
    - Misc:
      - CHANGED: Reduce memory usage for raster source handling. [#5572](https://github.com/Project-OSRM/osrm-backend/pull/5572)
      - CHANGED: Add cmake option `ENABLE_DEBUG_LOGGING` to control whether output debug logging. [#3427](https://github.com/Project-OSRM/osrm-backend/issues/3427)
      - CHANGED: updated extent of Hong Kong as left hand drive country. [#5535](https://github.com/Project-OSRM/osrm-backend/issues/5535)
      - FIXED: corrected error message when failing to snap input coordinates [#5846](https://github.com/Project-OSRM/osrm-backend/pull/5846)
    - Infrastructure
      - REMOVED: STXXL support removed as STXXL became abandonware. [#5760](https://github.com/Project-OSRM/osrm-backend/pull/5760)
 # 5.22.0
  - Changes from 5.21.0
    - Build:
      - ADDED: optionally build Node `lts` and `latest` bindings [#5347](https://github.com/Project-OSRM/osrm-backend/pull/5347)
    - Features:
      - ADDED: new waypoints parameter to the `route` plugin, enabling silent waypoints [#5345](https://github.com/Project-OSRM/osrm-backend/pull/5345)
      - ADDED: data timestamp information in the response (saved in new file `.osrm.timestamp`). [#5115](https://github.com/Project-OSRM/osrm-backend/issues/5115)
 # 5.21.0
  - Changes from 5.20.0
    - Features:
      - ADDED: all waypoints in responses now contain a distance property between the original coordinate and the snapped location. [#5255](https://github.com/Project-OSRM/osrm-backend/pull/5255)
      - ADDED: if `fallback_speed` is used, a new structure `fallback_speed_cells` will describe which cells contain estimated values [#5259](https://github.com/Project-OSRM/osrm-backend/pull/5259)
      - REMOVED: we no longer publish Node 4 or 6 binary modules (they are still buildable from source) [#5314](https://github.com/Project-OSRM/osrm-backend/pull/5314)
    - Table:
      - ADDED: new parameter `scale_factor` which will scale the cell `duration` values by this factor. [#5298](https://github.com/Project-OSRM/osrm-backend/pull/5298)
      - FIXED: only trigger `scale_factor` code to scan matrix when necessary. [#5303](https://github.com/Project-OSRM/osrm-backend/pull/5303)
      - FIXED: fix bug in reverse offset calculation that sometimes lead to negative (and other incorrect) values in distance table results [#5315](https://github.com/Project-OSRM/osrm-backend/pull/5315)
    - Docker:
      - FIXED: use consistent boost version between build and runtime [#5311](https://github.com/Project-OSRM/osrm-backend/pull/5311)
      - FIXED: don't override default permissions on /opt [#5311](https://github.com/Project-OSRM/osrm-backend/pull/5311)
    - Matching:
      - CHANGED: matching will now consider edges marked with is_startpoint=false, allowing matching over ferries and other previously non-matchable edge types. [#5297](https://github.com/Project-OSRM/osrm-backend/pull/5297)
    - Profile:
      - ADDED: Parse `source:maxspeed` and `maxspeed:type` tags to apply maxspeeds and add belgian flanders rural speed limit. [#5217](https://github.com/Project-OSRM/osrm-backend/pull/5217)
      - CHANGED: Refactor maxspeed parsing to use common library. [#5144](https://github.com/Project-OSRM/osrm-backend/pull/5144)
 # 5.20.0
  - Changes from 5.19.0:
    - Table:
      - CHANGED: switch to pre-calculated distances for table responses for large speedup and 10% memory increase. [#5251](https://github.com/Project-OSRM/osrm-backend/pull/5251)
      - ADDED: new parameter `fallback_speed` which will fill `null` cells with estimated value [#5257](https://github.com/Project-OSRM/osrm-backend/pull/5257)
      - CHANGED: Remove API check for matrix sources/destination length to be less than or equal to coordinates length. [#5298](https://github.com/Project-OSRM/osrm-backend/pull/5289)
      - FIXED: Fix crashing bug when using fallback_speed parameter with more sources than destinations. [#5291](https://github.com/Project-OSRM/osrm-backend/pull/5291)
    - Features:
      - ADDED: direct mmapping of datafiles is now supported via the `--mmap` switch. [#5242](https://github.com/Project-OSRM/osrm-backend/pull/5242)
      - REMOVED: the previous `--memory_file` switch is now deprecated and will fallback to `--mmap` [#5242](https://github.com/Project-OSRM/osrm-backend/pull/5242)
      - ADDED: Now publishing Node 10.x LTS binary modules [#5246](https://github.com/Project-OSRM/osrm-backend/pull/5246)
    - Windows:
      - FIXED: Windows builds again. [#5249](https://github.com/Project-OSRM/osrm-backend/pull/5249)
    - Docker:
      - CHANGED: switch from Alpine Linux to Debian Buster base images [#5281](https://github.com/Project-OSRM/osrm-backend/pull/5281)
 # 5.19.0
  - Changes from 5.18.0:
    - Optimizations:
      - CHANGED: Use Grisu2 for serializing floating point numbers. [#5188](https://github.com/Project-OSRM/osrm-backend/pull/5188)
      - ADDED: Node bindings can return pre-rendered JSON buffer. [#5189](https://github.com/Project-OSRM/osrm-backend/pull/5189)
    - Profiles:
      - CHANGED: Bicycle profile now blacklists barriers instead of whitelisting them [#5076
 ](https://github.com/Project-OSRM/osrm-backend/pull/5076/)
      - CHANGED: Foot profile now blacklists barriers instead of whitelisting them [#5077
 ](https://github.com/Project-OSRM/osrm-backend/pull/5077/)
      - CHANGED: Support maxlength and maxweight in car profile [#5101](https://github.com/Project-OSRM/osrm-backend/pull/5101)
    - Bugfixes:
      - FIXED: collapsing of ExitRoundabout instructions [#5114](https://github.com/Project-OSRM/osrm-backend/issues/5114)
    - Misc:
      - CHANGED: Support up to 512 named shared memory regions [#5185](https://github.com/Project-OSRM/osrm-backend/pull/5185)
 # 5.18.0
  - Changes from 5.17.0:
    - Features:
      - ADDED: `table` plugin now optionally returns `distance` matrix as part of response [#4990](https://github.com/Project-OSRM/osrm-backend/pull/4990)
      - ADDED: New optional parameter `annotations` for `table` that accepts `distance`, `duration`, or both `distance,duration` as values [#4990](https://github.com/Project-OSRM/osrm-backend/pull/4990)
    - Infrastructure:
      - ADDED: Updated libosmium and added protozero and vtzero libraries [#5037](https://github.com/Project-OSRM/osrm-backend/pull/5037)
      - CHANGED: Use vtzero library in tile plugin [#4686](https://github.com/Project-OSRM/osrm-backend/pull/4686)
    - Profile:
      - ADDED: Bicycle profile now returns classes for ferry and tunnel routes. [#5054](https://github.com/Project-OSRM/osrm-backend/pull/5054)
      - ADDED: Bicycle profile allows to exclude ferry routes (default to not enabled) [#5054](https://github.com/Project-OSRM/osrm-backend/pull/5054)
 # 5.17.1
  - Changes from 5.17.0:
    - Bugfixes:
      - FIXED: Do not combine a segregated edge with a roundabout [#5039](https://github.com/Project-OSRM/osrm-backend/issues/5039)
 # 5.17.0
  - Changes from 5.16.0:
    - Bugfixes:
      - FIXED: deduplication of route steps when waypoints are used [#4909](https://github.com/Project-OSRM/osrm-backend/issues/4909)
      - FIXED: Use smaller range for U-turn angles in map-matching [#4920](https://github.com/Project-OSRM/osrm-backend/pull/4920)
      - FIXED: Remove the last short annotation segment in `trimShortSegments` [#4946](https://github.com/Project-OSRM/osrm-backend/pull/4946)
      - FIXED: Properly calculate annotations for speeds, durations and distances when waypoints are used with mapmatching [#4949](https://github.com/Project-OSRM/osrm-backend/pull/4949)
      - FIXED: Don't apply unimplemented SH and PH conditions in OpeningHours and add inversed date ranges [#4992](https://github.com/Project-OSRM/osrm-backend/issues/4992)
      - FIXED: integer overflow in `DynamicGraph::Renumber` [#5021](https://github.com/Project-OSRM/osrm-backend/pull/5021)
    - Profile:
      - CHANGED: Handle oneways in get_forward_backward_by_key [#4929](https://github.com/Project-OSRM/osrm-backend/pull/4929)
      - FIXED: Do not route against oneway road if there is a cycleway in the wrong direction; also review bike profile [#4943](https://github.com/Project-OSRM/osrm-backend/issues/4943)
      - CHANGED: Make cyclability weighting of the bike profile prefer safer routes more strongly [#5015](https://github.com/Project-OSRM/osrm-backend/issues/5015)
    - Guidance:
      - CHANGED: Don't use obviousness for links bifurcations [#4929](https://github.com/Project-OSRM/osrm-backend/pull/4929)
      - FIXED: Adjust Straight direction modifiers of side roads in driveway handler [#4929](https://github.com/Project-OSRM/osrm-backend/pull/4929)
      - CHANGED: Added post process logic to collapse segregated turn instructions [#4925](https://github.com/Project-OSRM/osrm-backend/pull/4925)
      - ADDED: Maneuver relation now supports `straight` as a direction [#4995](https://github.com/Project-OSRM/osrm-backend/pull/4995)
      - FIXED: Support spelling maneuver relation with British spelling [#4950](https://github.com/Project-OSRM/osrm-backend/issues/4950)
    - Tools:
      - ADDED: `osrm-routed` accepts a new property `--memory_file` to store memory in a file on disk. [#4881](https://github.com/Project-OSRM/osrm-backend/pull/4881)
      - ADDED: `osrm-datastore` accepts a new parameter `--dataset-name` to select the name of the dataset. [#4982](https://github.com/Project-OSRM/osrm-backend/pull/4982)
      - ADDED: `osrm-datastore` accepts a new parameter `--list` to list all datasets loaded into memory. [#4982](https://github.com/Project-OSRM/osrm-backend/pull/4982)
      - ADDED: `osrm-datastore` accepts a new parameter `--only-metric` to only reload the data that can be updated by a weight update (reduces memory for traffic updates). [#5002](https://github.com/Project-OSRM/osrm-backend/pull/5002)
      - ADDED: `osrm-routed` accepts a new parameter `--dataset-name` to select the shared-memory dataset to use. [#4982](https://github.com/Project-OSRM/osrm-backend/pull/4982)
    - NodeJS:
      - ADDED: `OSRM` object accepts a new option `memory_file` that stores the memory in a file on disk. [#4881](https://github.com/Project-OSRM/osrm-backend/pull/4881)
      - ADDED: `OSRM` object accepts a new option `dataset_name` to select the shared-memory dataset. [#4982](https://github.com/Project-OSRM/osrm-backend/pull/4982)
    - Internals
      - CHANGED: Updated segregated intersection identification [#4845](https://github.com/Project-OSRM/osrm-backend/pull/4845) [#4968](https://github.com/Project-OSRM/osrm-backend/pull/4968)
      - REMOVED: Remove `.timestamp` file since it was unused [#4960](https://github.com/Project-OSRM/osrm-backend/pull/4960)
    - Documentation:
      - ADDED: Add documentation about OSM node ids in nearest service response [#4436](https://github.com/Project-OSRM/osrm-backend/pull/4436)
    - Performance
      - FIXED: Speed up response time when lots of legs exist and geojson is used with `steps=true` [#4936](https://github.com/Project-OSRM/osrm-backend/pull/4936)
      - FIXED: Return iterators instead of vectors in datafacade_base functions [#4969](https://github.com/Project-OSRM/osrm-backend/issues/4969)
    - Misc:
      - ADDED: expose name for datasource annotations as metadata [#4973](https://github.com/Project-OSRM/osrm-backend/pull/4973)
 # 5.16.0
  - Changes from 5.15.2:
    - Guidance
      - ADDED #4676: Support for maneuver override relation, allowing data-driven overrides for turn-by-turn instructions [#4676](https://github.com/Project-OSRM/osrm-backend/pull/4676)
      - CHANGED #4830: Announce reference change if names are empty
      - CHANGED #4835: MAXIMAL_ALLOWED_SEPARATION_WIDTH increased to 12 meters
      - CHANGED #4842: Lower priority links from a motorway now are used as motorway links [#4842](https://github.com/Project-OSRM/osrm-backend/pull/4842)
      - CHANGED #4895: Use ramp bifurcations as fork intersections [#4895](https://github.com/Project-OSRM/osrm-backend/issues/4895)
      - CHANGED #4893: Handle motorway forks with links as normal motorway intersections[#4893](https://github.com/Project-OSRM/osrm-backend/issues/4893)
      - FIXED #4905: Check required tags of `maneuver` relations [#4905](https://github.com/Project-OSRM/osrm-backend/pull/4905)
    - Profile:
      - FIXED: `highway=service` will now be used for restricted access, `access=private` is still disabled for snapping.
      - ADDED #4775: Exposes more information to the turn function, now being able to set turn weights with highway and access information of the turn as well as other roads at the intersection [#4775](https://github.com/Project-OSRM/osrm-backend/issues/4775)
      - FIXED #4763: Add support for non-numerical units in car profile for maxheight [#4763](https://github.com/Project-OSRM/osrm-backend/issues/4763)
      - ADDED #4872: Handling of `barrier=height_restrictor` nodes [#4872](https://github.com/Project-OSRM/osrm-backend/pull/4872)
 # 5.15.2
  - Changes from 5.15.1:
    - Features:
        - ADDED: Exposed the waypoints parameter in the node bindings interface
    - Bugfixes:
        - FIXED: Segfault causing bug in leg collapsing map matching when traversing edges in reverse
 # 5.15.1
  - Changes from 5.15.0:
    - Bugfixes:
      - FIXED: Segfault in map matching when RouteLeg collapsing code is run on a match with multiple submatches
    - Guidance:
      - Set type of trivial intersections where classes change to Suppressed instead of NoTurn
 # 5.15.0
  - Changes from 5.14.3:
    - Bugfixes:
      - FIXED #4704: Fixed regression in bearings reordering introduced in 5.13 [#4704](https://github.com/Project-OSRM/osrm-backend/issues/4704)
      - FIXED #4781: Fixed overflow exceptions in percent-encoding parsing
      - FIXED #4770: Fixed exclude flags for single toll road scenario
      - FIXED #4283: Fix overflow on zero duration segments
      - FIXED #4804: Ignore no_*_on_red turn restrictions
    - Guidance:
      - CHANGED #4706: Guidance refactoring step to decouple intersection connectivity analysis and turn instructions generation [#4706](https://github.com/Project-OSRM/osrm-backend/pull/4706)
      - CHANGED #3491: Refactor `isThroughStreet`/Intersection options
    - Profile:
      - ADDED: `tunnel` as a new class in car profile so that sections of the route with tunnel tags will be marked as such
 # 5.14.3
  - Changes from 5.14.2:
    - Features:
      - Added a `waypoints` parameter to the match service plugin that accepts indices to input coordinates and treats only those points as waypoints in the response format.
    - Bugfixes:
      - FIXED #4754: U-Turn penalties are applied to straight turns.
      - FIXED #4756: Removed too restrictive road name check in the sliproad handler
      - FIXED #4731: Use correct weights for edge-based graph duplicated via nodes.
    - Profile:
      - CHANGED: added Belarus speed limits
      - CHANGED: set default urban speed in Ukraine to 50kmh
 # 5.14.2
  - Changes from 5.14.1:
    - Bugfixes:
      - FIXED #4727: Erroring when a old .core file is present.
      - FIXED #4642: Update checks for EMPTY_NAMEID to check for empty name strings
      - FIXED #4738: Fix potential segmentation fault
    - Node.js Bindings:
      - ADDED: Exposed new `max_radiuses_map_matching` option from `EngingConfig` options
    - Tools:
      - ADDED: New osrm-routed `max_radiuses_map_matching` command line flag to optionally set a maximum radius for map matching
 # 5.14.1
  - Changes from 5.14.0
    - Bugfixes:
      - FIXED: don't use removed alternative candidates in `filterPackedPathsByCellSharing`
 # 5.14.0
  - Changes from 5.13
    - API:
      - ADDED: new RouteStep property `driving_side` that has either "left" or "right" for that step
    - Misc:
      - ADDED: Bundles a rough (please improve!) driving-side GeoJSON file for use with `osrm-extract --location-dependent-data data/driving_side.geojson`
      - CHANGED: Conditional turn parsing is disabled by default now
      - ADDED: Adds a tool to analyze turn instruction generation in a dataset.  Useful for tracking turn-by-turn heuristic changes over time.
      - CHANGED: Internal refactoring of guidance code as a first step towards a re-runnable guidance pipeline
      - ADDED: Now publishing Node 8.x LTS binary modules
    - Profile:
      - CHANGED: Remove dependency on turn types and turn modifier in the process_turn function in the `car.lua` profile. Guidance instruction types are not used to influence turn penalty anymore so this will break backward compatibility between profile version 3 and 4.
    - Guidance:
      - ADDED: New internal flag on "segregated intersections" - in the future, will should allow collapsing of instructions across complex intersection geometry where humans only perceive a single maneuver
      - CHANGED: Decrease roundabout turn radius threshold from 25m to 15m - adds some "exit the roundabout" instructions for moderately sized roundabouts that were being missed previously
    - Docker:
      - CHANGED: switch to alpine 3.6, and use a multistage build to reduce image size
    - Build:
      - FIX: use LUA_LIBRARY_DIRS to propertly detect Lua on all platforms
    - Docs:
      - FIX: clarify description of roundabout exit instructions
    - Bugfixes:
      - FIXED: Fix bug where merge instructions got the wrong direction modifier ([PR #4670](https://github.com/Project-OSRM/osrm-backend/pull/4670))
      - FIXED: Properly use the `profile.properties.left_hand_driving` property, there was a typo that meant it had no effect
      - FIXED: undefined behaviour when alternative candidate via node is same as source node ([#4691](https://github.com/Project-OSRM/osrm-backend/issues/4691))
      - FIXED: ensure libosrm.pc is pushed to the correct location for pkgconfig to find it on all platforms
      - FIXED: don't consider empty names + empty refs as a valid name for u-turns
 # 5.13.0
  - Changes from 5.12:
    - Profile:
      - Append cardinal directions from route relations to ref fields to improve instructions; off by default see `profile.cardinal_directions`
      - Support of `distance` weight in foot and bicycle profiles
      - Support of relations processing
      - Added `way:get_location_tag(key)` method to get location-dependent tags https://github.com/Project-OSRM/osrm-backend/wiki/Using-location-dependent-data-in-profiles
      - Added `forward_ref` and `backward_ref` support
      - Left-side driving mode is specified by a local Boolean flag `is_left_hand_driving` in `ExtractionWay` and `ExtractionTurn`
      - Support literal values for maxspeeds in NO, PL and ZA
    - Infrastructure:
      - Lua 5.1 support is removed due to lack of support in sol2 https://github.com/ThePhD/sol2/issues/302
      - Fixed pkg-config version of OSRM
      - Removed `.osrm.core` file since CoreCH is deprecated now.
    - Tools:
      - Because of boost/program_options#32 with boost 1.65+ we needed to change the behavior of the following flags to not accept `={true|false}` anymore:
        - `--use-locations-cache=false` becomes `--disable-location-cache`
        - `--parse-conditional-restrictions=true` becomes `--parse-conditional-restrictions`
        - The deprecated options `--use-level-cache` and `--generate-edge-lookup`
    - Bugfixes:
      - Fixed #4348: Some cases of sliproads pre-processing were broken
      - Fixed #4331: Correctly compute left/right modifiers of forks in case the fork is curved.
      - Fixed #4472: Correctly count the number of lanes using the delimter in `turn:lanes` tag.
      - Fixed #4214: Multiple runs of `osrm-partition` lead to crash.
      - Fixed #4348: Fix assorted problems around slip roads.
      - Fixed #4420: A bug that would result in unnecessary instructions, due to problems in suffix/prefix detection
    - Algorithm
      - Deprecate CoreCH functionality. Usage of CoreCH specific options will fall back to using CH with core_factor of 1.0
      - MLD uses a unidirectional Dijkstra for 1-to-N and N-to-1 matrices which yields speedup.
 # 5.12.0
  - Changes from 5.11:
    - Guidance
      - now announcing turning onto oneways at the end of a road (e.g. onto dual carriageways)
      - Adds new instruction types at the exit of roundabouts and rotaries `exit roundabout` and `exit rotary`.
    - HTTP:
      - New query parameter for route/table/match/trip plugings:
        `exclude=` that can be used to exclude certain classes (e.g. exclude=motorway, exclude=toll).
        This is configurable in the profile.
    - NodeJS:
      - New query option `exclude` for the route/table/match/trip plugins. (e.g. `exclude: ["motorway", "toll"]`)
    - Profile:
      - New property for profile table: `excludable` that can be used to configure which classes are excludable at query time.
      - New optional property for profile table: `classes` that allows you to specify which classes you expect to be used.
        We recommend this for better error messages around classes, otherwise the possible class names are infered automatically.
    - Traffic:
      - If traffic data files contain an empty 4th column, they will update edge durations but not modify the edge weight.  This is useful for
        updating ETAs returned, without changing route selection (for example, in a distance-based profile with traffic data loaded).
    - Infrastructure:
      - New file `.osrm.cell_metrics` created by `osrm-customize`.
    - Debug tiles:
      - Added new properties `type` and `modifier` to `turns` layer, useful for viewing guidance calculated turn types on the map
 # 5.11.0
  - Changes from 5.10:
    - Features
      - BREAKING: Added support for conditional via-way restrictions. This features changes the file format of osrm.restrictions and requires re-extraction
    - Internals
      - BREAKING: Traffic signals will no longer be represented as turns internally. This requires re-processing of data but enables via-way turn restrictions across highway=traffic_signals
      - Additional checks for empty segments when loading traffic data files
      - Tunes the constants for turns in sharp curves just a tiny bit to circumvent a mix-up in fork directions at a specific intersection (https://github.com/Project-OSRM/osrm-backend/issues/4331)
    - Infrastructure
      - Refactor datafacade to make implementing additional DataFacades simpler
    - Bugfixes
      - API docs are now buildable again
      - Suppress unnecessary extra turn instruction when exiting a motorway via a motorway_link onto a primary road (https://github.com/Project-OSRM/osrm-backend/issues/4348 scenario 4)
      - Suppress unnecessary extra turn instruction when taking a tertiary_link road from a teritary onto a residential road (https://github.com/Project-OSRM/osrm-backend/issues/4348 scenario 2)
      - Various MSVC++ build environment fixes
      - Avoid a bug that crashes GCC6
      - Re-include .npmignore to slim down published modules
      - Fix a pre-processing bug where incorrect directions could be issued when two turns would have similar instructions and we tried to give them distinct values (https://github.com/Project-OSRM/osrm-backend/pull/4375)
      - The entry bearing for correct the cardinality of a direction value (https://github.com/Project-OSRM/osrm-backend/pull/4353
      - Change timezones in West Africa to the WAT zone so they're recognized on the Windows platform
 # 5.10.0
  - Changes from 5.9:
    - Profiles:
      - New version 2 profile API which cleans up a number of things and makes it easier to for profiles to include each other. Profiles using the old version 0 and 1 APIs are still supported.
      - New required `setup()` function that must return a configuration hash. Storing configuration in globals is deprecated.
      - Passes the config hash returned in `setup()` as an argument to `process_node/way/segment/turn`.
      - Properties are now set in `.properties` in the config hash returend by setup().
      - initialize raster sources in `setup()` instead of in a separate callback.
      - Renames the `sources` helper to `raster`.
      - Renames `way_functions` to `process_way` (same for node, segment and turn).
      - Removes `get_restrictions()`. Instead set `.restrictions` in the config hash in `setup()`.
      - Removes `get_name_suffix_list()`. Instead set `.suffix_list` in the config hash in `setup()`.
      - Renames `Handlers` to `WayHandlers`.
      - Pass functions instead of strings to `WayHandlers.run()`, so it's possible to mix in your own functions.
      - Reorders arguments to `WayHandlers` functions to match `process_way()`.
      - Profiles must return a hash of profile functions. This makes it easier for profiles to include each other.
      - Guidance: add support for throughabouts
    - Bugfixes
      - Properly save/retrieve datasource annotations for road segments ([#4346](https://github.com/Project-OSRM/osrm-backend/issues/4346)
      - Fix conditional restriction grammer parsing so it works for single-day-of-week restrictions ([#4357](https://github.com/Project-OSRM/osrm-backend/pull/4357))
    - Algorithm
      - BREAKING: the file format requires re-processing due to the changes on via-ways
      - Added support for via-way restrictions
 # 5.9.2
    - API:
      - `annotations=durations,weights,speeds` values no longer include turn penalty values ([#4330](https://github.com/Project-OSRM/osrm-backend/issues/4330))
 # 5.9.1
    - Infrastructure
      - STXXL is not required by default
 # 5.9.0
  - Changes from 5.8:
    - Algorithm:
      - Multi-Level Dijkstra:
        - Plugins supported: `table`
        - Adds alternative routes support (see [#4047](https://github.com/Project-OSRM/osrm-backend/pull/4047) and [3905](https://github.com/Project-OSRM/osrm-backend/issues/3905)): provides reasonably looking alternative routes (many, if possible) with reasonable query times.
    - API:
      - Exposes `alternatives=Number` parameter overload in addition to the boolean flag.
      - Support for exits numbers and names. New member `exits` in `RouteStep`, based on `junction:ref` on ways
      - `Intersection` now has new parameter `classes` that can be set in the profile on each way.
    - Profiles:
      - `result.exits` allows you to set a way's exit numbers and names, see [`junction:ref`](http://wiki.openstreetmap.org/wiki/Proposed_features/junction_details)
      - `ExtractionWay` now as new property `forward_classes` and `backward_classes` that can set in the `way_function`.
         The maximum number of classes is 8.
      - We now respect the `construction` tag. If the `construction` tag value is not on our whitelist (`minor`, `widening`, `no`) we will exclude the road.
    - Node.js Bindings:
      - Exposes `alternatives=Number` parameter overload in addition to the boolean flag
      - Expose `EngineConfig` options in the node bindings
    - Tools:
      - Exposes engine limit on number of alternatives to generate `--max-alternatives` in `osrm-routed` (3 by default)
    - Infrastructure
      - STXXL is not required to build OSRM and is an optional dependency for back-compatibility (ENABLE_STXXL=On)
      - OpenMP is only required when the optional STXXL dependency is used
    - Bug fixes:
      - #4278: Remove superflous continious instruction on a motorway.
 # 5.8.0
  - Changes from 5.7
    - API:
      - polyline6 support in request string
      - new parameter `approaches` for `route`, `table`, `trip` and `nearest` requests.  This parameter keep waypoints on the curb side.
        'approaches' accepts both 'curb' and 'unrestricted' values.
        Note : the curb side depend on the `ProfileProperties::left_hand_driving`, it's a global property set once by the profile. If you are working with a planet dataset, the api will be wrong in some countries, and right in others.
    - NodeJs Bindings
      - new parameter `approaches` for `route`, `table`, `trip` and `nearest` requests.
    - Tools
      - `osrm-partition` now ensures it is called before `osrm-contract` and removes inconsitent .hsgr files automatically.
    - Features
      - Added conditional restriction support with `parse-conditional-restrictions=true|false` to osrm-extract. This option saves conditional turn restrictions to the .restrictions file for parsing by contract later. Added `parse-conditionals-from-now=utc time stamp` and `--time-zone-file=/path/to/file`  to osrm-contract
      - Command-line tools (osrm-extract, osrm-contract, osrm-routed, etc) now return error codes and legible error messages for common problem scenarios, rather than ugly C++ crashes
      - Speed up pre-processing by only running the Lua `node_function` for nodes that have tags.  Cuts OSM file parsing time in half.
      - osrm-extract now performs generation of edge-expanded-edges using all available CPUs, which should make osrm-extract significantly faster on multi-CPU machines
    - Files
      - .osrm.nodes file was renamed to .nbg_nodes and .ebg_nodes was added
    - Guidance
      - #4075 Changed counting of exits on service roundabouts
    - Debug Tiles
      - added support for visualising turn penalties to the MLD plugin
      - added support for showing the rate (reciprocal of weight) on each edge when used
      - added support for turn weights in addition to turn durations in debug tiles
    - Bugfixes
      - Fixed a copy/paste issue assigning wrong directions in similar turns (left over right)
      - #4074: fixed a bug that would announce entering highway ramps as u-turns
      - #4122: osrm-routed/libosrm should throw exception when a dataset incompatible with the requested algorithm is loaded
      - Avoid collapsing u-turns into combined turn instructions
 # 5.7.1
    - Bugfixes
      - #4030 Roundabout edge-case crashes post-processing
 # 5.7.0
  - Changes from 5.6
    - Algorithm:
      - OSRM object has new option `algorithm` that allows the selection of a routing algorithm.
      - New experimental algorithm: Multi-Level Dijkstra with new toolchain:
        - Allows for fast metric updates in below a minute on continental sized networks (osrm-customize)
        - Plugins supported: `match` and `route`
        - Quickstart: `osrm-extract data.osm.pbf`, `osrm-partition data.osrm`, `osrm-customize data.osrm`, `osrm-routed --algorithm=MLD data.osrm`
    - NodeJs Bindings
      - Merged https://github.com/Project-OSRM/node-osrm into repository. Build via `cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=On -DENABLE_MASON=On`.
      - `OSRM` object has new option `algorihtm="CH","CoreCH","MLD"`
    - Internals
      - Shared memory notification via conditional variables on Linux or semaphore queue on OS X and Windows with a limit of 128 OSRM Engine instances
    - Files
      - .osrm.datasource_index file was removed. Data is now part of .osrm.geometries.
      - .osrm.edge_lookup was removed. The option `--generate-edge-lookup` does nothing now.
      - `osrm-contract` does not depend on the `.osrm.fileIndex` file anymore
      - `osrm-extract` creates new file `.osrm.cnbg` and `.cnbg_to_ebg`
      - `osrm-partition` creates new file `.osrm.partition` and `.osrm.cells`
      - `osrm-customize` creates new file `.osrm.mldgr`
    - Profiles
      - Added `force_split_edges` flag to global properties. True value guarantees that segment_function will be called for all segments, but also could double memory consumption
    - Map Matching:
      - new option `gaps=split|ignore` to enable/disbale track splitting
      - new option `tidy=true|false` to simplify traces automatically
 # 5.6.3
  - Changes from 5.6.0
    - Bugfixes
      - #3790 Fix incorrect speed values in tile plugin
 # 5.6.2
  - Changes from 5.6.0
    - Bugfixes
      - Fix incorrect forward datasources getter in facade
 # 5.6.1
  - Changes from 5.6.0
    - Bugfixes
      - Fix #3754 add restricted penalty on NoTurn turns
 # 5.6.0
  - Changes from 5.5
    - Bugfixes
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/CODE-OF-CONDUCT.md
+++ b/CODE-OF-CONDUCT.md
@ -1,3 +0,0 @@
 # Code of conduct
 Everyone is invited to participate in Project OSRM’s open source projects and public discussions: we want to create a welcoming and friendly environment. Harassment of participants or other unethical and unprofessional behavior will not be tolerated in our spaces. The [Contributor Covenant](http://contributor-covenant.org) applies to all projects under the Project-OSRM organization and we ask that you please read [the full text](http://contributor-covenant.org/version/1/2/0/).
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,16 +1,12 @@
 # Everyone
 Please take some time to review our [code of conduct](CODE-OF-CONDUCT.md) to help guide your interactions with others on this project.
 # User
 Before you open a new issue, please search for older ones that cover the same issue.
 In general "me too" comments/issues are frowned upon.
-You can add a :+1: emoji reaction to the issue if you want to express interest in this.
+You can add a :+1: emoji to the issue if you want to express interest in this.
 # Developer
-We use `clang-format` version `15` to consistently format the code base. There is a helper script under `scripts/format.sh`.
+We use `clang-format` version `3.8` to consistently format the code base. There is a helper script under `scripts/format.sh`.
 The format is automatically checked by the `mason-linux-release` job of a Travis CI build.
 To save development time a local hook `.git/hooks/pre-push`
 ```
@ -22,7 +18,7 @@ if [ x"$remote" = xorigin  ] ; then
        echo "Rejected push to $remote/master" ; exit 1
    fi
-    ./scripts/format.sh && ./scripts/error_on_dirty.sh
+    ./scripts/format.sh
    if [ $? -ne 0 ] ; then
        echo "Unstaged format changes" ; exit 1
    fi
--- a/LICENCE.TXT
+++ b/LICENCE.TXT
@ -0,0 +1,22 @@
 Copyright (c) 2016, Project OSRM contributors
 All rights reserved.
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 Redistributions of source code must retain the above copyright notice, this list
 of conditions and the following disclaimer.
 Redistributions in binary form must reproduce the above copyright notice, this
 list of conditions and the following disclaimer in the documentation and/or
 other materials provided with the distribution.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@ -1,22 +0,0 @@
 Copyright (c) 2017, Project OSRM contributors
 All rights reserved.
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 Redistributions of source code must retain the above copyright notice, this list
 of conditions and the following disclaimer.
 Redistributions in binary form must reproduce the above copyright notice, this
 list of conditions and the following disclaimer in the documentation and/or
 other materials provided with the distribution.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
 ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- a/README.md
+++ b/README.md
@ -1,113 +1,45 @@
 ## Open Source Routing Machine
 | 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) [![Codecov](https://codecov.io/gh/Project-OSRM/osrm-backend/branch/master/graph/badge.svg)](https://codecov.io/gh/Project-OSRM/osrm-backend) [![Discord](https://img.shields.io/discord/1034487840219860992)](https://discord.gg/es9CdcCXcb)
+High performance routing engine written in C++14 designed to run on OpenStreetMap data.
 High performance routing engine written in C++ designed to run on OpenStreetMap data.
 The following services are available via HTTP API, C++ library interface and NodeJs wrapper:
 - Nearest - Snaps coordinates to the street network and returns the nearest matches
 - Route - Finds the fastest route between coordinates
- Table - Computes the duration or distances of the fastest route between all pairs of supplied coordinates
+- Table - Computes the duration of the fastest route between all pairs of supplied coordinates
 - Match - Snaps noisy GPS traces to the road network in the most plausible way
 - Trip - Solves the Traveling Salesman Problem using a greedy heuristic
 - Tile - Generates Mapbox Vector Tiles with internal routing metadata
 To quickly try OSRM use our [demo server](http://map.project-osrm.org) which comes with both the backend and a frontend on top.
 For a quick introduction about how the road network is represented in OpenStreetMap and how to map specific road network features have a look at [the OSM wiki on routing](https://wiki.openstreetmap.org/wiki/Routing) or [this guide about mapping for navigation](https://web.archive.org/web/20221206013651/https://labs.mapbox.com/mapping/mapping-for-navigation/).
 Related [Project-OSRM](https://github.com/Project-OSRM) repositories:
 - [node-osrm](https://github.com/Project-OSRM/node-osrm) - Production-ready NodeJs bindings for the routing engine
 - [osrm-frontend](https://github.com/Project-OSRM/osrm-frontend) - User-facing frontend with map. The demo server runs this on top of the backend
 - [osrm-text-instructions](https://github.com/Project-OSRM/osrm-text-instructions) - Text instructions from OSRM route response
 - [osrm-backend-docker](https://github.com/project-osrm/osrm-backend/pkgs/container/osrm-backend) - Ready to use Docker images
 ## Documentation
 ### Full documentation
 - [Hosted documentation](http://project-osrm.org)
 - [osrm-routed HTTP API documentation](docs/http.md)
 - [libosrm API documentation](docs/libosrm.md)
 ## Contact
 - Discord: [join](https://discord.gg/es9CdcCXcb)
 - IRC: `irc.oftc.net`, channel: `#osrm` ([Webchat](https://webchat.oftc.net))
 - Mailinglist: `https://lists.openstreetmap.org/listinfo/osrm-talk`
 ## Quick Start
-The easiest and quickest way to setup your own routing engine is to use Docker images we provide.
+The following targets Ubuntu 16.04.
 There are two pre-processing pipelines available:
 - Contraction Hierarchies (CH)
 - Multi-Level Dijkstra (MLD)
 we recommend using MLD by default except for special use-cases such as very large distance matrices where CH is still a better fit for the time being.
 In the following we explain the MLD pipeline.
 If you want to use the CH pipeline instead replace `osrm-partition` and `osrm-customize` with a single `osrm-contract` and change the algorithm option for `osrm-routed` to `--algorithm ch`.
 ### Using Docker
 We base our Docker images ([backend](https://github.com/Project-OSRM/osrm-backend/pkgs/container/osrm-backend), [frontend](https://hub.docker.com/r/osrm/osrm-frontend/)) on Debian and make sure they are as lightweight as possible. Older backend versions can be found on [Docker Hub](https://hub.docker.com/r/osrm/osrm-backend/).
 Download OpenStreetMap extracts for example from [Geofabrik](http://download.geofabrik.de/)
    wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf
 Pre-process the extract with the car profile and start a routing engine HTTP server on port 5000
    docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-extract -p /opt/car.lua /data/berlin-latest.osm.pbf || echo "osrm-extract failed"
 The flag `-v "${PWD}:/data"` creates the directory `/data` inside the docker container and makes the current working directory `"${PWD}"` available there. The file `/data/berlin-latest.osm.pbf` inside the container is referring to `"${PWD}/berlin-latest.osm.pbf"` on the host.
    docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-partition /data/berlin-latest.osrm || echo "osrm-partition failed"
    docker run -t -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-customize /data/berlin-latest.osrm || echo "osrm-customize failed"
 Note there is no `berlin-latest.osrm` file, but multiple `berlin-latest.osrm.*` files, i.e. `berlin-latest.osrm` is not file path, but "base" path referring to set of files and there is an option to omit this `.osrm` suffix completely(e.g. `osrm-partition /data/berlin-latest`).
    docker run -t -i -p 5000:5000 -v "${PWD}:/data" ghcr.io/project-osrm/osrm-backend osrm-routed --algorithm mld /data/berlin-latest.osrm
 Make requests against the HTTP server
    curl "http://127.0.0.1:5000/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true"
 Optionally start a user-friendly frontend on port 9966, and open it up in your browser
    docker run -p 9966:9966 osrm/osrm-frontend
    xdg-open 'http://127.0.0.1:9966'
 In case Docker complains about not being able to connect to the Docker daemon make sure you are in the `docker` group.
    sudo usermod -aG docker $USER
 After adding yourself to the `docker` group make sure to log out and back in again with your terminal.
 We support the following images in the Container Registry:
 Name | Description
 -----|------
 `latest` | `master` compiled with release flag
 `latest-assertions` | `master` compiled with with release flag, assertions enabled and debug symbols
 `latest-debug` | `master` compiled with debug flag
 `<tag>` | specific tag compiled with release flag
 `<tag>-debug` | specific tag compiled with debug flag
 ### Building from Source
 The following targets Ubuntu 22.04.
 For instructions how to build on different distributions, macOS or Windows see our [Wiki](https://github.com/Project-OSRM/osrm-backend/wiki).
-Install dependencies
+#### Install dependencies
 ```bash
 sudo apt install build-essential git cmake pkg-config \
-libbz2-dev libxml2-dev libzip-dev libboost-all-dev \
+libbz2-dev libstxxl-dev libstxxl1v5 libxml2-dev \
-lua5.2 liblua5.2-dev libtbb-dev
+libzip-dev libboost-all-dev lua5.2 liblua5.2-dev libtbb-dev
 ```
-Compile and install OSRM binaries
+#### Compile and install OSRM binaries:
 ```bash
 mkdir -p build
@ -117,56 +49,44 @@ cmake --build .
 sudo cmake --build . --target install
 ```
-### Request Against the Demo Server
+#### Grab a `.osm.pbf` extract from [Geofabrik](http://download.geofabrik.de/index.html) or [Mapzen's Metro Extracts](https://mapzen.com/data/metro-extracts/)
-Read the [API usage policy](https://github.com/Project-OSRM/osrm-backend/wiki/Demo-server).
+```bash
 wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf
 ```
 #### Pre-process the extract and start the HTTP server
 ```
 osrm-extract berlin-latest.osm.pbf -p profiles/car.lua
 osrm-contract berlin-latest.osrm
 osrm-routed berlin-latest.osrm
 ```
 #### Running Queries
 ```
 curl http://127.0.0.1:5000/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true
 ```
 ## Documentation
 ### Full documentation
 - [Hosted documentation](http://project-osrm.org)
 - [osrm-routed HTTP API documentation](docs/http.md)
 - [libosrm API documentation](docs/libosrm.md)
 ### Running a request against the Demo Server
 Read the [API usage policy](https://github.com/Project-OSRM/osrm-backend/wiki/Api-usage-policy).
 Simple query with instructions and alternatives on Berlin:
 ```
-curl "https://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true&alternatives=true"
+curl https://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true&alternatives=true
 ```
 ### Using the Node.js Bindings
 The Node.js bindings provide read-only access to the routing engine.
 We provide API documentation and examples [here](docs/nodejs/api.md).
 You will need a modern `libstdc++` toolchain (`>= GLIBCXX_3.4.26`) for binary compatibility if you want to use the pre-built binaries.
 For older Ubuntu systems you can upgrade your standard library for example with:
 ```
 sudo add-apt-repository ppa:ubuntu-toolchain-r/test
 sudo apt-get update -y
 sudo apt-get install -y libstdc++-9-dev
 ```
 You can install the Node.js bindings via `npm install @project-osrm/osrm` or from this repository either via
    npm install
 which will check and use pre-built binaries if they're available for this release and your Node version, or via
    npm install --build-from-source
 to always force building the Node.js bindings from source.
 #### Unscoped packages
 Prior to v5.27.0, the `osrm` Node package was unscoped. If you are upgrading from an old package, you will need to do the following:
 ```
 npm uninstall osrm --save
 npm install @project-osrm/osrm --save
 ```
 #### Package docs
 For usage details have a look [these API docs](docs/nodejs/api.md).
 An exemplary implementation by a 3rd party with Docker and Node.js can be found [here](https://github.com/door2door-io/osrm-express-server-demo).
 ## References in publications
 When using the code in a (scientific) publication, please cite
--- a/appveyor-build.bat
+++ b/appveyor-build.bat
@ -0,0 +1,174 @@
@ECHO OFF
 SETLOCAL
 SET EL=0
 ECHO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 SET PROJECT_DIR=%CD%
 ECHO PROJECT_DIR^: %PROJECT_DIR%
 ECHO NUMBER_OF_PROCESSORS^: %NUMBER_OF_PROCESSORS%
 ECHO cmake^: && cmake --version
 IF %ERRORLEVEL% NEQ 0 ECHO CMAKE not found && GOTO CMAKE_NOT_OK
 cmake --version | findstr /C:"3.7.1" && GOTO CMAKE_OK
 :CMAKE_NOT_OK
 SET CMAKE_VERSION=3.7.1
 ECHO CMAKE NOT OK - downloading new CMake %CMAKE_VERSION%
 IF NOT EXIST cm.zip powershell Invoke-WebRequest https://cmake.org/files/v3.7/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
 SET PATH=%PROJECT_DIR%\cmake-%CMAKE_VERSION%-win32-x86\bin;%PATH%
 :CMAKE_OK
 ECHO CMAKE_OK
 cmake --version
 ECHO activating VS command prompt ...
 SET PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
 CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 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.0.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 https://mapbox.s3.amazonaws.com/windows-builds/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%/boost
 set BOOST_LIBRARYDIR=%BOOST_ROOT%/lib
 set TBB_INSTALL_DIR=%OSRMDEPSDIR%/tbb
 set TBB_ARCH_PLATFORM=intel64/vc14
 ECHO OSRMDEPSDIR       ^: %OSRMDEPSDIR%
 ECHO PREFIX            ^: %PREFIX%
 ECHO BOOST_ROOT        ^: %BOOST_ROOT%
 ECHO BOOST_LIBRARYDIR  ^: %BOOST_LIBRARYDIR%
 ECHO TBB_INSTALL_DIR   ^: %TBB_INSTALL_DIR%
 ECHO TBB_ARCH_PLATFORM ^: %TBB_ARCH_PLATFORM%
 ECHO calling cmake ....
 cmake .. ^
 -G "Visual Studio 14 2015 Win64" ^
 -DBOOST_ROOT=%BOOST_ROOT% ^
 -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% ^
 -DBoost_ADDITIONAL_VERSIONS=1.58 ^
 -DBoost_USE_MULTITHREADED=ON ^
 -DBoost_USE_STATIC_LIBS=ON ^
 -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:14.0 ^
 /p:PlatformToolset=v140 ^
 /clp:Verbosity=normal ^
 /nologo ^
 /flp1:logfile=build_errors.txt;errorsonly ^
 /flp2:logfile=build_warnings.txt;warningsonly
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 CD %PROJECT_DIR%\build
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 SET PATH=%PROJECT_DIR%\osrm-deps\libs\bin;%PATH%
 ECHO running extractor-tests.exe ...
 unit_tests\%Configuration%\extractor-tests.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 ECHO running engine-tests.exe ...
 unit_tests\%Configuration%\engine-tests.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 ECHO running util-tests.exe ...
 unit_tests\%Configuration%\util-tests.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 ECHO running server-tests.exe ...
 unit_tests\%Configuration%\server-tests.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 ECHO running library-tests.exe ...
 SET test_region=monaco
 SET test_osm=%test_region%.osm.pbf
 IF NOT EXIST %test_osm% powershell Invoke-WebRequest https://s3.amazonaws.com/mapbox/osrm/testing/monaco.osm.pbf -OutFile %test_osm%
 %Configuration%\osrm-extract.exe -p ../profiles/car.lua %test_osm%
 %Configuration%\osrm-contract.exe %test_region%.osrm
 unit_tests\%Configuration%\library-tests.exe %test_region%.osrm
 IF NOT "%APPVEYOR_REPO_BRANCH%"=="master" GOTO DONE
 ECHO ========= CREATING PACKAGES ==========
 CD %PROJECT_DIR%\build\%Configuration%
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 SET P=%PROJECT_DIR%
 SET ZIP= %P%\osrm_%Configuration%.zip
 IF EXIST %ZIP% ECHO deleting %ZIP% && DEL /F /Q %ZIP%
 IF %ERRORLEVEL% NEQ 0 ECHO deleting %ZIP% FAILED && GOTO ERROR
 7z a %ZIP% *.lib *.exe *.pdb %P%/osrm-deps/libs/bin/*.dll -tzip -mx9 | %windir%\system32\FIND "ing archive"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 CD ..\..\profiles
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 ECHO disk=c:\temp\stxxl,10000,wincall > .stxxl.txt
 7z a %ZIP% * -tzip -mx9 | %windir%\system32\FIND "ing archive"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 GOTO DONE
 :ERROR
 ECHO ~~~~~~~~~~~~~~~~~~~~~~ ERROR %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ECHO ERRORLEVEL^: %ERRORLEVEL%
 SET EL=%ERRORLEVEL%
 :DONE
 ECHO ~~~~~~~~~~~~~~~~~~~~~~ DONE %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 EXIT /b %EL%
--- a/appveyor.yml
+++ b/appveyor.yml
@ -0,0 +1,52 @@
 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 2015
 # clone directory
 clone_folder: c:\projects\osrm
 platform: x64
 build_script:
  - CALL appveyor-build.bat
 before_test:
  - node --version
  - npm --version
  - npm install
  - npm link
  - SET PATH=%CD%\osrm-deps\libs\bin;%PATH%
  - SET OSRM_BUILD_DIR=build\%Configuration%
  - npm test
 artifacts:
  - path: osrm_Release.zip
    name: osrm_Release.zip
 #  - path: osrm_Debug.zip
 #    name: osrm_Debug.zip
 branches:
  only:
    - master
 deploy:
  provider: FTP
  server:
    secure: ef7oiQTTXFGt8NdNiOHm/uRFVrUttzyFbIlnaeHhQvw=
  username:
    secure: Bw+Se2GTJxA6+GtRkEc//tQSBHOuFIuJHBjFwR9cD+8=
  password:
    secure: eqwESZqxMXC/j5mOCpaXuw==
  folder: /
  enable_ssl: true
  active_mode: false
--- a/build-local.bat
+++ b/build-local.bat
@ -0,0 +1,33 @@
@ECHO OFF
 SETLOCAL
 SET EL=0
 ECHO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 SET PLATFORM=x64
 SET CONFIGURATION=Release
 ::SET LOCAL_DEV=1
 FOR /F "tokens=*" %%i in ('git rev-parse --abbrev-ref HEAD') do SET APPVEYOR_REPO_BRANCH=%%i
 ECHO APPVEYOR_REPO_BRANCH^: %APPVEYOR_REPO_BRANCH%
 SET PATH=C:\mb\windows-builds-64\tmp-bin\cmake-3.7.0-rc2-win32-x86\bin;%PATH%
 SET PATH=C:\Program Files\7-Zip;%PATH%
 powershell Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 CALL appveyor-build.bat
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 GOTO DONE
 :ERROR
 ECHO ~~~~~~~~~~~~~~~~~~~~~~ ERROR %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ECHO ERRORLEVEL^: %ERRORLEVEL%
 SET EL=%ERRORLEVEL%
 :DONE
 ECHO ~~~~~~~~~~~~~~~~~~~~~~ DONE %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 EXIT /b %EL%
--- a/cmake/CPackConfig.cmake
+++ b/cmake/CPackConfig.cmake
@ -11,7 +11,7 @@ SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY "FALSE")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Open Source Routing Machine (OSRM) is a high-performance routing engine. It combines sophisticated routing algorithms with the open and free data of the OpenStreetMap.")
 SET(CPACK_PACKAGE_CONTACT "Project OSRM <info@project-osrm.org>")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.TXT")
+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENCE.TXT")
 SET(CPACK_STRIP_FILES "TRUE")
 file(GLOB_RECURSE ProfileGlob ${CMAKE_SOURCE_DIR}/profiles/*)
--- a/cmake/CheckCXXCompilerFlag.cmake
+++ b/cmake/CheckCXXCompilerFlag.cmake
@ -0,0 +1,29 @@
 # - Check whether the CXX compiler supports a given flag.
 # CHECK_CXX_COMPILER_FLAG(<flag> <var>)
 #  <flag> - the compiler flag
 #  <var>  - variable to store the result
 # This internally calls the check_cxx_source_compiles macro.  See help
 # for CheckCXXSourceCompiles for a listing of variables that can
 # modify the build.
 # Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 INCLUDE(CheckCXXSourceCompiles)
 MACRO (CHECK_CXX_COMPILER_FLAG _FLAG _RESULT)
   SET(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
   SET(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
   CHECK_CXX_SOURCE_COMPILES("int main() { return 0;}" ${_RESULT}
     # Some compilers do not fail with a bad flag
     FAIL_REGEX "unrecognized .*option"                     # GNU
     FAIL_REGEX "ignoring unknown option"                   # MSVC
     FAIL_REGEX "[Uu]nknown option"                         # HP
     FAIL_REGEX "[Ww]arning: [Oo]ption"                     # SunPro
     FAIL_REGEX "command option .* is not recognized"       # XL
     )
   SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
 ENDMACRO (CHECK_CXX_COMPILER_FLAG)
--- a/cmake/FindLua.cmake
+++ b/cmake/FindLua.cmake
@ -36,18 +36,13 @@
 # This is because, the lua location is not standardized and may exist in
 # locations other than lua/
 if(NOT PKG_CONFIG_FOUND)
  include(CMakeFindDependencyMacro)
  find_dependency(PkgConfig)
 endif()
 unset(_lua_include_subdirs)
 unset(_lua_library_names)
 unset(_lua_append_versions)
 # this is a function only to have all the variables inside go away automatically
 function(_lua_set_version_vars)
-    set(LUA_VERSIONS5 5.4 5.3 5.2 5.1 5.0)
+    set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
    if (Lua_FIND_VERSION_EXACT)
        if (Lua_FIND_VERSION_COUNT GREATER 1)
@ -86,16 +81,11 @@ function(_lua_set_version_vars)
             lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
             lua.${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
        )
        pkg_check_modules(LUA QUIET "lua${ver}")
        list(APPEND _lua_include_subdirs ${LUA_INCLUDE_DIRS})
        list(APPEND _lua_library_names ${LUA_LIBRARIES})
        list(APPEND _lua_library_dirs ${LUA_LIBRARY_DIRS})
    endforeach ()
    set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
    set(_lua_library_names "${_lua_library_names}" PARENT_SCOPE)
    set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE)
    set(_lua_library_dirs "${_lua_library_dirs}" PARENT_SCOPE)
 endfunction(_lua_set_version_vars)
 function(_lua_check_header_version _hdr_file)
@ -168,7 +158,6 @@ find_library(LUA_LIBRARY
    ENV LUA_DIR
  PATH_SUFFIXES lib
  PATHS
  ${_lua_library_dirs}
  ~/Library/Frameworks
  /Library/Frameworks
  /sw
--- a/cmake/FindSTXXL.cmake
+++ b/cmake/FindSTXXL.cmake
@ -0,0 +1,51 @@
 # Locate STXXL library
 # This module defines
 #  STXXL_FOUND, if false, do not try to link to libstxxl
 #  STXXL_LIBRARY
 #  STXXL_INCLUDE_DIR, where to find stxxl.h
 #
 IF( NOT STXXL_FIND_QUIETLY )
    MESSAGE(STATUS "Looking for STXXL...")
 ENDIF()
 FIND_PATH(STXXL_INCLUDE_DIR stxxl.h
  HINTS
  $ENV{STXXL_DIR}
  PATH_SUFFIXES stxxl include/stxxl/stxxl include/stxxl include
  PATHS
  ~/Library/Frameworks
  /Library/Frameworks
  /usr/local
  /usr
  /opt/local # DarwinPorts
  /opt
 )
 FIND_LIBRARY(STXXL_LIBRARY
  NAMES stxxl stxxl_debug
  HINTS
  $ENV{STXXL_DIR}
  PATH_SUFFIXES lib64 lib
  PATHS
  ~/Library/Frameworks
  /Library/Frameworks
  /usr/local
  /usr
  /opt/local
  /opt
 )
 INCLUDE(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set STXXL_FOUND to TRUE if
 # all listed variables are TRUE
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(STXXL  DEFAULT_MSG  STXXL_LIBRARY STXXL_INCLUDE_DIR)
 IF( NOT STXXL_FIND_QUIETLY )
    IF( STXXL_FOUND )
        MESSAGE(STATUS "Found STXXL: ${STXXL_LIBRARY}" )
    ENDIF()
 ENDIF()
 MARK_AS_ADVANCED(STXXL_INCLUDE_DIR STXXL_LIBRARY)
--- a/cmake/FindShapefile.cmake
+++ b/cmake/FindShapefile.cmake
@ -0,0 +1,21 @@
 # - Try to find Shapefile C Library
 #   http://shapelib.maptools.org/
 #
 # Exports:
 #  Shapefile_FOUND
 #  LIBSHAPEFILE_INCLUDE_DIR
 #  LIBSHAPEFILE_LIBRARY
 # Hints:
 #  LIBSHAPEFILE_LIBRARY_DIR
 find_path(LIBSHAPEFILE_INCLUDE_DIR
          shapefil.h)
 find_library(LIBSHAPEFILE_LIBRARY
             NAMES shp
             HINTS "${LIBSHAPEFILE_LIBRARY_DIR}")
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Shapefile DEFAULT_MSG
                                  LIBSHAPEFILE_LIBRARY LIBSHAPEFILE_INCLUDE_DIR)
 mark_as_advanced(LIBSHAPEFILE_INCLUDE_DIR LIBSHAPEFILE_LIBRARY)
--- a/cmake/FindTBB.cmake
+++ b/cmake/FindTBB.cmake
@ -1,456 +1,284 @@
-# - Find ThreadingBuildingBlocks include dirs and libraries
+# Locate Intel Threading Building Blocks include paths and libraries
-# Use this module by invoking find_package with the form:
+# FindTBB.cmake can be found at https://code.google.com/p/findtbb/
-#  find_package(TBB
+# Written by Hannes Hofmann <hannes.hofmann _at_ informatik.uni-erlangen.de>
-#    [REQUIRED]             # Fail with error if TBB is not found
+# Improvements by Gino van den Bergen <gino _at_ dtecta.com>,
-#    )                      #
+#   Florian Uhlig <F.Uhlig _at_ gsi.de>,
-# Once done, this will define
+#   Jiri Marsik <jiri.marsik89 _at_ gmail.com>
-#
+
-#  TBB_FOUND - system has TBB
+# The MIT License
-#  TBB_INCLUDE_DIRS - the TBB include directories
+#
-#  TBB_LIBRARIES - TBB libraries to be lined, doesn't include malloc or
+# Copyright (c) 2011 Hannes Hofmann
-#                  malloc proxy
+#
-#  TBB::tbb - imported target for the TBB library
+# Permission is hereby granted, free of charge, to any person obtaining a copy
-#
+# of this software and associated documentation files (the "Software"), to deal
-#  TBB_VERSION_MAJOR - Major Product Version Number
+# in the Software without restriction, including without limitation the rights
-#  TBB_VERSION_MINOR - Minor Product Version Number
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#  TBB_INTERFACE_VERSION - Engineering Focused Version Number
+# copies of the Software, and to permit persons to whom the Software is
-#  TBB_COMPATIBLE_INTERFACE_VERSION - The oldest major interface version
+# furnished to do so, subject to the following conditions:
-#                                     still supported. This uses the engineering
+#
-#                                     focused interface version numbers.
+# The above copyright notice and this permission notice shall be included in
-#
+# all copies or substantial portions of the Software.
-#  TBB_MALLOC_FOUND - system has TBB malloc library
+#
-#  TBB_MALLOC_INCLUDE_DIRS - the TBB malloc include directories
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  TBB_MALLOC_LIBRARIES - The TBB malloc libraries to be lined
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  TBB::malloc - imported target for the TBB malloc library
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-#
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#  TBB_MALLOC_PROXY_FOUND - system has TBB malloc proxy library
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-#  TBB_MALLOC_PROXY_INCLUDE_DIRS = the TBB malloc proxy include directories
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-#  TBB_MALLOC_PROXY_LIBRARIES - The TBB malloc proxy libraries to be lined
+# THE SOFTWARE.
-#  TBB::malloc_proxy - imported target for the TBB malloc proxy library
+
-#
+# GvdB: This module uses the environment variable TBB_ARCH_PLATFORM which defines architecture and compiler.
-#
+#   e.g. "ia32/vc8" or "em64t/cc4.1.0_libc2.4_kernel2.6.16.21"
-# This module reads hints about search locations from variables:
+#   TBB_ARCH_PLATFORM is set by the build script tbbvars[.bat|.sh|.csh], which can be found
-#  ENV TBB_ARCH_PLATFORM - for eg. set it to "mic" for Xeon Phi builds
+#   in the TBB installation directory (TBB_INSTALL_DIR).
-#  ENV TBB_ROOT or just TBB_ROOT - root directory of tbb installation
+#
-#  ENV TBB_BUILD_PREFIX - specifies the build prefix for user built tbb
+# GvdB: Mac OS X distribution places libraries directly in lib directory.
-#                         libraries. Should be specified with ENV TBB_ROOT
+#
-#                         and optionally...
+# For backwards compatibility, you may explicitely set the CMake variables TBB_ARCHITECTURE and TBB_COMPILER.
-#  ENV TBB_BUILD_DIR - if build directory is different than ${TBB_ROOT}/build
+# TBB_ARCHITECTURE [ ia32 | em64t | itanium ]
-#
+#   which architecture to use
-#
+# TBB_COMPILER e.g. vc9 or cc3.2.3_libc2.3.2_kernel2.4.21 or cc4.0.1_os10.4.9
-# Modified by Robert Maynard from the original OGRE source
+#   which compiler to use (detected automatically on Windows)
-#
+
-#-------------------------------------------------------------------
+# This module respects
-# This file is part of the CMake build system for OGRE
+# TBB_INSTALL_DIR or $ENV{TBB21_INSTALL_DIR} or $ENV{TBB_INSTALL_DIR}
-#     (Object-oriented Graphics Rendering Engine)
+
-# For the latest info, see http://www.ogre3d.org/
+# This module defines
-#
+# TBB_INCLUDE_DIRS, where to find task_scheduler_init.h, etc.
-# The contents of this file are placed in the public domain. Feel
+# TBB_LIBRARY_DIRS, where to find libtbb, libtbbmalloc
-# free to make use of it in any way you like.
+# TBB_DEBUG_LIBRARY_DIRS, where to find libtbb_debug, libtbbmalloc_debug
-#-------------------------------------------------------------------
+# TBB_INSTALL_DIR, the base TBB install directory
-#
+# TBB_LIBRARIES, the libraries to link against to use TBB.
-#=============================================================================
+# TBB_DEBUG_LIBRARIES, the libraries to link against to use TBB with debug symbols.
-# Copyright 2010-2012 Kitware, Inc.
+# TBB_FOUND, If false, don't try to use TBB.
-# Copyright 2012      Rolf Eike Beer <eike@sf-mail.de>
+# TBB_INTERFACE_VERSION, as defined in tbb/tbb_stddef.h
-#
+
-# Distributed under the OSI-approved BSD License (the "License");
+
-# see accompanying file Copyright.txt for details.
+if (WIN32)
-#
+    # has em64t/vc8 em64t/vc9
-# This software is distributed WITHOUT ANY WARRANTY; without even the
+    # has ia32/vc7.1 ia32/vc8 ia32/vc9
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+    set(_TBB_DEFAULT_INSTALL_DIR "C:/Program Files/Intel/TBB" "C:/Program Files (x86)/Intel/TBB")
-# See the License for more information.
+    set(_TBB_LIB_NAME "tbb")
-#=============================================================================
+    set(_TBB_LIB_MALLOC_NAME "${_TBB_LIB_NAME}malloc")
-# (To distribute this file outside of CMake, substitute the full
+    set(_TBB_LIB_DEBUG_NAME "${_TBB_LIB_NAME}_debug")
-#  License text for the above reference.)
+    set(_TBB_LIB_MALLOC_DEBUG_NAME "${_TBB_LIB_MALLOC_NAME}_debug")
-
+    if (MSVC71)
-
+        set (_TBB_COMPILER "vc7.1")
-#=============================================================================
+    endif(MSVC71)
-#  FindTBB helper functions and macros
+    if (MSVC80)
-#
+        set(_TBB_COMPILER "vc8")
-
+    endif(MSVC80)
-# Use TBBConfig.cmake if possible.
+    if (MSVC90)
-
+        set(_TBB_COMPILER "vc9")
-set(_tbb_find_quiet)
+    endif(MSVC90)
-if (TBB_FIND_QUIETLY)
+    if(MSVC10)
-  set(_tbb_find_quiet QUIET)
+        set(_TBB_COMPILER "vc10")
-endif ()
+    endif(MSVC10)
-set(_tbb_find_components)
+    # Todo: add other Windows compilers such as ICL.
-set(_tbb_find_optional_components)
+    set(_TBB_ARCHITECTURE ${TBB_ARCHITECTURE})
-foreach (_tbb_find_component IN LISTS TBB_FIND_COMPONENTS)
+endif (WIN32)
-  if (TBB_FIND_REQUIRED_${_tbb_find_component})
+
-    list(APPEND _tbb_find_components "${_tbb_find_component}")
+if (UNIX)
-  else ()
+    if (APPLE)
-    list(APPEND _tbb_find_optional_components "${_tbb_find_component}")
+        # MAC
-  endif ()
+        set(_TBB_DEFAULT_INSTALL_DIR "/Library/Frameworks/Intel_TBB.framework/Versions")
-endforeach ()
+        # libs: libtbb.dylib, libtbbmalloc.dylib, *_debug
-unset(_tbb_find_component)
+        set(_TBB_LIB_NAME "tbb")
-find_package(TBB CONFIG ${_tbb_find_quiet}
+        set(_TBB_LIB_MALLOC_NAME "${_TBB_LIB_NAME}malloc")
-  COMPONENTS ${_tbb_find_components}
+        set(_TBB_LIB_DEBUG_NAME "${_TBB_LIB_NAME}_debug")
-  OPTIONAL_COMPONENTS ${_tbb_find_optional_components})
+        set(_TBB_LIB_MALLOC_DEBUG_NAME "${_TBB_LIB_MALLOC_NAME}_debug")
-unset(_tbb_find_quiet)
+        # default flavor on apple: ia32/cc4.0.1_os10.4.9
-unset(_tbb_find_components)
+        # Jiri: There is no reason to presume there is only one flavor and
-unset(_tbb_find_optional_components)
+        #       that user's setting of variables should be ignored.
-if (TBB_FOUND)
+        if(NOT TBB_COMPILER)
-  return ()
+            set(_TBB_COMPILER "cc4.0.1_os10.4.9")
-endif ()
+        elseif (NOT TBB_COMPILER)
-
+            set(_TBB_COMPILER ${TBB_COMPILER})
-#====================================================
+        endif(NOT TBB_COMPILER)
-# Fix the library path in case it is a linker script
+        if(NOT TBB_ARCHITECTURE)
-#====================================================
+            set(_TBB_ARCHITECTURE "ia32")
-function(tbb_extract_real_library library real_library)
+        elseif(NOT TBB_ARCHITECTURE)
-  if(NOT UNIX OR NOT EXISTS ${library})
+            set(_TBB_ARCHITECTURE ${TBB_ARCHITECTURE})
-    set(${real_library} "${library}" PARENT_SCOPE)
+        endif(NOT TBB_ARCHITECTURE)
-    return()
+    else (APPLE)
-  endif()
+        # LINUX
-
+        set(_TBB_DEFAULT_INSTALL_DIR "/opt/intel/tbb" "/usr/local/include" "/usr/include")
-  #Read in the first 4 bytes and see if they are the ELF magic number
+        set(_TBB_LIB_NAME "tbb")
-  set(_elf_magic "7f454c46")
+        set(_TBB_LIB_MALLOC_NAME "${_TBB_LIB_NAME}malloc")
-  file(READ ${library} _hex_data OFFSET 0 LIMIT 4 HEX)
+        set(_TBB_LIB_DEBUG_NAME "${_TBB_LIB_NAME}_debug")
-  if(_hex_data STREQUAL _elf_magic)
+        set(_TBB_LIB_MALLOC_DEBUG_NAME "${_TBB_LIB_MALLOC_NAME}_debug")
-    #we have opened a elf binary so this is what
+        # has em64t/cc3.2.3_libc2.3.2_kernel2.4.21 em64t/cc3.3.3_libc2.3.3_kernel2.6.5 em64t/cc3.4.3_libc2.3.4_kernel2.6.9 em64t/cc4.1.0_libc2.4_kernel2.6.16.21
-    #we should link to
+        # has ia32/*
-    set(${real_library} "${library}" PARENT_SCOPE)
+        # has itanium/*
-    return()
+        set(_TBB_COMPILER ${TBB_COMPILER})
-  endif()
+        set(_TBB_ARCHITECTURE ${TBB_ARCHITECTURE})
-
+    endif (APPLE)
-  file(READ ${library} _data OFFSET 0 LIMIT 1024)
+endif (UNIX)
-  if("${_data}" MATCHES "INPUT \\(([^(]+)\\)")
+
-    #extract out the .so name from REGEX MATCH command
+if (CMAKE_SYSTEM MATCHES "SunOS.*")
-    set(_proper_so_name "${CMAKE_MATCH_1}")
+# SUN
-
+# not yet supported
-    #construct path to the real .so which is presumed to be in the same directory
+# has em64t/cc3.4.3_kernel5.10
-    #as the input file
+# has ia32/*
-    get_filename_component(_so_dir "${library}" DIRECTORY)
+endif (CMAKE_SYSTEM MATCHES "SunOS.*")
-    set(${real_library} "${_so_dir}/${_proper_so_name}" PARENT_SCOPE)
+
-  else()
+
-    #unable to determine what this library is so just hope everything works
+#-- Clear the public variables
-    #and pass it unmodified.
+set (TBB_FOUND "NO")
-    set(${real_library} "${library}" PARENT_SCOPE)
+
-  endif()
+
-endfunction()
+#-- Find TBB install dir and set ${_TBB_INSTALL_DIR} and cached ${TBB_INSTALL_DIR}
-
+# first: use CMake variable TBB_INSTALL_DIR
-#===============================================
+if (TBB_INSTALL_DIR)
-# Do the final processing for the package find.
+    set (_TBB_INSTALL_DIR ${TBB_INSTALL_DIR})
-#===============================================
+endif (TBB_INSTALL_DIR)
-macro(findpkg_finish PREFIX TARGET_NAME)
+# second: use environment variable
-  if (${PREFIX}_INCLUDE_DIR AND ${PREFIX}_LIBRARY)
+if (NOT _TBB_INSTALL_DIR)
-    set(${PREFIX}_FOUND TRUE)
+    if (NOT "$ENV{TBB_INSTALL_DIR}" STREQUAL "")
-    set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIR})
+        set (_TBB_INSTALL_DIR $ENV{TBB_INSTALL_DIR})
-    set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARY})
+    endif (NOT "$ENV{TBB_INSTALL_DIR}" STREQUAL "")
-  else ()
+    # Intel recommends setting TBB21_INSTALL_DIR
-    if (${PREFIX}_FIND_REQUIRED AND NOT ${PREFIX}_FIND_QUIETLY)
+    if (NOT "$ENV{TBB21_INSTALL_DIR}" STREQUAL "")
-      message(FATAL_ERROR "Required library ${PREFIX} not found.")
+        set (_TBB_INSTALL_DIR $ENV{TBB21_INSTALL_DIR})
-    endif ()
+    endif (NOT "$ENV{TBB21_INSTALL_DIR}" STREQUAL "")
-  endif ()
+    if (NOT "$ENV{TBB22_INSTALL_DIR}" STREQUAL "")
-
+        set (_TBB_INSTALL_DIR $ENV{TBB22_INSTALL_DIR})
-  if (NOT TARGET "TBB::${TARGET_NAME}")
+    endif (NOT "$ENV{TBB22_INSTALL_DIR}" STREQUAL "")
-    if (${PREFIX}_LIBRARY_RELEASE)
+    if (NOT "$ENV{TBB30_INSTALL_DIR}" STREQUAL "")
-      tbb_extract_real_library(${${PREFIX}_LIBRARY_RELEASE} real_release)
+        set (_TBB_INSTALL_DIR $ENV{TBB30_INSTALL_DIR})
-    endif ()
+    endif (NOT "$ENV{TBB30_INSTALL_DIR}" STREQUAL "")
-    if (${PREFIX}_LIBRARY_DEBUG)
+endif (NOT _TBB_INSTALL_DIR)
-      tbb_extract_real_library(${${PREFIX}_LIBRARY_DEBUG} real_debug)
+# third: try to find path automatically
-    endif ()
+if (NOT _TBB_INSTALL_DIR)
-    add_library(TBB::${TARGET_NAME} UNKNOWN IMPORTED)
+    if (_TBB_DEFAULT_INSTALL_DIR)
-    set_target_properties(TBB::${TARGET_NAME} PROPERTIES
+        set (_TBB_INSTALL_DIR ${_TBB_DEFAULT_INSTALL_DIR})
-      INTERFACE_INCLUDE_DIRECTORIES "${${PREFIX}_INCLUDE_DIR}")
+    endif (_TBB_DEFAULT_INSTALL_DIR)
-    if (${PREFIX}_LIBRARY_DEBUG AND ${PREFIX}_LIBRARY_RELEASE)
+endif (NOT _TBB_INSTALL_DIR)
-      set_target_properties(TBB::${TARGET_NAME} PROPERTIES
+# sanity check
-        IMPORTED_LOCATION "${real_release}"
+if (NOT _TBB_INSTALL_DIR)
-        IMPORTED_LOCATION_DEBUG "${real_debug}"
+    message ("ERROR: Unable to find Intel TBB install directory. ${_TBB_INSTALL_DIR}")
-        IMPORTED_LOCATION_RELEASE "${real_release}")
+else (NOT _TBB_INSTALL_DIR)
-    elseif (${PREFIX}_LIBRARY_RELEASE)
+# finally: set the cached CMake variable TBB_INSTALL_DIR
-      set_target_properties(TBB::${TARGET_NAME} PROPERTIES
+if (NOT TBB_INSTALL_DIR)
-        IMPORTED_LOCATION "${real_release}")
+    set (TBB_INSTALL_DIR ${_TBB_INSTALL_DIR} CACHE PATH "Intel TBB install directory")
-    elseif (${PREFIX}_LIBRARY_DEBUG)
+    mark_as_advanced(TBB_INSTALL_DIR)
-      set_target_properties(TBB::${TARGET_NAME} PROPERTIES
+endif (NOT TBB_INSTALL_DIR)
-        IMPORTED_LOCATION "${real_debug}")
+
-    endif ()
+
-  endif ()
+#-- A macro to rewrite the paths of the library. This is necessary, because
-
+#   find_library() always found the em64t/vc9 version of the TBB libs
-  #mark the following variables as internal variables
+macro(TBB_CORRECT_LIB_DIR var_name)
-  mark_as_advanced(${PREFIX}_INCLUDE_DIR
+#    if (NOT "${_TBB_ARCHITECTURE}" STREQUAL "em64t")
-                   ${PREFIX}_LIBRARY
+        string(REPLACE em64t "${_TBB_ARCHITECTURE}" ${var_name} ${${var_name}})
-                   ${PREFIX}_LIBRARY_DEBUG
+#    endif (NOT "${_TBB_ARCHITECTURE}" STREQUAL "em64t")
-                   ${PREFIX}_LIBRARY_RELEASE)
+    string(REPLACE ia32 "${_TBB_ARCHITECTURE}" ${var_name} ${${var_name}})
-endmacro()
+    string(REPLACE vc7.1 "${_TBB_COMPILER}" ${var_name} ${${var_name}})
-
+    string(REPLACE vc8 "${_TBB_COMPILER}" ${var_name} ${${var_name}})
-#===============================================
+    string(REPLACE vc9 "${_TBB_COMPILER}" ${var_name} ${${var_name}})
-# Generate debug names from given release names
+    string(REPLACE vc10 "${_TBB_COMPILER}" ${var_name} ${${var_name}})
-#===============================================
+endmacro(TBB_CORRECT_LIB_DIR var_content)
-macro(get_debug_names PREFIX)
+
-  foreach(i ${${PREFIX}})
+
-    set(${PREFIX}_DEBUG ${${PREFIX}_DEBUG} ${i}d ${i}D ${i}_d ${i}_D ${i}_debug ${i})
+#-- Look for include directory and set ${TBB_INCLUDE_DIR}
-  endforeach()
+set (TBB_INC_SEARCH_DIR ${_TBB_INSTALL_DIR}/include)
-endmacro()
+# Jiri: tbbvars now sets the CPATH environment variable to the directory
-
+#       containing the headers.
-#===============================================
+find_path(TBB_INCLUDE_DIR
-# See if we have env vars to help us find tbb
+    tbb/task_scheduler_init.h
-#===============================================
+    PATHS ${TBB_INC_SEARCH_DIR} ENV CPATH
-macro(getenv_path VAR)
+)
-   set(ENV_${VAR} $ENV{${VAR}})
+mark_as_advanced(TBB_INCLUDE_DIR)
-   # replace won't work if var is blank
+
-   if (ENV_${VAR})
+
-     string( REGEX REPLACE "\\\\" "/" ENV_${VAR} ${ENV_${VAR}} )
+#-- Look for libraries
-   endif ()
+# GvdB: $ENV{TBB_ARCH_PLATFORM} is set by the build script tbbvars[.bat|.sh|.csh]
-endmacro()
+if (NOT $ENV{TBB_ARCH_PLATFORM} STREQUAL "")
-
+    set (_TBB_LIBRARY_DIR 
-#===============================================
+         ${_TBB_INSTALL_DIR}/lib/$ENV{TBB_ARCH_PLATFORM}
-# Couple a set of release AND debug libraries
+         ${_TBB_INSTALL_DIR}/$ENV{TBB_ARCH_PLATFORM}/lib
-#===============================================
+        )
-macro(make_library_set PREFIX)
+endif (NOT $ENV{TBB_ARCH_PLATFORM} STREQUAL "")
-  if (${PREFIX}_RELEASE AND ${PREFIX}_DEBUG)
+# Jiri: This block isn't mutually exclusive with the previous one
-    set(${PREFIX} optimized ${${PREFIX}_RELEASE} debug ${${PREFIX}_DEBUG})
+#       (hence no else), instead I test if the user really specified
-  elseif (${PREFIX}_RELEASE)
+#       the variables in question.
-    set(${PREFIX} ${${PREFIX}_RELEASE})
+if ((NOT ${TBB_ARCHITECTURE} STREQUAL "") AND (NOT ${TBB_COMPILER} STREQUAL ""))
-  elseif (${PREFIX}_DEBUG)
+    # HH: deprecated
-    set(${PREFIX} ${${PREFIX}_DEBUG})
+    message(STATUS "[Warning] FindTBB.cmake: The use of TBB_ARCHITECTURE and TBB_COMPILER is deprecated and may not be supported in future versions. Please set \$ENV{TBB_ARCH_PLATFORM} (using tbbvars.[bat|csh|sh]).")
-  endif ()
+    # Jiri: It doesn't hurt to look in more places, so I store the hints from
-endmacro()
+    #       ENV{TBB_ARCH_PLATFORM} and the TBB_ARCHITECTURE and TBB_COMPILER
-
+    #       variables and search them both.
-
+    set (_TBB_LIBRARY_DIR "${_TBB_INSTALL_DIR}/${_TBB_ARCHITECTURE}/${_TBB_COMPILER}/lib" ${_TBB_LIBRARY_DIR})
-#=============================================================================
+endif ((NOT ${TBB_ARCHITECTURE} STREQUAL "") AND (NOT ${TBB_COMPILER} STREQUAL ""))
-#  Now to actually find TBB
+
-#
+# GvdB: Mac OS X distribution places libraries directly in lib directory.
-
+list(APPEND _TBB_LIBRARY_DIR ${_TBB_INSTALL_DIR}/lib)
-# Get path, convert backslashes as ${ENV_${var}}
+
-getenv_path(TBB_ROOT)
+# Jiri: No reason not to check the default paths. From recent versions,
-
+#       tbbvars has started exporting the LIBRARY_PATH and LD_LIBRARY_PATH
-# initialize search paths
+#       variables, which now point to the directories of the lib files.
-set(TBB_PREFIX_PATH ${TBB_ROOT} ${ENV_TBB_ROOT})
+#       It all makes more sense to use the ${_TBB_LIBRARY_DIR} as a HINTS
-set(TBB_INC_SEARCH_PATH "")
+#       argument instead of the implicit PATHS as it isn't hard-coded
-set(TBB_LIB_SEARCH_PATH "")
+#       but computed by system introspection. Searching the LIBRARY_PATH
-
+#       and LD_LIBRARY_PATH environment variables is now even more important
-
+#       that tbbvars doesn't export TBB_ARCH_PLATFORM and it facilitates
-# If user built from sources
+#       the use of TBB built from sources.
-set(TBB_BUILD_PREFIX $ENV{TBB_BUILD_PREFIX})
+find_library(TBB_LIBRARY ${_TBB_LIB_NAME} HINTS ${_TBB_LIBRARY_DIR}
-if (TBB_BUILD_PREFIX AND ENV_TBB_ROOT)
+        PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
-  getenv_path(TBB_BUILD_DIR)
+find_library(TBB_MALLOC_LIBRARY ${_TBB_LIB_MALLOC_NAME} HINTS ${_TBB_LIBRARY_DIR}
-  if (NOT ENV_TBB_BUILD_DIR)
+        PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
-    set(ENV_TBB_BUILD_DIR ${ENV_TBB_ROOT}/build)
+
-  endif ()
+#Extract path from TBB_LIBRARY name
-
+get_filename_component(TBB_LIBRARY_DIR ${TBB_LIBRARY} PATH)
-  # include directory under ${ENV_TBB_ROOT}/include
+
-  list(APPEND TBB_LIB_SEARCH_PATH
+#TBB_CORRECT_LIB_DIR(TBB_LIBRARY)
-    ${ENV_TBB_BUILD_DIR}/${TBB_BUILD_PREFIX}_release
+#TBB_CORRECT_LIB_DIR(TBB_MALLOC_LIBRARY)
-    ${ENV_TBB_BUILD_DIR}/${TBB_BUILD_PREFIX}_debug)
+mark_as_advanced(TBB_LIBRARY TBB_MALLOC_LIBRARY)
-endif ()
+
-
+#-- Look for debug libraries
-
+# Jiri: Changed the same way as for the release libraries.
-# For Windows, let's assume that the user might be using the precompiled
+find_library(TBB_LIBRARY_DEBUG ${_TBB_LIB_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}
-# TBB packages from the main website. These use a rather awkward directory
+        PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
-# structure (at least for automatically finding the right files) depending
+find_library(TBB_MALLOC_LIBRARY_DEBUG ${_TBB_LIB_MALLOC_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}
-# on platform and compiler, but we'll do our best to accommodate it.
+        PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
-# Not adding the same effort for the precompiled linux builds, though. Those
+
-# have different versions for CC compiler versions and linux kernels which
+# Jiri: Self-built TBB stores the debug libraries in a separate directory.
-# will never adequately match the user's setup, so there is no feasible way
+#       Extract path from TBB_LIBRARY_DEBUG name
-# to detect the "best" version to use. The user will have to manually
+get_filename_component(TBB_LIBRARY_DEBUG_DIR ${TBB_LIBRARY_DEBUG} PATH)
-# select the right files. (Chances are the distributions are shipping their
+
-# custom version of tbb, anyway, so the problem is probably nonexistent.)
+#TBB_CORRECT_LIB_DIR(TBB_LIBRARY_DEBUG)
-if (WIN32 AND MSVC)
+#TBB_CORRECT_LIB_DIR(TBB_MALLOC_LIBRARY_DEBUG)
-  set(COMPILER_PREFIX "vc7.1")
+mark_as_advanced(TBB_LIBRARY_DEBUG TBB_MALLOC_LIBRARY_DEBUG)
-  if (MSVC_VERSION EQUAL 1400)
+
-    set(COMPILER_PREFIX "vc8")
+
-  elseif(MSVC_VERSION EQUAL 1500)
+if (TBB_INCLUDE_DIR)
-    set(COMPILER_PREFIX "vc9")
+    if (TBB_LIBRARY)
-  elseif(MSVC_VERSION EQUAL 1600)
+        set (TBB_FOUND "YES")
-    set(COMPILER_PREFIX "vc10")
+        set (TBB_LIBRARIES ${TBB_LIBRARY} ${TBB_MALLOC_LIBRARY} ${TBB_LIBRARIES})
-  elseif(MSVC_VERSION EQUAL 1700)
+        set (TBB_DEBUG_LIBRARIES ${TBB_LIBRARY_DEBUG} ${TBB_MALLOC_LIBRARY_DEBUG} ${TBB_DEBUG_LIBRARIES})
-    set(COMPILER_PREFIX "vc11")
+        set (TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR} CACHE PATH "TBB include directory" FORCE)
-  elseif(MSVC_VERSION EQUAL 1800)
+        set (TBB_LIBRARY_DIRS ${TBB_LIBRARY_DIR} CACHE PATH "TBB library directory" FORCE)
-    set(COMPILER_PREFIX "vc12")
+        # Jiri: Self-built TBB stores the debug libraries in a separate directory.
-  elseif(MSVC_VERSION GREATER_EQUAL 1900)
+        set (TBB_DEBUG_LIBRARY_DIRS ${TBB_LIBRARY_DEBUG_DIR} CACHE PATH "TBB debug library directory" FORCE)
-    set(COMPILER_PREFIX "vc14")
+        mark_as_advanced(TBB_INCLUDE_DIRS TBB_LIBRARY_DIRS TBB_DEBUG_LIBRARY_DIRS TBB_LIBRARIES TBB_DEBUG_LIBRARIES)
-  endif ()
+        message(STATUS "Found Intel TBB")
-
+    endif (TBB_LIBRARY)
-  # for each prefix path, add ia32/64\${COMPILER_PREFIX}\lib to the lib search path
+endif (TBB_INCLUDE_DIR)
-  foreach (dir IN LISTS TBB_PREFIX_PATH)
+
-    if (CMAKE_CL_64)
+if (NOT TBB_FOUND)
-      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/ia64/${COMPILER_PREFIX}/lib)
+    message("ERROR: Intel TBB NOT found!")
-      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/ia64/${COMPILER_PREFIX})
+    message(STATUS "Looked for Threading Building Blocks in ${_TBB_INSTALL_DIR}")
-      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/intel64/${COMPILER_PREFIX}/lib)
+    # do only throw fatal, if this pkg is REQUIRED
-      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/intel64/${COMPILER_PREFIX})
+    if (TBB_FIND_REQUIRED)
-    else ()
+        message(FATAL_ERROR "Could NOT find TBB library.")
-      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/ia32/${COMPILER_PREFIX}/lib)
+    endif (TBB_FIND_REQUIRED)
-      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/ia32/${COMPILER_PREFIX})
+endif (NOT TBB_FOUND)
-    endif ()
+
-  endforeach ()
+endif (NOT _TBB_INSTALL_DIR)
-endif ()
+
-
+if (TBB_FOUND)
-# For OS X binary distribution, choose libc++ based libraries for Mavericks (10.9)
+	set(TBB_INTERFACE_VERSION 0)
-# and above and AppleClang
+	FILE(READ "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h" _TBB_VERSION_CONTENTS)
-if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND
+	STRING(REGEX REPLACE ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1" TBB_INTERFACE_VERSION "${_TBB_VERSION_CONTENTS}")
-    NOT CMAKE_SYSTEM_VERSION VERSION_LESS 13.0)
+	set(TBB_INTERFACE_VERSION "${TBB_INTERFACE_VERSION}")
-  set (USE_LIBCXX OFF)
+        message(STATUS "TBB interface version: ${TBB_INTERFACE_VERSION}")
-  cmake_policy(GET CMP0025 POLICY_VAR)
+endif (TBB_FOUND)
  if (POLICY_VAR STREQUAL "NEW")
    if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
      set (USE_LIBCXX ON)
    endif ()
  else ()
    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
      set (USE_LIBCXX ON)
    endif ()
  endif ()
  if (USE_LIBCXX)
    foreach (dir IN LISTS TBB_PREFIX_PATH)
      list (APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/libc++ ${dir}/libc++/lib)
    endforeach ()
  endif ()
 endif ()
 # check compiler ABI
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
  set(COMPILER_PREFIX)
  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
    list(APPEND COMPILER_PREFIX "gcc4.8")
  endif()
  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
    list(APPEND COMPILER_PREFIX "gcc4.7")
  endif()
  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
    list(APPEND COMPILER_PREFIX "gcc4.4")
  endif()
  list(APPEND COMPILER_PREFIX "gcc4.1")
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
  set(COMPILER_PREFIX)
  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.0) # Complete guess
    list(APPEND COMPILER_PREFIX "gcc4.8")
  endif()
  if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.6)
    list(APPEND COMPILER_PREFIX "gcc4.7")
  endif()
  list(APPEND COMPILER_PREFIX "gcc4.4")
 else() # Assume compatibility with 4.4 for other compilers
  list(APPEND COMPILER_PREFIX "gcc4.4")
 endif ()
 # if platform architecture is explicitly specified
 set(TBB_ARCH_PLATFORM $ENV{TBB_ARCH_PLATFORM})
 if (TBB_ARCH_PLATFORM)
  foreach (dir IN LISTS TBB_PREFIX_PATH)
    list(APPEND TBB_LIB_SEARCH_PATH ${dir}/${TBB_ARCH_PLATFORM}/lib)
    list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/${TBB_ARCH_PLATFORM})
  endforeach ()
 endif ()
 foreach (dir IN LISTS TBB_PREFIX_PATH)
  foreach (prefix IN LISTS COMPILER_PREFIX)
    if (CMAKE_SIZEOF_VOID_P EQUAL 8)
      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/intel64)
      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/intel64/${prefix})
      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/intel64/lib)
      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/intel64/${prefix}/lib)
    else ()
      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/ia32)
      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/ia32/${prefix})
      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/ia32/lib)
      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/ia32/${prefix}/lib)
    endif ()
  endforeach()
 endforeach ()
 # add general search paths
 foreach (dir IN LISTS TBB_PREFIX_PATH)
  list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib ${dir}/Lib ${dir}/lib/tbb
    ${dir}/Libs)
  list(APPEND TBB_INC_SEARCH_PATH ${dir}/include ${dir}/Include
    ${dir}/include/tbb)
 endforeach ()
 set(TBB_LIBRARY_NAMES tbb)
 get_debug_names(TBB_LIBRARY_NAMES)
 find_path(TBB_INCLUDE_DIR
          NAMES tbb/tbb.h
          PATHS ${TBB_INC_SEARCH_PATH})
 find_library(TBB_LIBRARY_RELEASE
             NAMES ${TBB_LIBRARY_NAMES}
             PATHS ${TBB_LIB_SEARCH_PATH})
 find_library(TBB_LIBRARY_DEBUG
             NAMES ${TBB_LIBRARY_NAMES_DEBUG}
             PATHS ${TBB_LIB_SEARCH_PATH})
 make_library_set(TBB_LIBRARY)
 findpkg_finish(TBB tbb)
 #if we haven't found TBB no point on going any further
 if (NOT TBB_FOUND)
  return()
 endif ()
 #=============================================================================
 # Look for TBB's malloc package
 set(TBB_MALLOC_LIBRARY_NAMES tbbmalloc)
 get_debug_names(TBB_MALLOC_LIBRARY_NAMES)
 find_path(TBB_MALLOC_INCLUDE_DIR
          NAMES tbb/tbb.h
          PATHS ${TBB_INC_SEARCH_PATH})
 find_library(TBB_MALLOC_LIBRARY_RELEASE
             NAMES ${TBB_MALLOC_LIBRARY_NAMES}
             PATHS ${TBB_LIB_SEARCH_PATH})
 find_library(TBB_MALLOC_LIBRARY_DEBUG
             NAMES ${TBB_MALLOC_LIBRARY_NAMES_DEBUG}
             PATHS ${TBB_LIB_SEARCH_PATH})
 make_library_set(TBB_MALLOC_LIBRARY)
 findpkg_finish(TBB_MALLOC tbbmalloc)
 #=============================================================================
 # Look for TBB's malloc proxy package
 set(TBB_MALLOC_PROXY_LIBRARY_NAMES tbbmalloc_proxy)
 get_debug_names(TBB_MALLOC_PROXY_LIBRARY_NAMES)
 find_path(TBB_MALLOC_PROXY_INCLUDE_DIR
          NAMES tbb/tbbmalloc_proxy.h
          PATHS ${TBB_INC_SEARCH_PATH})
 find_library(TBB_MALLOC_PROXY_LIBRARY_RELEASE
             NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES}
             PATHS ${TBB_LIB_SEARCH_PATH})
 find_library(TBB_MALLOC_PROXY_LIBRARY_DEBUG
             NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES_DEBUG}
             PATHS ${TBB_LIB_SEARCH_PATH})
 make_library_set(TBB_MALLOC_PROXY_LIBRARY)
 findpkg_finish(TBB_MALLOC_PROXY tbbmalloc_proxy)
 #=============================================================================
 #parse all the version numbers from tbb
 if(NOT TBB_VERSION)
  if (EXISTS "${TBB_INCLUDE_DIR}/oneapi/tbb/version.h")
    file(STRINGS
      "${TBB_INCLUDE_DIR}/oneapi/tbb/version.h"
      TBB_VERSION_CONTENTS
      REGEX "VERSION")
  else()
    #only read the start of the file
    file(STRINGS
      "${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h"
      TBB_VERSION_CONTENTS
      REGEX "VERSION")
  endif()
  string(REGEX REPLACE
    ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1"
    TBB_VERSION_MAJOR "${TBB_VERSION_CONTENTS}")
  string(REGEX REPLACE
    ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1"
    TBB_VERSION_MINOR "${TBB_VERSION_CONTENTS}")
  string(REGEX REPLACE
        ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1"
        TBB_INTERFACE_VERSION "${TBB_VERSION_CONTENTS}")
  string(REGEX REPLACE
        ".*#define TBB_COMPATIBLE_INTERFACE_VERSION ([0-9]+).*" "\\1"
        TBB_COMPATIBLE_INTERFACE_VERSION "${TBB_VERSION_CONTENTS}")
 endif()
--- a/cmake/JSONParser.cmake
+++ b/cmake/JSONParser.cmake
@ -1,290 +0,0 @@
 # https://github.com/sbellus/json-cmake/blob/9913da8800b95322d393894d3525d634568f305e/JSONParser.cmake
 # MIT Licensed - https://github.com/sbellus/json-cmake/blob/master/LICENSE
 cmake_minimum_required(VERSION 3.18)
 if (DEFINED JSonParserGuard)
    return()
 endif()
 set(JSonParserGuard yes)
 macro(sbeParseJson prefix jsonString)
    cmake_policy(PUSH)
    set(json_string "${${jsonString}}")
    string(LENGTH "${json_string}" json_jsonLen)
    set(json_index 0)
    set(json_AllVariables ${prefix})
    set(json_ArrayNestingLevel 0)
    set(json_MaxArrayNestingLevel 0)
    _sbeParse(${prefix})
    unset(json_index)
    unset(json_AllVariables)
    unset(json_jsonLen)
    unset(json_string)
    unset(json_value)
    unset(json_inValue)    
    unset(json_name)
    unset(json_inName)
    unset(json_newPrefix)
    unset(json_reservedWord)
    unset(json_arrayIndex)
    unset(json_char)
    unset(json_end)
    unset(json_ArrayNestingLevel)
    foreach(json_nestingLevel RANGE ${json_MaxArrayNestingLevel})
        unset(json_${json_nestingLevel}_arrayIndex)
    endforeach()
    unset(json_nestingLevel)
    unset(json_MaxArrayNestingLevel)
    cmake_policy(POP)
 endmacro()
 macro(sbeClearJson prefix)
    foreach(json_var ${${prefix}})
        unset(${json_var})
    endforeach()
    unset(${prefix})
    unset(json_var)
 endmacro()
 macro(sbePrintJson prefix)
    foreach(json_var ${${prefix}})
        message("${json_var} = ${${json_var}}")
    endforeach()
 endmacro()
 macro(_sbeParse prefix)
    while(${json_index} LESS ${json_jsonLen})
        string(SUBSTRING "${json_string}" ${json_index} 1 json_char)
        if("\"" STREQUAL "${json_char}")    
            _sbeParseNameValue(${prefix})
        elseif("{" STREQUAL "${json_char}")
            _sbeMoveToNextNonEmptyCharacter()
            _sbeParseObject(${prefix})
        elseif("[" STREQUAL "${json_char}")
            _sbeMoveToNextNonEmptyCharacter()
            _sbeParseArray(${prefix})
        endif()
        if(${json_index} LESS ${json_jsonLen})
            string(SUBSTRING "${json_string}" ${json_index} 1 json_char)
        else()
            break()
        endif()
        if ("}" STREQUAL "${json_char}" OR "]" STREQUAL "${json_char}")
            break()
        endif()
        _sbeMoveToNextNonEmptyCharacter()
    endwhile()    
 endmacro()
 macro(_sbeParseNameValue prefix)
    set(json_name "")
    set(json_inName no)
    while(${json_index} LESS ${json_jsonLen})
        string(SUBSTRING "${json_string}" ${json_index} 1 json_char)
        # check if name ends
        if("\"" STREQUAL "${json_char}" AND json_inName)
            set(json_inName no)
            _sbeMoveToNextNonEmptyCharacter()
            if(NOT ${json_index} LESS ${json_jsonLen})
                break()
            endif()                
            string(SUBSTRING "${json_string}" ${json_index} 1 json_char)
            set(json_newPrefix ${prefix}.${json_name})
            set(json_name "")
            if(":" STREQUAL "${json_char}")
                _sbeMoveToNextNonEmptyCharacter()
                if(NOT ${json_index} LESS ${json_jsonLen})
                    break()
                endif()                
                string(SUBSTRING "${json_string}" ${json_index} 1 json_char)
                if("\"" STREQUAL "${json_char}")    
                    _sbeParseValue(${json_newPrefix})
                    break()
                elseif("{" STREQUAL "${json_char}")
                    _sbeMoveToNextNonEmptyCharacter()
                    _sbeParseObject(${json_newPrefix})
                    break()
                elseif("[" STREQUAL "${json_char}")
                    _sbeMoveToNextNonEmptyCharacter()
                    _sbeParseArray(${json_newPrefix})
                    break()
                else()
                    # reserved word starts
                    _sbeParseReservedWord(${json_newPrefix})
                    break()
                endif()
            else()
                # name without value
                list(APPEND ${json_AllVariables} ${json_newPrefix})
                set(${json_newPrefix} "")
                break()            
            endif()           
        endif()
        if(json_inName)
            # remove escapes
            if("\\" STREQUAL "${json_char}")
                math(EXPR json_index "${json_index} + 1")
                if(NOT ${json_index} LESS ${json_jsonLen})
                    break()
                endif()                
                string(SUBSTRING "${json_string}" ${json_index} 1 json_char)
            endif()
            set(json_name "${json_name}${json_char}")
        endif()
        # check if name starts
        if("\"" STREQUAL "${json_char}" AND NOT json_inName)
            set(json_inName yes)
        endif()
        _sbeMoveToNextNonEmptyCharacter()
    endwhile()    
 endmacro()
 macro(_sbeParseReservedWord prefix)
    set(json_reservedWord "")
    set(json_end no)
    while(${json_index} LESS ${json_jsonLen} AND NOT json_end)
        string(SUBSTRING "${json_string}" ${json_index} 1 json_char)
        if("," STREQUAL "${json_char}" OR "}" STREQUAL "${json_char}" OR "]" STREQUAL "${json_char}")
            set(json_end yes)
        else()
            set(json_reservedWord "${json_reservedWord}${json_char}")
            math(EXPR json_index "${json_index} + 1")
        endif()
    endwhile()
    list(APPEND ${json_AllVariables} ${prefix})
    string(STRIP  "${json_reservedWord}" json_reservedWord)
    set(${prefix} ${json_reservedWord})
 endmacro()
 macro(_sbeParseValue prefix)
    cmake_policy(SET CMP0054 NEW) # turn off implicit expansions in if statement
    set(json_value "")
    set(json_inValue no)
    while(${json_index} LESS ${json_jsonLen})
        string(SUBSTRING "${json_string}" ${json_index} 1 json_char)
        # check if json_value ends, it is ended by "
        if("\"" STREQUAL "${json_char}" AND json_inValue)
            set(json_inValue no)
            set(${prefix} ${json_value})
            list(APPEND ${json_AllVariables} ${prefix})
            _sbeMoveToNextNonEmptyCharacter()
            break()
        endif()
        if(json_inValue)
             # if " is escaped consume
            if("\\" STREQUAL "${json_char}")
                math(EXPR json_index "${json_index} + 1")
                if(NOT ${json_index} LESS ${json_jsonLen})
                    break()
                endif()                
                string(SUBSTRING "${json_string}" ${json_index} 1 json_char)
                if(NOT "\"" STREQUAL "${json_char}")
                    # if it is not " then copy also escape character
                    set(json_char "\\${json_char}")
                endif()
            endif()      
            _sbeAddEscapedCharacter("${json_char}")
        endif()
        # check if value starts
        if("\"" STREQUAL "${json_char}" AND NOT json_inValue)
            set(json_inValue yes)
        endif()
        math(EXPR json_index "${json_index} + 1")
    endwhile()
 endmacro()
 macro(_sbeAddEscapedCharacter char)
    string(CONCAT json_value "${json_value}" "${char}")
 endmacro()
 macro(_sbeParseObject prefix)
    _sbeParse(${prefix})
    _sbeMoveToNextNonEmptyCharacter()
 endmacro()
 macro(_sbeParseArray prefix)
    math(EXPR json_ArrayNestingLevel "${json_ArrayNestingLevel} + 1")
    set(json_${json_ArrayNestingLevel}_arrayIndex 0)
    set(${prefix} "")
    list(APPEND ${json_AllVariables} ${prefix})
    while(${json_index} LESS ${json_jsonLen})
        string(SUBSTRING "${json_string}" ${json_index} 1 json_char)
        if("\"" STREQUAL "${json_char}")
            # simple value
            list(APPEND ${prefix} ${json_${json_ArrayNestingLevel}_arrayIndex})
            _sbeParseValue(${prefix}_${json_${json_ArrayNestingLevel}_arrayIndex})
        elseif("{" STREQUAL "${json_char}")
            # object
            _sbeMoveToNextNonEmptyCharacter()
            list(APPEND ${prefix} ${json_${json_ArrayNestingLevel}_arrayIndex})
            _sbeParseObject(${prefix}_${json_${json_ArrayNestingLevel}_arrayIndex})
        else()
            list(APPEND ${prefix} ${json_${json_ArrayNestingLevel}_arrayIndex})
            _sbeParseReservedWord(${prefix}_${json_${json_ArrayNestingLevel}_arrayIndex})
        endif()
        if(NOT ${json_index} LESS ${json_jsonLen})
            break()
        endif()
        string(SUBSTRING "${json_string}" ${json_index} 1 json_char)
        if("]" STREQUAL "${json_char}")
            _sbeMoveToNextNonEmptyCharacter()
            break()
        elseif("," STREQUAL "${json_char}")
            math(EXPR json_${json_ArrayNestingLevel}_arrayIndex "${json_${json_ArrayNestingLevel}_arrayIndex} + 1")            
        endif()
        _sbeMoveToNextNonEmptyCharacter()
    endwhile()    
    if(${json_MaxArrayNestingLevel} LESS ${json_ArrayNestingLevel})
        set(json_MaxArrayNestingLevel ${json_ArrayNestingLevel})
    endif()
    math(EXPR json_ArrayNestingLevel "${json_ArrayNestingLevel} - 1")
 endmacro()
 macro(_sbeMoveToNextNonEmptyCharacter)
    math(EXPR json_index "${json_index} + 1")
    if(${json_index} LESS ${json_jsonLen})
        string(SUBSTRING "${json_string}" ${json_index} 1 json_char)
        while(${json_char} MATCHES "[ \t\n\r]" AND ${json_index} LESS ${json_jsonLen})
            math(EXPR json_index "${json_index} + 1")
            string(SUBSTRING "${json_string}" ${json_index} 1 json_char)
        endwhile()
    endif()
 endmacro()
--- a/cmake/conan.cmake
+++ b/cmake/conan.cmake
--- a/cmake/pkgconfig.in
+++ b/cmake/pkgconfig.in
@ -4,7 +4,7 @@ libdir=@PKGCONFIG_LIBRARY_DIR@
 Name: libOSRM
 Description: Project OSRM library
-Version: @OSRM_VERSION@
+Version: v@OSRM_VERSION@
 Requires:
 Libs: -L${libdir} -losrm @PKGCONFIG_OSRM_LDFLAGS@
 Libs.private: @PKGCONFIG_OSRM_DEPENDENT_LIBRARIES@
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@ -1,88 +0,0 @@
 include (CheckCXXCompilerFlag)
 include (CheckCCompilerFlag)
 # Try to add -Wflag if compiler supports it
 macro (add_warning flag)
    string(REPLACE "-" "_" underscored_flag ${flag})
    string(REPLACE "+" "x" underscored_flag ${underscored_flag})
    check_cxx_compiler_flag("-W${flag}" SUPPORTS_CXXFLAG_${underscored_flag})
    check_c_compiler_flag("-W${flag}" SUPPORTS_CFLAG_${underscored_flag})
    if (SUPPORTS_CXXFLAG_${underscored_flag})
        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W${flag}")
    else()
        message (STATUS "Flag -W${flag} is unsupported")
    endif()
    if (SUPPORTS_CFLAG_${underscored_flag})
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -W${flag}")
    else()
        message(STATUS "Flag -W${flag} is unsupported")
    endif()
 endmacro()
 # Try to add -Wno flag if compiler supports it
 macro (no_warning flag)
    add_warning(no-${flag})
 endmacro ()
 # The same but only for specified target.
 macro (target_add_warning target flag)
    string (REPLACE "-" "_" underscored_flag ${flag})
    string (REPLACE "+" "x" underscored_flag ${underscored_flag})
    check_cxx_compiler_flag("-W${flag}" SUPPORTS_CXXFLAG_${underscored_flag})
    if (SUPPORTS_CXXFLAG_${underscored_flag})
        target_compile_options (${target} PRIVATE "-W${flag}")
    else ()
        message (STATUS "Flag -W${flag} is unsupported")
    endif ()
 endmacro ()
 macro (target_no_warning target flag)
    target_add_warning(${target} no-${flag})
 endmacro ()
 add_warning(all)
 add_warning(extra)
 add_warning(pedantic)
 add_warning(error) # treat all warnings as errors
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
    add_warning(strict-overflow=1)
 endif()
 add_warning(suggest-override)
 add_warning(suggest-destructor-override)
 add_warning(unused)
 add_warning(unreachable-code)
 add_warning(delete-incomplete)
 add_warning(duplicated-cond)
 add_warning(disabled-optimization)
 add_warning(init-self)
 add_warning(bool-compare)
 add_warning(logical-not-parentheses)
 add_warning(logical-op)
 add_warning(misleading-indentation)
 # `no-` prefix is part of warning name(i.e. doesn't mean we are disabling it)
 add_warning(no-return-local-addr)
 add_warning(odr)
 add_warning(pointer-arith)
 add_warning(redundant-decls)
 add_warning(reorder)
 add_warning(shift-negative-value)
 add_warning(sizeof-array-argument)
 add_warning(switch-bool)
 add_warning(tautological-compare)
 add_warning(trampolines)
 # these warnings are not enabled by default
 # no_warning(name-of-warning)
 no_warning(deprecated-comma-subscript)
 no_warning(comma-subscript)
 no_warning(ambiguous-reversed-operator)
 no_warning(restrict)
 no_warning(free-nonheap-object)
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
  no_warning(stringop-overflow)
 endif()
--- a/codecov.yml
+++ b/codecov.yml
@ -1,6 +1,7 @@
 coverage:
  ignore:
    - unit_tests/.*
    - third_party/.*
 comment: off
--- a/cucumber.js
+++ b/cucumber.js
@ -1,7 +1,9 @@
 module.exports = {
-    default: '--strict --tags ~@stress --tags ~@todo --tags ~@mld --require features/support --require features/step_definitions',
+    default: '--strict --tags ~@stress --tags ~@todo --require features/support --require features/step_definitions',
-    ch: '--strict --tags ~@stress --tags ~@todo --tags ~@mld -f progress --require features/support --require features/step_definitions',
+    verify: '--strict --tags ~@stress --tags ~@todo -f progress --require features/support --require features/step_definitions',
    todo: '--strict --tags @todo --require features/support --require features/step_definitions',
-    all: '--strict --require features/support --require features/step_definitions',
+    all: '--strict --require features/support --require features/step_definitions'
-    mld: '--strict --tags ~@stress --tags ~@todo --tags ~@ch --require features/support --require features/step_definitions -f progress'
+}
-};
+
--- a/data/driving_side.geojson
+++ b/data/driving_side.geojson
--- a/data/maxheight.geojson
+++ b/data/maxheight.geojson
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -1 +0,0 @@
 Dockerfile-debian
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -0,0 +1,18 @@
 FROM ubuntu:14.04
 RUN apt-get update -y && apt-get install -y  software-properties-common
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test
 RUN apt-get update -y && apt-get install -y g++-5 libbz2-dev libstxxl-dev libstxxl1 libxml2-dev libzip-dev lua5.1 liblua5.1-0-dev libtbb-dev libgdal-dev libboost-all-dev ccache
 RUN apt-get -y install curl cmake cmake-curses-gui git
 WORKDIR /opt
 RUN git clone --depth 1 --branch v0.31.0 https://github.com/creationix/nvm.git
 RUN /bin/bash -c "source /opt/nvm/nvm.sh && nvm install v4"
 RUN useradd -ms /bin/bash mapbox
 USER mapbox
 ENV HOME /home/mapbox
 WORKDIR /home/mapbox
 RUN echo "source /opt/nvm/nvm.sh" > .bashrc
 RUN echo "source /home/mapbox/.bashrc" > .profile
--- a/docker/Dockerfile-alpine
+++ b/docker/Dockerfile-alpine
@ -1,79 +0,0 @@
 FROM alpine:3.21.2 AS alpine-mimalloc
 RUN apk update && \
    apk upgrade && \
    apk add --no-cache \
        boost-iostreams \
        boost-program_options \
        boost-thread \
        mimalloc
 ENV LD_PRELOAD=/usr/lib/libmimalloc.so.2
 ENV MIMALLOC_LARGE_OS_PAGES=1
 FROM alpine-mimalloc AS builder
 ARG DOCKER_TAG
 ARG BUILD_CONCURRENCY
 RUN mkdir -p /src /opt && \
    apk add --no-cache \
    boost-dev \
    boost-filesystem \
    clang \
    cmake \
    expat-dev \
    git \
    libbz2 \
    libxml2 \
    lua5.4-dev \
    make \
    onetbb-dev
 COPY . /src
 WORKDIR /src
 RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
    echo "Building OSRM ${DOCKER_TAG}" && \
    git show --format="%H" | head -n1 > /opt/OSRM_GITSHA && \
    echo "Building OSRM gitsha $(cat /opt/OSRM_GITSHA)" && \
    mkdir -p build && \
    cd build && \
    BUILD_TYPE="Release" && \
    ENABLE_ASSERTIONS="Off" && \
    BUILD_TOOLS="Off" && \
    case ${DOCKER_TAG} in *"-debug"*) BUILD_TYPE="Debug";; esac && \
    case ${DOCKER_TAG} in *"-assertions"*) BUILD_TYPE="RelWithDebInfo" && ENABLE_ASSERTIONS="On" && BUILD_TOOLS="On";; esac && \
    echo "Building ${BUILD_TYPE} with ENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} BUILD_TOOLS=${BUILD_TOOLS}" && \
    cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} -DBUILD_TOOLS=${BUILD_TOOLS} -DENABLE_LTO=OFF && \
    make -j${NPROC} install && \
    cd ../profiles && \
    cp -r * /opt && \
    strip /usr/local/bin/* && \
    rm -rf /src
 # Multistage build to reduce image size - https://docs.docker.com/build/building/multi-stage/#use-multi-stage-builds
 # Only the content below ends up in the image, this helps remove /src from the image (which is large)
 FROM alpine-mimalloc AS runstage
 COPY --from=builder /usr/local /usr/local
 COPY --from=builder /opt /opt
 RUN apk add --no-cache \
    boost-date_time \
    expat \
    lua5.4 \
    onetbb && \
    ldconfig /usr/local/lib
 RUN /usr/local/bin/osrm-extract --help && \
    /usr/local/bin/osrm-routed --help && \
    /usr/local/bin/osrm-contract --help && \
    /usr/local/bin/osrm-partition --help && \
    /usr/local/bin/osrm-customize --help
 WORKDIR /opt
 EXPOSE 5000
--- a/docker/Dockerfile-debian
+++ b/docker/Dockerfile-debian
@ -1,76 +0,0 @@
 FROM debian:bookworm-slim AS builder
 ARG DOCKER_TAG
 ARG BUILD_CONCURRENCY
 RUN mkdir -p /src /opt && \
    apt-get update && \
    apt-get -y --no-install-recommends --no-install-suggests install \
        ca-certificates \
        cmake \
        g++ \
        gcc \
        git \
        libboost1.81-all-dev \
        libbz2-dev \
        liblua5.4-dev \
        libtbb-dev \
        libxml2-dev \
        libzip-dev \
        lua5.4 \
        make \
        pkg-config
 COPY . /src
 WORKDIR /src
 RUN NPROC=${BUILD_CONCURRENCY:-$(nproc)} && \
    export CXXFLAGS="-Wno-array-bounds -Wno-uninitialized -Wno-stringop-overflow" && \
    echo "Building OSRM ${DOCKER_TAG}" && \
    git show --format="%H" | head -n1 > /opt/OSRM_GITSHA && \
    echo "Building OSRM gitsha $(cat /opt/OSRM_GITSHA)" && \
    mkdir -p build && \
    cd build && \
    BUILD_TYPE="Release" && \
    ENABLE_ASSERTIONS="Off" && \
    BUILD_TOOLS="Off" && \
    case ${DOCKER_TAG} in *"-debug"*) BUILD_TYPE="Debug";; esac && \
    case ${DOCKER_TAG} in *"-assertions"*) BUILD_TYPE="RelWithDebInfo" && ENABLE_ASSERTIONS="On" && BUILD_TOOLS="On";; esac && \
    echo "Building ${BUILD_TYPE} with ENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} BUILD_TOOLS=${BUILD_TOOLS}" && \
    cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS} -DBUILD_TOOLS=${BUILD_TOOLS} -DENABLE_LTO=On && \
    make -j${NPROC} install && \
    cd ../profiles && \
    cp -r * /opt && \
    strip /usr/local/bin/* && \
    rm -rf /src
 # Multistage build to reduce image size - https://docs.docker.com/build/building/multi-stage/#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:bookworm-slim AS runstage
 COPY --from=builder /usr/local /usr/local
 COPY --from=builder /opt /opt
 RUN apt-get update && \
    apt-get install -y --no-install-recommends --no-install-suggests \
        expat \
        libboost-date-time1.81.0 \
        libboost-iostreams1.81.0 \
        libboost-program-options1.81.0 \
        libboost-thread1.81.0 \
        liblua5.4-0 \
        libtbb12 && \
    rm -rf /var/lib/apt/lists/* && \
 # Add /usr/local/lib to ldconfig to allow loading libraries from there
    ldconfig /usr/local/lib
 RUN /usr/local/bin/osrm-extract --help && \
    /usr/local/bin/osrm-routed --help && \
    /usr/local/bin/osrm-contract --help && \
    /usr/local/bin/osrm-partition --help && \
    /usr/local/bin/osrm-customize --help
 WORKDIR /opt
 EXPOSE 5000
--- a/docker/README
+++ b/docker/README
@ -0,0 +1,6 @@
 # Docker based continious integration
 Run ```./docker/build-image.sh``` to build a docker image.
 The image contains all the build dependencies and the state of the local git repository.
 Run ```./docker/run-gcc.sh``` to build OSRM with g++ and run all tests.
--- a/docker/build-image.sh
+++ b/docker/build-image.sh
@ -0,0 +1,9 @@
 #!/usr/bin/env bash
 set -e
 set -o pipefail
 docker build \
    -t mapbox/osrm:linux \
    docker/
--- a/docker/hooks/build
+++ b/docker/hooks/build
@ -1,13 +0,0 @@
 #!/bin/sh
 # We've placed the Dockerfile under docker/ so that the generically named
 # hooks/ directory doesn't pollute the main directory.  Because we need to
 # COPY the source into the container, we need to use some -f gymnastics to
 # ensure that "COPY . /src" is referring to the repo root, not the directory
 # that contains the Dockerfile.
 # This script gets executed with a pwd of wherever the Dockerfile is.
 DOCKER_BUILD="docker build --build-arg BUILD_CONCURRENCY=${CONCURRENCY} --build-arg DOCKER_TAG=${DOCKER_TAG:?unset} -t ${IMAGE_NAME:?unset} -f"
 $DOCKER_BUILD Dockerfile ..
 $DOCKER_BUILD Dockerfile-alpine ..
--- a/docker/run-clang.sh
+++ b/docker/run-clang.sh
@ -0,0 +1,11 @@
 #!/usr/bin/env bash
 set -e
 set -o pipefail
 docker run \
    -i \
    -e "CXX=clang++" \
    -v `pwd`:/home/mapbox/osrm-backend \
    -t mapbox/osrm:linux \
    /bin/bash -lc "osrm-backend/docker/test.sh"
--- a/docker/run-gcc.sh
+++ b/docker/run-gcc.sh
@ -0,0 +1,12 @@
 #!/usr/bin/env bash
 set -e
 set -o pipefail
 docker run \
    -i \
    -e "CXX=g++-5" \
    -e "CC=gcc-5" \
    -v `pwd`:/home/mapbox/osrm-backend \
    -t mapbox/osrm:linux \
    /bin/bash -lc "osrm-backend/docker/test.sh"
--- a/docker/test.sh
+++ b/docker/test.sh
@ -0,0 +1,21 @@
 #!/usr/bin/env bash
 set -e
 set -o pipefail
 export CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Release"
 cd /home/mapbox/osrm-backend
 [ -d build ] && rm -rf build
 mkdir -p build
 cd build
 cmake .. $CMAKEOPTIONS -DBUILD_TOOLS=1
 make -j`nproc`
 make tests -j`nproc`
 #./unit_tests/server-tests
 #./unit_tests/library-tests
 #./unit_tests/extractor-tests
 #./unit_tests/util-tests
 cd ..
 npm test
--- a/docs/developing.md
+++ b/docs/developing.md
@ -20,7 +20,7 @@ A guard (ScopedGeojsonLoggerGuard) requires a logging policy. Per default we pro
 The initialisation to do so looks like this:
 `util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString> geojson_guard( "debug.geojson", data-for-conversion);`
-Make sure to give the guard a name, so it actually gets a lifetime.
+Make sure to give the guar a name, so it actually gets a lifetime.
 The field `data-for-conversion` can be an arbitrary long set of features and needs to match the parameters used for constructing our policy (in this case `util::NodeIdVectorToLineString`).
@ -32,9 +32,9 @@ For outputting data into our file (debug.geojson), we simply need to call the ma
 ### Possible Scopeguard Location
 Think of the scopeguard as you would do of any reference. If you wan't to access to logging during a call, the guard object must be alive and valid.
-As an example: a good location to create a scopeguard to log decisions in the edge-based-graph-factory would be right before we run it ([here](https://github.com/Project-OSRM/osrm-backend/blob/a933b5d94943bf3edaf42c84a614a99650d23cba/src/extractor/extractor.cpp#L497)). If you put `util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString> geojson_guard( "debug.geojson", node_coordinate_vector);` at that location, you can then print `util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString>::Write(list_of_node_ids);` anywhere within the `edge-based-graph-factory`.
+As an example: a good location to create the a scopeguard to log decisions in the edge-based-graph-factory would be right before we run it ([here](https://github.com/Project-OSRM/osrm-backend/blob/a933b5d94943bf3edaf42c84a614a99650d23cba/src/extractor/extractor.cpp#L497)). If you put `util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString> geojson_guard( "debug.geojson", node_coordinate_vector);` at that location, you can then print `util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString>::Write(list_of_node_ids);` anywhere within the `edge-based-graph-factory`.
-This location would enable calls for all guidance related pre-processing which is called in the edge-based-graph-factory.
+This location would enable call for all guidance related pre-processing which is called in the edge-based-graph-factory.
 Logging any turn-handler decisions, for example, would now be possible.
 ## Limitations
--- a/docs/http.md
+++ b/docs/http.md
@ -1,8 +1,3 @@
 # OSRM HTTP server
 The built-in HTTP server is a basic HTTP/1.0 server that supports a 'keep-alive' extension. Persistent connections are limited to 512 requests per
 connection and allow no more than 5 seconds between requests.
 ## General options
 All OSRM HTTP requests use a common structure.
@ -20,25 +15,21 @@ GET /{service}/{version}/{profile}/{coordinates}[.{format}]?option=value&option=
 | `service` | One of the following values: [`route`](#route-service), [`nearest`](#nearest-service), [`table`](#table-service), [`match`](#match-service), [`trip`](#trip-service), [`tile`](#tile-service) |
 | `version` | Version of the protocol implemented by the service. `v1` for all OSRM 5.x installations |
 | `profile` | Mode of transportation, is determined statically by the Lua profile that is used to prepare the data using `osrm-extract`. Typically `car`, `bike` or `foot` if using one of the supplied profiles. |
-| `coordinates`| String of format `{longitude},{latitude};{longitude},{latitude}[;{longitude},{latitude} ...]` or `polyline({polyline}) or polyline6({polyline6})`. |
+| `coordinates`| String of format `{longitude},{latitude};{longitude},{latitude}[;{longitude},{latitude} ...]` or `polyline({polyline})`. |
-| `format`| `json` or `flatbuffers`. This parameter is optional and defaults to `json`. |
+| `format`| Only `json` is supported at the moment. This parameter is optional and defaults to `json`. |
 Passing any `option=value` is optional. `polyline` follows Google's polyline format with precision 5 by default and can be generated using [this package](https://www.npmjs.com/package/polyline).
-To pass parameters to each location some options support an array-like encoding:
+To pass parameters to each location some options support an array like encoding:
 **Request options**
-| Option         | Values                                                 | Description                                                                                                                                                                                               |
+| Option         | Values                                                 | Description                                                                                           |
-|----------------|--------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|----------------|--------------------------------------------------------|-------------------------------------------------------------------------------------------------------|
-|bearings        |`{bearing};{bearing}[;{bearing} ...]`                   |Limits the search to segments with given bearing in degrees towards true north in a clockwise direction.                                                                                                     |
+|bearings        |`{bearing};{bearing}[;{bearing} ...]`                   |Limits the search to segments with given bearing in degrees towards true north in clockwise direction. |
-|radiuses        |`{radius};{radius}[;{radius} ...]`                      |Limits the search to given radius in meters.                                                                                                                                                               |
+|radiuses        |`{radius};{radius}[;{radius} ...]`                      |Limits the search to given radius in meters.                                                           |
-|generate\_hints |`true` (default), `false`                               |Adds a Hint to the response which can be used in subsequent requests, see `hints` parameter.                                                                                                               |
+|generate\_hints |`true` (default), `false`                               |Adds a Hint to the response which can be used in subsequent requests, see `hints` parameter.           |
-|hints           |`{hint};{hint}[;{hint} ...]`                            |Hint from previous request to derive position in street network.                                                                                                                                           |
+|hints           |`{hint};{hint}[;{hint} ...]`                            |Hint from previous request to derive position in street network.                                       |
 |approaches      |`{approach};{approach}[;{approach} ...]`                |Restrict the direction on the road network at a waypoint, relative to the input coordinate.                                                                                                                    |
 |exclude         |`{class}[,{class}]`                                     |Additive list of classes to avoid, the order does not matter.                                                                                                                                                  |
 |snapping        |`default` (default), `any`                              |Default snapping avoids is_startpoint (see profile) edges, `any` will snap to any edge in the graph                                                                                                        |
 |skip_waypoints  |`true`, `false` (default)                               |Removes waypoints from the response. Waypoints are still calculated, but not serialized. Could be useful in case you are interested in some other part of the response and do not want to transfer waste data. |
 Where the elements follow the following format:
@ -47,16 +38,14 @@ Where the elements follow the following format:
 |bearing     |`{value},{range}` `integer 0 .. 360,integer 0 .. 180`   |
 |radius      |`double >= 0` or `unlimited` (default)                  |
 |hint        |Base64 `string`                                         |
 |approach    |`curb`, `opposite` or `unrestricted` (default)          |
 |class       |A class name determined by the profile or `none`.       |
 ```
 {option}={element};{element}[;{element} ... ]
 ```
-The number of elements must match exactly the number of locations (except for `generate_hints` and `exclude`). If you don't want to pass a value but instead use the default you can pass an empty `element`.
+The number of elements must match exactly the number of locations. If you don't want to pass a value but instead use the default you can pass an empty `element`.
-Example: 2nd location uses the default value for `option`:
+Example: 2nd location use the default value for `option`:
 ```
 {option}={element};;{element}
@ -68,17 +57,12 @@ Example: 2nd location uses the default value for `option`:
 # Query on Berlin with three coordinates:
 curl 'http://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219?overview=false'
 # Query on Berlin excluding the usage of motorways:
 curl 'http://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.397634,52.529407?exclude=motorway'
 # Using polyline:
 curl 'http://router.project-osrm.org/route/v1/driving/polyline(ofp_Ik_vpAilAyu@te@g`E)?overview=false'
 ```
 ### Responses
 #### Code
 Every response object has a `code` property containing one of the strings below or a service dependent code:
 | Type              | Description                                                                      |
@ -88,26 +72,20 @@ Every response object has a `code` property containing one of the strings below
 | `InvalidService`  | Service name is invalid.                                                         |
 | `InvalidVersion`  | Version is not found.                                                            |
 | `InvalidOptions`  | Options are invalid.                                                             |
-| `InvalidQuery`    | The query string is syntactically malformed.                                     |
+| `InvalidQuery`    | The query string is synctactically malformed.                                    |
 | `InvalidValue`    | The successfully parsed query parameters are invalid.                            |
-| `NoSegment`       | One of the supplied input coordinates could not snap to the street segment.      |
+| `NoSegment`       | One of the supplied input coordinates could not snap to street segment.          |
-| `TooBig`          | The request size violates one of the service-specific request size restrictions. |
+| `TooBig`          | The request size violates one of the service specific request size restrictions. |
 | `DisabledDataset` | The request tried to access a disabled dataset.                                  |
- `message` is a **optional** human-readable error message. All other status types are service-dependent.
+- `message` is a **optional** human-readable error message. All other status types are service dependent.
- In case of an error the HTTP status code will be `400`. Otherwise, the HTTP status code will be `200` and `code` will be `Ok`.
+- In case of an error the HTTP status code will be `400`. Otherwise the HTTP status code will be `200` and `code` will be `Ok`.
 #### Data version
 Every response object has a `data_version` property containing a timestamp from the original OpenStreetMap file. This field is optional. It can be omitted if the data_version parameter was not set on the osrm-extract stage or the OSM file has not `osmosis_replication_timestamp` section.
 #### Example response
 ```json
 {
 "code": "Ok",
-"message": "Everything worked",
+"message": "Everything worked"
 "data_version": "2017-11-17T21:43:02Z"
 }
 ```
@ -130,14 +108,11 @@ In addition to the [general options](#general-options) the following options are
 |------------|------------------------------|----------------------------------------------------|
 |number      |`integer >= 1` (default `1`)  |Number of nearest segments that should be returned. |
 As `waypoints` is a single thing, returned by that service, using it with the option `skip_waypoints` set to `true` is quite useless, but still
 possible. In that case, only the `code` field will be returned.
 **Response**
 - `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
 - `waypoints` array of `Waypoint` objects sorted by distance to the input coordinate. Each object has at least the following additional properties:
-  - `nodes`: Array of OpenStreetMap node ids.
+  - `distance`: Distance in meters to the supplied input coordinate.
 #### Example Requests
@ -148,14 +123,10 @@ curl 'http://router.project-osrm.org/nearest/v1/driving/13.388860,52.517037?numb
 #### Example Response
-```JSON
+```json
 {
   "waypoints" : [
      {
         "nodes": [
            2264199819,
            0
         ],
         "hint" : "KSoKADRYroqUBAEAEAAAABkAAAAGAAAAAAAAABhnCQCLtwAA_0vMAKlYIQM8TMwArVghAwEAAQH1a66g",
         "distance" : 4.152629,
         "name" : "Friedrichstraße",
@ -165,10 +136,6 @@ curl 'http://router.project-osrm.org/nearest/v1/driving/13.388860,52.517037?numb
         ]
      },
      {
         "nodes": [
            2045820592,
            0
         ],
         "hint" : "KSoKADRYroqUBAEABgAAAAAAAAAAAAAAKQAAABhnCQCLtwAA7kvMAAxZIQM8TMwArVghAwAAAQH1a66g",
         "distance" : 11.811961,
         "name" : "Friedrichstraße",
@ -178,10 +145,6 @@ curl 'http://router.project-osrm.org/nearest/v1/driving/13.388860,52.517037?numb
         ]
      },
      {
         "nodes": [
            0,
            21487242
         ],
         "hint" : "KioKgDbbDgCUBAEAAAAAABoAAAAAAAAAPAAAABlnCQCLtwAA50vMADJZIQM8TMwArVghAwAAAQH1a66g",
         "distance" : 15.872438,
         "name" : "Friedrichstraße",
@ -200,22 +163,21 @@ curl 'http://router.project-osrm.org/nearest/v1/driving/13.388860,52.517037?numb
 Finds the fastest route between coordinates in the supplied order.
 ```endpoint
-GET /route/v1/{profile}/{coordinates}?alternatives={true|false|number}&steps={true|false}&geometries={polyline|polyline6|geojson}&overview={full|simplified|false}&annotations={true|false}
+GET /route/v1/{profile}/{coordinates}?alternatives={true|false}&steps={true|false}&geometries={polyline|polyline6|geojson}&overview={full|simplified|false}&annotations={true|false}
 ```
 In addition to the [general options](#general-options) the following options are supported for this service:
 |Option      |Values                                       |Description                                                                    |
 |------------|---------------------------------------------|-------------------------------------------------------------------------------|
-|alternatives|`true`, `false` (default), or Number         |Search for alternative routes. Passing a number `alternatives=n` searches for up to `n` alternative routes.\*                            |
+|alternatives|`true`, `false` (default)                    |Search for alternative routes and return as well.\*                            |
-|steps       |`true`, `false` (default)                    |Returned route steps for each route leg                                        |
+|steps       |`true`, `false` (default)                    |Return route steps for each route leg                                          |
-|annotations |`true`, `false` (default), `nodes`, `distance`, `duration`, `datasources`, `weight`, `speed`  |Returns additional metadata for each coordinate along the route geometry.      |
+|annotations |`true`, `false` (default)                    |Returns additional metadata for each coordinate along the route geometry.      |
 |geometries  |`polyline` (default), `polyline6`, `geojson` |Returned route geometry format (influences overview and per step)              |
 |overview    |`simplified` (default), `full`, `false`      |Add overview geometry either full, simplified according to highest zoom level it could be display on, or not at all.|
-|continue\_straight |`default` (default), `true`, `false`  |Forces the route to keep going straight at waypoints constraining uturns there even if it would be faster. Default value depends on the profile. |
+|continue\_straight |`default` (default), `true`, `false` |Forces the route to keep going straight at waypoints constraining uturns there even if it would be faster. Default value depends on the profile. |
 |waypoints   | `{index};{index};{index}...`                |Treats input coordinates indicated by given indices as waypoints in returned Match object. Default is to treat all input coordinates as waypoints.    |
-\* Please note that even if alternative routes are requested, a result cannot be guaranteed.
+\* Please note that even if an alternative route is requested, a result cannot be guaranteed.
 **Response**
@ -240,13 +202,13 @@ curl 'http://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.397
 ### Table service
-Computes the duration of the fastest route between all pairs of supplied coordinates. Returns durations or distances or both between the coordinate pairs. Note that the distances are not the shortest distance between two coordinates, but rather the distances of the fastest routes. Durations are in seconds and distances are in meters.
+Computes the duration of the fastest route between all pairs of supplied coordinates.
 ```endpoint
-GET /table/v1/{profile}/{coordinates}?{sources}=[{elem}...];&{destinations}=[{elem}...]&annotations={duration|distance|duration,distance}
+GET /table/v1/{profile}/{coordinates}?{sources}=[{elem}...];&destinations=[{elem}...]
 ```
-**Options**
+**Coordinates**
 In addition to the [general options](#general-options) the following options are supported for this service:
@ -254,16 +216,10 @@ In addition to the [general options](#general-options) the following options are
 |------------|--------------------------------------------------|---------------------------------------------|
 |sources     |`{index};{index}[;{index} ...]` or `all` (default)|Use location with given index as source.     |
 |destinations|`{index};{index}[;{index} ...]` or `all` (default)|Use location with given index as destination.|
 |annotations |`duration` (default), `distance`, or `duration,distance`|Return the requested table or tables in response. |
 |fallback_speed|`double > 0`| If no route found between a source/destination pair, calculate the as-the-crow-flies distance, then use this speed to estimate duration.|
 |fallback_coordinate|`input` (default), or `snapped`| When using a `fallback_speed`, use the user-supplied coordinate (`input`), or the snapped location (`snapped`) for calculating distances.|
 |scale_factor|`double > 0`| Use in conjunction with `annotations=durations`. Scales the table `duration` values by this number.|
 Unlike other array encoded options, the length of `sources` and `destinations` can be **smaller or equal**
 to number of input locations;
 With `skip_waypoints` set to `true`, both `sources` and `destinations` arrays will be skipped.
 **Example:**
 ```
@ -277,148 +233,36 @@ sources=0;5;7&destinations=5;1;4;2;3;6
 #### Example Request
 ```curl
-# Returns a 3x3 duration matrix:
+# Returns a 3x3 matrix:
 curl 'http://router.project-osrm.org/table/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219'
-# Returns a 1x3 duration matrix
+# Returns a 1x3 matrix
 curl 'http://router.project-osrm.org/table/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219?sources=0'
-# Returns a asymmetric 3x2 duration matrix with from the polyline encoded locations `qikdcB}~dpXkkHz`:
+# Returns a asymmetric 3x2 matrix with from the polyline encoded locations `qikdcB}~dpXkkHz`:
 curl 'http://router.project-osrm.org/table/v1/driving/polyline(egs_Iq_aqAppHzbHulFzeMe`EuvKpnCglA)?sources=0;1;3&destinations=2;4'
 # Returns a 3x3 duration matrix:
 curl 'http://router.project-osrm.org/table/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219?annotations=duration'
 # Returns a 3x3 distance matrix for CH:
 curl 'http://router.project-osrm.org/table/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219?annotations=distance'
 # Returns a 3x3 duration matrix and a 3x3 distance matrix for CH:
 curl 'http://router.project-osrm.org/table/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219?annotations=distance,duration'
 ```
 **Response**
 - `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
 - `durations` array of arrays that stores the matrix in row-major order. `durations[i][j]` gives the travel time from
-  the i-th source to the j-th destination. Values are given in seconds. Can be `null` if no route between `i` and `j` can be found.
+  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 distance from
  the i-th source to the j-th destination. Values are given in meters. Can be `null` if no route between `i` and `j` can be found.
 - `sources` array of `Waypoint` objects describing all sources in order
 - `destinations` array of `Waypoint` objects describing all destinations in order
 - `fallback_speed_cells` (optional) array of arrays containing `i,j` pairs indicating which cells contain estimated values based on `fallback_speed`.  Will be absent if `fallback_speed` is not used.
 In case of error the following `code`s are supported in addition to the general ones:
-| Type             | Description     |
+| Type              | Description     |
-|------------------|-----------------|
+|-------------------|-----------------|
 | `NoTable`        | No route found. |
 | `NotImplemented`  | This request is not supported |
 All other properties might be undefined.
 #### Example Response
 ```json
 {
  "sources": [
    {
      "location": [
        13.3888,
        52.517033
      ],
      "hint": "PAMAgEVJAoAUAAAAIAAAAAcAAAAAAAAArss0Qa7LNEHiVIRA4lSEQAoAAAAQAAAABAAAAAAAAADMAAAAAEzMAKlYIQM8TMwArVghAwEA3wps52D3",
      "name": "Friedrichstraße"
    },
    {
      "location": [
        13.397631,
        52.529432
      ],
      "hint": "WIQBgL6mAoAEAAAABgAAAAAAAAA7AAAAhU6PQHvHj0IAAAAAQbyYQgQAAAAGAAAAAAAAADsAAADMAAAAf27MABiJIQOCbswA_4ghAwAAXwVs52D3",
      "name": "Torstraße"
    },
    {
      "location": [
        13.428554,
        52.523239
      ],
      "hint": "7UcAgP___38fAAAAUQAAACYAAABTAAAAhSQKQrXq5kKRbiZCWJo_Qx8AAABRAAAAJgAAAFMAAADMAAAASufMAOdwIQNL58wA03AhAwMAvxBs52D3",
      "name": "Platz der Vereinten Nationen"
    }
  ],
  "durations": [
    [
      0,
      192.6,
      382.8
    ],
    [
      199,
      0,
      283.9
    ],
    [
      344.7,
      222.3,
      0
    ]
  ],
  "destinations": [
    {
      "location": [
        13.3888,
        52.517033
      ],
      "hint": "PAMAgEVJAoAUAAAAIAAAAAcAAAAAAAAArss0Qa7LNEHiVIRA4lSEQAoAAAAQAAAABAAAAAAAAADMAAAAAEzMAKlYIQM8TMwArVghAwEA3wps52D3",
      "name": "Friedrichstraße"
    },
    {
      "location": [
        13.397631,
        52.529432
      ],
      "hint": "WIQBgL6mAoAEAAAABgAAAAAAAAA7AAAAhU6PQHvHj0IAAAAAQbyYQgQAAAAGAAAAAAAAADsAAADMAAAAf27MABiJIQOCbswA_4ghAwAAXwVs52D3",
      "name": "Torstraße"
    },
    {
      "location": [
        13.428554,
        52.523239
      ],
      "hint": "7UcAgP___38fAAAAUQAAACYAAABTAAAAhSQKQrXq5kKRbiZCWJo_Qx8AAABRAAAAJgAAAFMAAADMAAAASufMAOdwIQNL58wA03AhAwMAvxBs52D3",
      "name": "Platz der Vereinten Nationen"
    }
  ],
  "code": "Ok",
  "distances": [
    [
      0,
      1886.89,
      3791.3
    ],
    [
      1824,
      0,
      2838.09
    ],
    [
      3275.36,
      2361.73,
      0
    ]
  ],
  "fallback_speed_cells": [
    [ 0, 1 ],
    [ 1, 0 ]
  ]
 }
 ```
 ### Match service
 Map matching matches/snaps given GPS points to the road network in the most plausible way.
-Please note the request might result in multiple sub-traces. Large jumps in the timestamps (> 60s) or improbable transitions lead to trace splits if a complete matching could not be found.
+Please note the request might result multiple sub-traces. Large jumps in the timestamps (> 60s) or improbable transitions lead to trace splits if a complete matching could not be found.
 The algorithm might not be able to match all points. Outliers are removed if they can not be matched successfully.
 ```endpoint
@ -429,15 +273,12 @@ In addition to the [general options](#general-options) the following options are
 |Option      |Values                                          |Description                                                                               |
 |------------|------------------------------------------------|------------------------------------------------------------------------------------------|
-|steps       |`true`, `false` (default)                       |Returned route steps for each route                                                       |
+|steps       |`true`, `false` (default)                       |Return route steps for each route                                                         |
 |geometries  |`polyline` (default), `polyline6`, `geojson`    |Returned route geometry format (influences overview and per step)                         |
-|annotations |`true`, `false` (default), `nodes`, `distance`, `duration`, `datasources`, `weight`, `speed`  |Returns additional metadata for each coordinate along the route geometry.                 |
+|annotations |`true`, `false` (default)                       |Returns additional metadata for each coordinate along the route geometry.                 |
 |overview    |`simplified` (default), `full`, `false`         |Add overview geometry either full, simplified according to highest zoom level it could be display on, or not at all.|
 |timestamps  |`{timestamp};{timestamp}[;{timestamp} ...]`     |Timestamps for the input locations in seconds since UNIX epoch. Timestamps need to be monotonically increasing. |
 |radiuses    |`{radius};{radius}[;{radius} ...]`              |Standard deviation of GPS precision used for map matching. If applicable use GPS accuracy.|
 |gaps        |`split` (default), `ignore`                     |Allows the input track splitting based on huge timestamp gaps between points.             |
 |tidy        |`true`, `false` (default)                       |Allows the input track modification to obtain better matching quality for noisy tracks.   |
 |waypoints   | `{index};{index};{index}...`                   |Treats input coordinates indicated by given indices as waypoints in returned Match object. Default is to treat all input coordinates as waypoints.    |
 |Parameter   |Values                             |
 |------------|-----------------------------------|
@ -453,11 +294,10 @@ The area to search is chosen such that the correct candidate should be considere
 - `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
 - `tracepoints`: Array of `Waypoint` objects representing all points of the trace in order.
-  If the tracepoint was omitted by map matching because it is an outlier, the entry will be `null`.
+  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:
  - `matchings_index`: Index to the `Route` object in `matchings` the sub-trace was matched to.
  - `waypoint_index`: Index of the waypoint inside the matched route.
  - `alternatives_count`: Number of probable alternative matchings for this tracepoint. A value of zero indicates that this point was matched unambiguously. Split the trace at these points for incremental map matching.
 - `matchings`: An array of `Route` objects that assemble the trace. Each `Route` object has the following additional properties:
  - `confidence`: Confidence of the matching. `float` value between 0 and 1. 1 is very confident that the matching is correct.
@ -472,8 +312,8 @@ All other properties might be undefined.
 ### Trip service
 The trip plugin solves the Traveling Salesman Problem using a greedy heuristic (farthest-insertion algorithm) for 10 or more waypoints and uses brute force for less than 10 waypoints.
-The returned path does not have to be the fastest one. As TSP is NP-hard it only returns an approximation.
+The returned path does not have to be the fastest path. As TSP is NP-hard it only returns an approximation.
-Note that all input coordinates have to be connected for the trip service to work.
+Note that all input coordinates have to be connected for the trip service to work. 
 ```endpoint
 GET /trip/v1/{profile}/{coordinates}?roundtrip={true|false}&source{any|first}&destination{any|last}&steps={true|false}&geometries={polyline|polyline6|geojson}&overview={simplified|full|false}&annotations={true|false}'
@ -483,33 +323,33 @@ In addition to the [general options](#general-options) the following options are
 |Option      |Values                                          |Description                                                                |
 |------------|------------------------------------------------|---------------------------------------------------------------------------|
-|roundtrip   |`true` (default), `false`                       |Returned route is a roundtrip (route returns to first location)            |
+|roundtrip   |`true` (default), `false`                       |Return route is a roundtrip                                                |
-|source      |`any` (default), `first`                        |Returned route starts at `any` or `first` coordinate                       |
+|source      |`any` (default), `first`                        |Return route starts at `any` or `first` coordinate                         |
-|destination |`any` (default), `last`                         |Returned route ends at `any` or `last` coordinate                          |
+|destination |`any` (default), `last`                         |Return route ends at `any` or `last` coordinate                            |
-|steps       |`true`, `false` (default)                       |Returned route instructions for each trip                                  |
+|steps       |`true`, `false` (default)                       |Return route instructions for each trip                                    |
-|annotations |`true`, `false` (default), `nodes`, `distance`, `duration`, `datasources`, `weight`, `speed` |Returns additional metadata for each coordinate along the route geometry.  |
+|annotations |`true`, `false` (default)                       |Returns additional metadata for each coordinate along the route geometry.  |
 |geometries  |`polyline` (default), `polyline6`, `geojson`    |Returned route geometry format (influences overview and per step)          |
 |overview    |`simplified` (default), `full`, `false`         |Add overview geometry either full, simplified according to highest zoom level it could be display on, or not at all.|
 **Fixing Start and End Points**
-It is possible to explicitly set the start or end coordinate of the trip.
+It is possible to explicitely set the start or end coordinate of the trip. 
-When the source is set to `first`, the first coordinate is used as the start coordinate of the trip in the output. When the destination is set to `last`, the last coordinate will be used as the destination of the trip in the returned output. If you specify `any`, any of the coordinates can be used as the first or last coordinate in the output.
+When source is set to `first`, the first coordinate is used as start coordinate of the trip in the output. When destination is set to `last`, the last coordinate will be used as destination of the trip in the returned output. If you specify `any`, any of the coordinates can be used as the first or last coordinate in the output.
 However, if `source=any&destination=any` the returned round-trip will still start at the first input coordinate by default.
-Currently, not all combinations of `roundtrip`, `source`, and `destination` are supported.
+Currently, not all combinations of `roundtrip`, `source` and `destination` are supported.
 Right now, the following combinations are possible:
 | roundtrip | source | destination | supported |
 | :-- | :-- | :-- | :-- |
-| true | first | last | **yes** |
+| true | first | last | **yes** | 
 | true | first | any | **yes** |
 | true | any | last | **yes** |
 | true | any | any | **yes** |
 | false | first | last | **yes** |
-| false | first | any | **yes** |
+| false | first | any | no |
-| false | any | last | **yes** |
+| false | any | last | no |
 | false | any | any | no |
 #### Example Requests
@ -574,11 +414,8 @@ Vector tiles contain two layers:
 | `speed`      | `integer` | the speed on that road segment, in km/h  |
 | `is_small`   | `boolean` | whether this segment belongs to a small (< 1000 node) [strongly connected component](https://en.wikipedia.org/wiki/Strongly_connected_component) |
 | `datasource` | `string`  | the source for the speed value (normally `lua profile` unless you're using the [traffic update feature](https://github.com/Project-OSRM/osrm-backend/wiki/Traffic), in which case it contains the stem of the filename that supplied the speed value for this segment |
-| `duration`   | `float`   | how long this segment takes to traverse, in seconds.  This value is to calculate the total route ETA. |
+| `duration`   | `float`   | how long this segment takes to traverse, in seconds |
 | `weight  `   | `integer` | how long this segment takes to traverse, in units (may differ from `duration` when artificial biasing is applied in the Lua profiles).  ACTUAL ROUTING USES THIS VALUE. |
 | `name`       | `string`  | the name of the road this segment belongs to |
 | `rate`       | `float`   | the value of `length/weight` - analogous to `speed`, but using the `weight` value rather than `duration`, rounded to the nearest integer |
 | `is_startpoint` | `boolean` | whether this segment can be used as a start/endpoint for routes |
 `turns` layer:
@ -587,9 +424,6 @@ Vector tiles contain two layers:
 | `bearing_in` | `integer` | the absolute bearing that approaches the intersection.  -180 to +180, 0 = North, 90 = East |
 | `turn_angle` | `integer` | the angle of the turn, relative to the `bearing_in`.  -180 to +180, 0 = straight ahead, 90 = 90-degrees to the right |
 | `cost`       | `float`   | the time we think it takes to make that turn, in seconds.  May be negative, depending on how the data model is constructed (some turns get a "bonus"). |
 | `weight`     | `float`   | the weight we think it takes to make that turn.  May be negative, depending on how the data model is constructed (some turns get a "bonus"). ACTUAL ROUTING USES THIS VALUE |
 | `type`       | `string`  | the type of this turn - values like `turn`, `continue`, etc.  See the `StepManeuver` for a partial list, this field also exposes internal turn types that are never returned with an API response |
 | `modifier`   | `string`  | the direction modifier of the turn (`left`, `sharp left`, etc) |
 ## Result objects
@ -602,13 +436,13 @@ Represents a route through (potentially multiple) waypoints.
 - `distance`: The distance traveled by the route, in `float` meters.
 - `duration`: The estimated travel time, in `float` number of seconds.
- `geometry`: The whole geometry of the route value depending on `overview` parameter, format depending on the `geometries` parameter. See `RouteStep`'s `geometry` property for the parameter documentation.
+- `geometry`: The whole geometry of the route value depending on `overview` parameter, format depending on the `geometries` parameter. See `RouteStep`'s `geometry` property for a parameter documentation.
 - `weight`: The calculated weight of the route.
- `weight_name`: The name of the weight profile used during the extraction phase.
+- `weight_name`: The name of the weight profile used during extraction phase.
 | overview   | Description                 |
 |------------|-----------------------------|
-| simplified | Geometry is simplified according to the highest zoom level it can still be displayed in full. |
+| simplified | Geometry is simplified according to the highest zoom level it can still be displayed on full. |
 | full       | Geometry is not simplified. |
 | false      | Geometry is not added.      |
@ -651,10 +485,10 @@ Represents a route between two waypoints.
 - `weight`: The calculated weight of the route leg.
 - `summary`: Summary of the route taken as `string`. Depends on the `steps` parameter:
-| steps |                                                                       |
+| steps        |                                                                       |
-|-------|-----------------------------------------------------------------------|
+|--------------|-----------------------------------------------------------------------|
-| true  | Names of the two major roads used. Can be empty if the route is too short.|
+| true         | Names of the two major roads used. Can be empty if route is too short.|
-| false | empty `string`                                                        |
+| false        | empty `string`                                                        |
 - `steps`: Depends on the `steps` parameter.
@ -663,12 +497,12 @@ Represents a route between two waypoints.
 | true         | array of `RouteStep` objects describing the turn-by-turn instructions |
 | false        | empty array                                                           |
- `annotation`: Additional details about each coordinate along with the route geometry:
+- `annotation`: Additional details about each coordinate along the route geometry:
-| annotations  |                                                                               |
+| annotations  |                                                                       |
-|--------------|-------------------------------------------------------------------------------|
+|--------------|-----------------------------------------------------------------------|
-| true         | An `Annotation` object containing node ids, durations, distances, and weights. |
+| true         | An `Annotation` object containing node ids, durations distances and   |
-| false        | `undefined`                                                                   |
+| false        | weights `undefined`                                                   |
 #### Example
@ -684,9 +518,7 @@ With `steps=false` and `annotations=true`:
    "distance": [5,5,10,5,5],
    "duration": [15,15,40,15,15],
    "datasources": [1,0,0,0,1],
-    "metadata": { "datasource_names": ["traffic","lua profile","lua profile","lua profile","traffic"] },
+    "nodes": [49772551,49772552,49786799,49786800,49786801,49786802]
    "nodes": [49772551,49772552,49786799,49786800,49786801,49786802],
    "speed": [0.3, 0.3, 0.3, 0.3, 0.3]
  }
 }
 ```
@ -697,14 +529,11 @@ Annotation of the whole route leg with fine-grained information about each segme
 **Properties**
- `distance`: The distance, in meters, between each pair of coordinates
+- `distance`: The distance, in metres, between each pair of coordinates
- `duration`: The duration between each pair of coordinates, in seconds.  Does not include the duration of any turns.
+- `duration`: The duration between each pair of coordinates, in seconds
- `datasources`: The index of the data source for the speed between each pair of coordinates. `0` is the default profile, other values are supplied via `--segment-speed-file` to `osrm-contract` or `osrm-customize`.  String-like names are in the `metadata.datasource_names` array.
+- `datasources`: The index of the datasource for the speed between each pair of coordinates. `0` is the default profile, other values are supplied via `--segment-speed-file` to `osrm-contract`
 - `nodes`: The OSM node ID for each coordinate along the route, excluding the first/last user-supplied coordinates
- `weight`: The weights between each pair of coordinates.  Does not include any turn costs.
+- `weight`: The weights between each pair of coordinates
 - `speed`: Convenience field, calculation of `distance / duration` rounded to one decimal place
 - `metadata`: Metadata related to other annotations
  - `datasource_names`: The names of the data sources used for the speed between each pair of coordinates.  `lua profile` is the default profile, other values are the filenames supplied via `--segment-speed-file` to `osrm-contract` or `osrm-customize`
 #### Example
@ -713,7 +542,6 @@ Annotation of the whole route leg with fine-grained information about each segme
  "distance": [5,5,10,5,5],
  "duration": [15,15,40,15,15],
  "datasources": [1,0,0,0,1],
  "metadata": { "datasource_names": ["traffic","lua profile","lua profile","lua profile","traffic"] },
  "nodes": [49772551,49772552,49786799,49786800,49786801,49786802],
  "weight": [15,15,40,15,15]
 }
@ -741,15 +569,11 @@ step.
 - `name`: The name of the way along which travel proceeds.
 - `ref`: A reference number or code for the way. Optionally included, if ref data is available for the given way.
- `pronunciation`: A string containing an [IPA](https://en.wikipedia.org/wiki/International_Phonetic_Alphabet) phonetic transcription indicating how to pronounce the name in the `name` property. This property is omitted if pronunciation data is unavailable for the step.
+- `pronunciation`: The pronunciation hint of the way name. Will be `undefined` if there is no pronunciation hit.
 - `destinations`: The destinations of the way. Will be `undefined` if there are no destinations.
 - `exits`: The exit numbers or names of the way. Will be `undefined` if there are no exit numbers or names.
 - `mode`: A string signifying the mode of transportation.
 - `maneuver`: A `StepManeuver` object representing the maneuver.
 - `intersections`: A list of `Intersection` objects that are passed along the segment, the very first belonging to the StepManeuver
 - `rotary_name`: The name for the rotary. Optionally included, if the step is a rotary and a rotary name is available.
 - `rotary_pronunciation`: The pronunciation hint of the rotary name. Optionally included, if the step is a rotary and a rotary pronunciation is available.
 - `driving_side`: The legal driving side at the location for this step.  Either `left` or `right`.
 #### Example
@ -763,8 +587,8 @@ step.
      {  "bearings" : [ 10, 92, 184, 270 ],
         "lanes" : [
            { "indications" : [ "left", "straight" ],
-               "valid" : false },
+               "valid" : "false" },
-            { "valid" : true,
+            { "valid" : "true",
               "indications" : [ "right" ] }
         ],
         "out" : 2,
@ -775,9 +599,9 @@ step.
      {  "out" : 1,
         "lanes" : [
            { "indications" : [ "straight" ],
-               "valid" : true },
+               "valid" : "true" },
            { "indications" : [ "right" ],
-               "valid" : false }
+               "valid" : "false" }
         ],
         "bearings" : [ 60, 240, 330 ],
         "in" : 0,
@ -804,11 +628,11 @@ step.
 - `bearing_after`: The clockwise angle from true north to the
  direction of travel immediately after the maneuver.  Range 0-359.
 - `type` A string indicating the type of maneuver. **new identifiers might be introduced without API change**
-   Types unknown to the client should be handled like the `turn` type, the existence of correct `modifier` values is guaranteed.
+   Types  unknown to the client should be handled like the `turn` type, the existance of correct `modifier` values is guranteed.
 | `type`           | Description                                                  |
 |------------------|--------------------------------------------------------------|
-| `turn`           | a basic turn into the direction of the `modifier`                |
+| `turn`           | a basic turn into direction of the `modifier`                |
 | `new name`       | no turn is taken/possible, but the road name changes. The road can take a turn itself, following `modifier`.                  |
 | `depart`         | indicates the departure of the leg                           |
 | `arrive`         | indicates the destination of the leg                         |
@ -818,14 +642,12 @@ step.
 | `off ramp`       | take a ramp to exit a highway (direction given my `modifier`)  |
 | `fork`           | take the left/right side at a fork depending on `modifier`   |
 | `end of road`    | road ends in a T intersection turn in direction of `modifier`|
-| `use lane`       | **Deprecated** replaced by lanes on all intersection entries |
+| `use lane`       | going straight on a specific lane                            |
 | `continue`       | Turn in direction of `modifier` to stay on the same road     |
-| `roundabout`     | traverse roundabout, if the route leaves the roundabout there will be an additional property `exit` for exit counting. The modifier specifies the direction of entering the roundabout. |
+| `roundabout`     | traverse roundabout, has additional property `exit` with NR if the roundabout is left. `the modifier specifies the direction of entering the roundabout` |
-| `rotary`         | a traffic circle. While very similar to a larger version of a roundabout, it does not necessarily follow roundabout rules for right of way. It can offer `rotary_name` and/or `rotary_pronunciation` parameters (located in the RouteStep object) in addition to the `exit` parameter (located on the StepManeuver object).  |
+| `rotary`         | a traffic circle. While very similar to a larger version of a roundabout, it does not necessarily follow roundabout rules for right of way. It can offer `rotary_name/rotary_pronunciation` in addition to the `exit` parameter.  |
-| `roundabout turn`| Describes a turn at a small roundabout that should be treated as a normal turn. The `modifier` indicates the turn direction. Example instruction: `At the roundabout turn left`. |
+| `roundabout turn`| Describes a turn at a small roundabout that should be treated as normal turn. The `modifier` indicates the turn direciton. Example instruction: `At the roundabout turn left`. |
-| `notification`   | not an actual turn but a change in the driving conditions. For example the travel mode or classes. If the road takes a turn itself, the `modifier` describes the direction |
+| `notification`   | not an actual turn but a change in the driving conditions. For example the travel mode.  If the road takes a turn itself, the `modifier` describes the direction |
 | `exit roundabout`| Describes a maneuver exiting a roundabout (usually preceded by a `roundabout` instruction) |
 | `exit rotary`    | Describes the maneuver exiting a rotary (large named roundabout) |
  Please note that even though there are `new name` and `notification` instructions, the `mode` and `name` can change
  between all instructions. They only offer a fallback in case nothing else is to report.
@ -834,7 +656,7 @@ step.
 | `modifier`        | Description                               |
 |-------------------|-------------------------------------------|
-| `uturn`           | indicates the reversal of direction          |
+| `uturn`           | indicates  reversal of direction          |
 | `sharp right`     | a sharp right turn                        |
 | `right`           | a normal turn to the right                |
 | `slight right`    | a slight turn to the right                |
@ -852,8 +674,8 @@ step.
 | `turn`                 | `modifier` indicates the change in direction accomplished through the turn                                                |
 | `depart`/`arrive`      | `modifier` indicates the position of departure point and arrival point in relation to the current direction of travel      |
- `exit` An optional `integer` indicating the number of the exit to take. The property exists for the `roundabout` / `rotary` property:
+- `exit` An optional `integer` indicating number of the exit to take. The property exists for the `roundabout` / `rotary` property:
-  Number of the roundabout exit to take. If an exit is `undefined` the destination is on the roundabout.
+  Number of the roundabout exit to take. If exit is `undefined` the destination is on the roundabout.
 New properties (potentially depending on `type`) may be introduced in the future without an API version change.
@ -864,7 +686,7 @@ A `Lane` represents a turn lane at the corresponding turn location.
 **Properties**
- `indications`: an indication (e.g. marking on the road) specifying the turn lane. A road can have multiple indications (e.g. an arrow pointing straight and left). The indications are given in an array, each containing one of the following types. Further indications might be added on without an API version change.
+- `indications`: a indication (e.g. marking on the road) specifying the turn lane. A road can have multiple indications (e.g. an arrow pointing straight and left). The indications are given in an array, each containing one of the following types. Further indications might be added on without an API version change.
 | `value`                | Description                                                                                                               |
 |------------------------|---------------------------------------------------------------------------------------------------------------------------|
@ -885,20 +707,19 @@ A `Lane` represents a turn lane at the corresponding turn location.
 ```json
 {
    "indications": ["left", "straight"],
-    "valid": false
+    "valid": "false"
 }
 ```
 ### Intersection object
-An intersection gives a full representation of any cross-way the path passes by. For every step, the very first intersection (`intersections[0]`) corresponds to the
+An intersection gives a full representation of any cross-way the path passes bay. For every step, the very first intersection (`intersections[0]`) corresponds to the
 location of the StepManeuver. Further intersections are listed for every cross-way until the next turn instruction.
 **Properties**
 - `location`: A `[longitude, latitude]` pair describing the location of the turn.
 - `bearings`: A list of bearing values (e.g. [0,90,180,270]) that are available at the intersection. The bearings describe all available roads at the intersection.  Values are between 0-359 (0=true north)
 - `classes`: An array of strings signifying the classes (as specified in the profile) of the road exiting the intersection.
 - `entry`: A list of entry flags, corresponding in a 1:1 relationship to the bearings. A value of `true` indicates that the respective road could be entered on a valid route.
  `false` indicates that the turn onto the respective road would violate a restriction.
 - `in`: index into bearings/entry array. Used to calculate the bearing just before the turn. Namely, the clockwise angle from true north to the
@ -917,25 +738,23 @@ location of the StepManeuver. Further intersections are listed for every cross-w
    "out":2,
    "bearings":[60,150,240,330],
    "entry":["false","true","true","true"],
    "classes": ["toll", "restricted"],
    "lanes":{
        "indications": ["left", "straight"],
-        "valid": false
+        "valid": "false"
    }
 }
 ```
 ### Waypoint object
-The object is used to describe the waypoint on a route.
+Object used to describe waypoint on a route.
 **Properties**
 - `name` Name of the street the coordinate snapped to
 - `location` Array that contains the `[longitude, latitude]` pair of the snapped coordinate
 - `distance` The distance, in meters, from the input coordinate to the snapped coordinate
 - `hint` Unique internal identifier of the segment (ephemeral, not constant over data updates)
-   This can be used on subsequent requests to significantly speed up the query and to connect multiple services.
+   This can be used on subsequent request to significantly speed up the query and to connect multiple services.
   E.g. you can use the `hint` value obtained by the `nearest` query as `hint` values for `route` inputs.
 #### Example
@ -951,175 +770,3 @@ The object is used to describe the waypoint on a route.
   ]
 }
 ```
 ## Flatbuffers format
 The default response format is `json`, but OSRM supports binary [`flatbuffers`](https://google.github.io/flatbuffers/) format, which
 is much faster in serialization/deserialization, comparing to `json`.
 The format itself is described in message descriptors, located at `include/engine/api/flatbuffers` directory. Those descriptors could
 be compiled to provide protocol parsers in Go/Javascript/Typescript/Java/Dart/C#/Python/Lobster/Lua/Rust/PHP/Kotlin. Precompiled
 protocol parser for C++ is supplied with OSRM.
 `Flatbuffers` format provides exactly the same data, as `json` format with a slightly different layout, which was optimized to minimize
 in-transfer size.
 ### Root object
 Root object is the only object, available from a 'raw' `flatbuffers` buffer. It can be constructed with a following call:
         auto osrm = osrm::engine::api::fbresult::GetFBResult(some_input_buffer);
 **Properties**
 - `error`: `bool` Marks response as erroneous. An erroneous response should include the `code` fieldset, all the other fields may not be present.
 - `code`: `Error` Error description object, only present, when `error` is `true`
 - `waypoints`: `[Waypoint]` Array of `Waypoint` objects. Should present for every service call, unless `skip_waypoints` is set to `true`. Table service will put `sources` array here.
 - `routes`: `[RouteObject]` Array of `RouteObject` objects. May be empty or absent. Should present for Route/Trip/Match services call.
 - `table`: `Table` Table object, may absent. Should be present in case of Table service call.
 ### Error object
 Contains error information.
 **Properties**
 - `code`: `string` Error code
 - `message`: `string` Detailed error message
 ### Waypoint object
 Almost the same as `json` Waypoint object. The following properties differ:
 - `location`: `Position` Same as `json` location field, but different format.
 - `nodes`: `Uint64Pair` Same as `json` nodes field, but different format.
 ### RouteObject object
 Almost the same as `json` Route object. The following properties differ:
 - `polyline`: `string` Same as `json` geometry.polyline or geometry.polyline6 fields. One field for both formats.
 - `coordinates`: `[Position]` Same as `json` geometry.coordinates field, but different format.
 - `legs`: `[Leg]` Array of `Leg` objects.
 ### Leg object
 Almost the same as `json` Leg object. The following properties differ:
 - `annotations`: `Annotation` Same as `json` annotation field, but different format.
 - `steps`: `[Step]` Same as `step` annotation field, but different format.
 ### Step object
 Almost the same as `json` Step object. The following properties differ:
 - `polyline`: `string` Same as `json` geometry.polyline or geometry.polyline6 fields. One field for both formats.
 - `coordinates`: `[Position]` Same as `json` geometry.coordinates field, but different format.
 - `maneuver`: `StepManeuver` Same as `json` maneuver field, but different format.
 | `type`           | Description                                                                                                                                                                                                                                                                                                                  |
 |------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `Turn`           | a basic turn into the direction of the `modifier`                                                                                                                                                                                                                                                                                |
 | `NewName`        | no turn is taken/possible, but the road name changes. The road can take a turn itself, following `modifier`.                                                                                                                                                                                                                 |
 | `Depart`         | indicates the departure of the leg                                                                                                                                                                                                                                                                                           |
 | `Arrive`         | indicates the destination of the leg                                                                                                                                                                                                                                                                                         |
 | `Merge`          | merge onto a street (e.g. getting on the highway from a ramp, the `modifier specifies the direction of the merge`)                                                                                                                                                                                                           |
 | `OnRamp`         | take a ramp to enter a highway (direction given my `modifier`)                                                                                                                                                                                                                                                               |
 | `OffRamp`        | take a ramp to exit a highway (direction given my `modifier`)                                                                                                                                                                                                                                                                |
 | `Fork`           | take the left/right side at a fork depending on `modifier`                                                                                                                                                                                                                                                                   |
 | `EndOfRoad`      | road ends in a T intersection turn in direction of `modifier`                                                                                                                                                                                                                                                                |
 | `Continue`       | Turn in direction of `modifier` to stay on the same road                                                                                                                                                                                                                                                                     |
 | `Roundabout`     | traverse roundabout, if the route leaves the roundabout there will be an additional property `exit` for exit counting. The modifier specifies the direction of entering the roundabout.                                                                                                                                      |
 | `Rotary`         | a traffic circle. While very similar to a larger version of a roundabout, it does not necessarily follow roundabout rules for right of way. It can offer `rotary_name` and/or `rotary_pronunciation` parameters (located in the RouteStep object) in addition to the `exit` parameter (located on the StepManeuver object).  |
 | `RoundaboutTurn` | Describes a turn at a small roundabout that should be treated as a normal turn. The `modifier` indicates the turn direction. Example instruction: `At the roundabout turn left`.                                                                                                                                               |
 | `Notification`   | not an actual turn but a change in the driving conditions. For example the travel mode or classes. If the road takes a turn itself, the `modifier` describes the direction                                                                                                                                                   |
 | `ExitRoundabout` | Describes a maneuver exiting a roundabout (usually preceded by a `roundabout` instruction)                                                                                                                                                                                                                                  |
 | `ExitRotary`     | Describes the maneuver exiting a rotary (large named roundabout)                                                                                                                                                                                                                                                             |
 - `driving_side`: `bool` Ttrue stands for the left side driving.
 - `intersections`: `[Intersection]` Same as `json` intersections field, but different format.
 ### Intersection object
 Almost the same as `json` Intersection object. The following properties differ:
 - `location`: `Position` Same as `json` location property, but in a different format.
 - `lanes`: `[Lane]` Array of `Lane` objects.
 ### Lane object
 Almost the same as `json` Lane object. The following properties differ:
 - `indications`: `Turn` Array of `Turn` enum values.
 | `value`                | Description                                                                                                               |
 |------------------------|---------------------------------------------------------------------------------------------------------------------------|
 | `None`                 | No dedicated indication is shown.                                                                                         |
 | `UTurn`                | An indication signaling the possibility to reverse (i.e. fully bend arrow).                                               |
 | `SharpRight`           | An indication indicating a sharp right turn (i.e. strongly bend arrow).                                                   |
 | `Right`                | An indication indicating a right turn (i.e. bend arrow).                                                                  |
 | `SlightRight`          | An indication indicating a slight right turn (i.e. slightly bend arrow).                                                  |
 | `Straight`             | No dedicated indication is shown (i.e. straight arrow).                                                                   |
 | `SlightLeft`           | An indication indicating a slight left turn (i.e. slightly bend arrow).                                                   |
 | `Left`                 | An indication indicating a left turn (i.e. bend arrow).                                                                   |
 | `SharpLeft`            | An indication indicating a sharp left turn (i.e. strongly bend arrow).                                                    |
 ### StepManeuver object
 Almost the same as `json` StepManeuver object. The following properties differ:
 - `location`: `Position` Same as `json` location property, but in a different format.
 - `type`: `ManeuverType` Type of a maneuver (enum)
 | `type`           | Description                                                  |
 |------------------|--------------------------------------------------------------|
 | `Turn`           | a basic turn into the direction of the `modifier`                |
 | `NewName`        | no turn is taken/possible, but the road name changes. The road can take a turn itself, following `modifier`.                  |
 | `Depart`         | indicates the departure of the leg                           |
 | `Arrive`         | indicates the destination of the leg                         |
 | `Merge`          | merge onto a street (e.g. getting on the highway from a ramp, the `modifier specifies the direction of the merge`) |
 | `OnRamp`         | take a ramp to enter a highway (direction given my `modifier`) |
 | `OffRamp`        | take a ramp to exit a highway (direction given my `modifier`)  |
 | `Fork`           | take the left/right side at a fork depending on `modifier`   |
 | `EndOfRoad`      | road ends in a T intersection turn in direction of `modifier`|
 | `Continue`       | Turn in direction of `modifier` to stay on the same road     |
 | `Roundabout`     | traverse roundabout, if the route leaves the roundabout there will be an additional property `exit` for exit counting. The modifier specifies the direction of entering the roundabout. |
 | `Rotary`         | a traffic circle. While very similar to a larger version of a roundabout, it does not necessarily follow roundabout rules for right of way. It can offer `rotary_name` and/or `rotary_pronunciation` parameters (located in the RouteStep object) in addition to the `exit` parameter (located on the StepManeuver object).  |
 | `RoundaboutTurn` | Describes a turn at a small roundabout that should be treated as a normal turn. The `modifier` indicates the turn direction. Example instruction: `At the roundabout turn left`. |
 | `Notification`   | not an actual turn but a change in the driving conditions. For example the travel mode or classes. If the road takes a turn itself, the `modifier` describes the direction |
 | `ExitRoundabout` | Describes a maneuver exiting a roundabout (usually preceded by a `roundabout` instruction) |
 | `ExitRotary`    | Describes the maneuver exiting a rotary (large named roundabout) |
 - `modifier`: `Turn` Maneuver turn (enum)
 ### Annotation object
 Exactly the same as `json` annotation object.
 ### Position object
 A point on Earth.
 ***Properties***
 - `longitute`: `float` Point's longitude
 - `latitude`: `float` Point's latitude
 ### Uint64Pair
 A pair of long long integers. Used only by `Waypoint` object.
 ***Properties***
 - `first`: `uint64` First pair value.
 - `second`: `uint64` Second pair value.
 ### Table object
 Almost the same as `json` Table object. The main difference is that 'sources' field is absent and the root's object 'waypoints' field is
 used instead. All the other differences follow:
 - `durations`: `[float]` Flat representation of a durations matrix. Element at row;col can be addressed as [row * cols + col]
 - `distances`: `[float]` Flat representation of a destinations matrix. Element at row;col can be addressed as [row * cols + col]
 - `destinations`: `[Waypoint]` Array of `Waypoint` objects. Will be `null` if `skip_waypoints` will be set to `true`
 - `rows`: `ushort` Number of rows in durations/destinations matrices.
 - `cols`: `ushort` Number of cols in durations/destinations matrices.
--- a/docs/nodejs/api.md
+++ b/docs/nodejs/api.md
@ -1,411 +0,0 @@
 <!-- Generated by documentation.js. Update this documentation by updating the source code. -->
 ## OSRM
 The `OSRM` method is the main constructor for creating an OSRM instance.
 An OSRM instance requires a `.osrm.*` dataset(`.osrm.*` because it contains several files), which is prepared by the OSRM toolchain.
 You can create such a `.osrm.*` dataset by running the OSRM binaries we ship in `node_modules/osrm/lib/binding/` and default
 profiles (e.g. for setting speeds and determining road types to route on) in `node_modules/osrm/profiles/`:
    node_modules/osrm/lib/binding/osrm-extract data.osm.pbf -p node_modules/osrm/profiles/car.lua
    node_modules/osrm/lib/binding/osrm-contract data.osrm
 Consult the [osrm-backend](https://github.com/Project-OSRM/osrm-backend) documentation for further details.
 Once you have a complete `network.osrm.*` dataset, you can calculate routes in javascript with this object.
 ```javascript
 var osrm = new OSRM('network.osrm');
 ```
 **Parameters**
 -   `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/docs/Web/JavaScript/Reference/Global_Objects/String)?** The algorithm to use for routing. Can be 'CH', or 'MLD'. Default is 'CH'.
               Make sure you prepared the dataset with the correct toolchain.
    -   `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/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/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/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/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.disable_feature_dataset` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Disables a feature dataset from being loaded into memory if not needed. Options: `ROUTE_STEPS`, `ROUTE_GEOMETRY`.
    -   `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/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/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/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in map-matching 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_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).
    -   `options.default_radius` **[Number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Default radius for queries (default: unlimited).
 ### route
 Returns the fastest route between two or more coordinates while visiting the waypoints in order.
 **Parameters**
 -   `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/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/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/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/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
    -   `options.exclude` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** List of classes to avoid, order does not matter.
    -   `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/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Search for alternative routes. (optional, default `false`)
    -   `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/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route steps for each route leg. (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/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/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/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/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Restrict the direction on the road network at a waypoint, relative to the input coordinate. Can be `null` (unrestricted, default), `curb` or `opposite`.
                         `null`/`true`/`false`
    -   `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.format` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which output format to use, either `json`, or [`flatbuffers`](https://github.com/Project-OSRM/osrm-backend/tree/master/include/engine/api/flatbuffers).
    -   `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.skip_waypoints` **[Boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Removes waypoints from the response. Waypoints are still calculated, but not serialized. Could be useful in case you are interested in some other part of response and do not want to transfer waste data. (optional, default `false`)
 -   `callback` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)** 
 **Examples**
 ```javascript
 var osrm = new OSRM("berlin-latest.osrm");
 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/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
 Snaps a coordinate to the street network and returns the nearest n matches.
 Note: `coordinates` in the general options only supports a single `{longitude},{latitude}` entry.
 **Parameters**
 -   `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/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/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/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/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/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/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/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Restrict the direction on the road network at a waypoint, relative to the input coordinate. Can be `null` (unrestricted, default), `curb` or `opposite`.
    -   `options.format` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)?** Which output format to use, either `json`, or [`flatbuffers`](https://github.com/Project-OSRM/osrm-backend/tree/master/include/engine/api/flatbuffers).
    -   `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('network.osrm');
 var options = {
  coordinates: [[13.388860,52.517037]],
  number: 3,
  bearings: [[0,20]]
 };
 osrm.nearest(options, function(err, response) {
  console.log(response.waypoints); // array of Waypoint objects
 });
 ```
 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 tables.
 Optionally returns distance table.
 **Parameters**
 -   `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/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/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/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/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/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/docs/Web/JavaScript/Reference/Global_Objects/Array)?** An array of `index` elements (`0 <= integer < #coordinates`) to use
                                         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.approaches` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Restrict the direction on the road network at a waypoint, relative to the input coordinate.. Can be `null` (unrestricted, default), `curb` or `opposite`.
    -   `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.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.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.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.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).
 -   `callback` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)** 
 **Examples**
 ```javascript
 var osrm = new OSRM('network.osrm');
 var options = {
  coordinates: [
    [13.388860,52.517037],
    [13.397634,52.529407],
    [13.428555,52.523219]
  ]
 };
 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/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.
 ### tile
 This generates [Mapbox Vector Tiles](https://mapbox.com/vector-tiles) that can be viewed with a
 vector-tile capable slippy-map viewer. The tiles contain road geometries and metadata that can
 be used to examine the routing graph. The tiles are generated directly from the data in-memory,
 so are in sync with actual routing results, and let you examine which roads are actually
 routable,
 and what weights they have applied.
 **Parameters**
 -   `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/docs/Web/JavaScript/Reference/Statements/function)** 
 **Examples**
 ```javascript
 var osrm = new OSRM('network.osrm');
 osrm.tile([0, 0, 0], function(err, response) {
  if (err) throw err;
  fs.writeFileSync('./tile.vector.pbf', response); // write the buffer to a file
 });
 ```
 Returns **[Buffer](https://nodejs.org/api/buffer.html)** contains a Protocol Buffer encoded vector tile.
 ### match
 Map matching matches given GPS points to the road network in the most plausible way.
 Please note the request might result multiple sub-traces. Large jumps in the timestamps
 (>60s) or improbable transitions lead to trace splits if a complete matching could
 not be found. The algorithm might not be able to match all points. Outliers are removed
 if they can not be matched successfully.
 **Parameters**
 -   `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/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/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/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/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/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route steps for each route. (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/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/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/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/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/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/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/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/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('network.osrm');
 var options = {
    coordinates: [[13.393252,52.542648],[13.39478,52.543079],[13.397389,52.542107]],
    timestamps: [1424684612, 1424684616, 1424684620]
 };
 osrm.match(options, function(err, response) {
    if (err) throw err;
    console.log(response.tracepoints); // array of Waypoint objects
    console.log(response.matchings); // array of Route objects
 });
 ```
 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 omitted 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.
 ### trip
 The trip plugin solves the Traveling Salesman Problem using a greedy heuristic
 (farthest-insertion algorithm) for 10 or _ more waypoints and uses brute force for less than 10
 waypoints. The returned path does not have to be the shortest path, _ as TSP is NP-hard it is
 only an approximation.
 Note that all input coordinates have to be connected for the trip service to work.
 Currently, not all combinations of `roundtrip`, `source` and `destination` are supported.
 Right now, the following combinations are possible:
 | roundtrip | source | destination | supported |
 | :-------- | :----- | :---------- | :-------- |
 | true      | first  | last        | **yes**   |
 | true      | first  | any         | **yes**   |
 | true      | any    | last        | **yes**   |
 | true      | any    | any         | **yes**   |
 | false     | first  | last        | **yes**   |
 | false     | first  | any         | no        |
 | false     | any    | last        | no        |
 | false     | any    | any         | no        |
 **Parameters**
 -   `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/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/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/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/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/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/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route steps for each route. (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/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/docs/Web/JavaScript/Reference/Global_Objects/String)** Add overview geometry either `full`, `simplified` (optional, default `simplified`)
    -   `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/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/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/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Restrict the direction on the road network at a waypoint, relative to the input coordinate. Can be `null` (unrestricted, default), `curb` or `opposite`.
    -   `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('network.osrm');
 var options = {
  coordinates: [
    [13.36761474609375, 52.51663871100423],
    [13.374481201171875, 52.506191342034576]
  ],
  source: "first",
  destination: "last",
  roundtrip: false
 }
 osrm.trip(options, function(err, response) {
  if (err) throw err;
  console.log(response.waypoints); // array of Waypoint objects
  console.log(response.trips); // array of Route objects
 });
 ```
 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.
 ## Configuration
 All plugins support a second additional object that is available to configure some NodeJS
 specific behaviours.
 **Parameters**
 -   `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 if `options.format` is
        `json`), which returns a standard Javascript object, as described above, and `buffer`(default if
        `options.format` is `flatbuffers`), which will return a NodeJS
        **[Buffer](https://nodejs.org/api/buffer.html)** object, containing a JSON string or Flatbuffers
        object. 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. Also note that `options.format` set to `flatbuffers`
        cannot be used with `plugin_config.format` set to `object`. `json_buffer` is deprecated alias for
        `buffer`.
 **Examples**
 ```javascript
 var osrm = new OSRM('network.osrm');
 var options = {
  coordinates: [
    [13.36761474609375, 52.51663871100423],
    [13.374481201171875, 52.506191342034576]
  ]
 };
 osrm.route(options, { format: "buffer" }, function(err, response) {
  if (err) throw err;
  console.log(response.toString("utf-8"));
 });
 ```
 ## Responses
 ### Route
 Represents a route through (potentially multiple) waypoints.
 **Parameters**
 -   `external` **documentation** in
    [`osrm-backend`](../http.md#route-object)
 ### RouteLeg
 Represents a route between two waypoints.
 **Parameters**
 -   `external` **documentation** in
    [`osrm-backend`](../http.md#routeleg-object)
 ### RouteStep
 A step consists of a maneuver such as a turn or merge, followed by a distance of travel along a
 single way to the subsequent step.
 **Parameters**
 -   `external` **documentation** in
    [`osrm-backend`](../http.md#routestep-object)
 ### StepManeuver
 **Parameters**
 -   `external` **documentation** in
    [`osrm-backend`](../http.md#stepmaneuver-object)
 ### Waypoint
 Object used to describe waypoint on a route.
 **Parameters**
 -   `external` **documentation** in
    [`osrm-backend`](../http.md#waypoint-object)
--- a/docs/profiles.md
+++ b/docs/profiles.md
@ -1,377 +1,47 @@
-# OSRM profiles
+OSRM supports "profiles". Configurations representing different routing behaviours for (typically) different transport modes. A profile describes whether or not we route along a particular type of way, or over a particular node in the OpenStreetMap data, and also how quickly we'll be travelling when we do. This feeds into the way the routing graph is created and thus influences the output routes.
 OSRM supports "profiles". Profiles representing routing behavior for different transport modes like car, bike and foot. You can also create profiles for variations like a fastest/shortest car profile or fastest/safest/greenest bicycles profile.
 A profile describes whether or not it's possible to route along a particular type of way, whether we can pass a particular node, and  how quickly we'll be traveling when we do. This feeds into the way the routing graph is created and thus influences the output routes.
 ## Available profiles
 Out-of-the-box OSRM comes with profiles for car, bicycle and foot. You can easily modify these or create new ones if you like.
-Profiles have a 'lua' extension, and are placed in 'profiles' directory.
+Out-of-the-box OSRM comes with several different profiles, including car, bicycle and foot.
-When running OSRM preprocessing commands you specify the profile with the --profile (or the shorthand -p) option, for example:
+Profile configuration files have a 'lua' extension, and are found under the 'profiles' subdirectory.
 Alternatively commands will take a lua profile specified with an explicit -p param, for example:
-`osrm-extract --profile ../profiles/car.lua planet-latest.osm.pbf`
+`osrm-extract -p ../profiles/car.lua planet-latest.osm.pbf`
-## Processing flow
+And then **you will need to extract and contract again** (A change to the profile will typically affect the extract step as well as the contract step. See [Processing Flow](https://github.com/Project-OSRM/osrm-backend/wiki/Processing-Flow))
 It's important to understand that profiles are used when preprocessing the OSM data, NOT at query time when routes are computed.
-This means that after modifying a profile **you will need to extract, contract and reload the data again** and to see changes in the routing results. See [Processing Flow](https://github.com/Project-OSRM/osrm-backend/wiki/Processing-Flow) for more.
+## lua scripts?
-## Profiles are written in Lua
+Profiles are not just configuration files. They are scripts written in the "lua" scripting language ( http://www.lua.org )  The reason for this, is that OpenStreetMap data is not sufficiently straightforward, to simply define tag mappings. Lua scripting offers a powerful way of coping with the complexity of different node,way,relation,tag combinations found within OpenStreetMap data.
 Profiles are not just configuration files. They are scripts written in the [Lua scripting language](http://www.lua.org). The reason for this is that OpenStreetMap data is complex, and it's not possible to simply define tag mappings. Lua scripting offers a powerful way to handle all the possible tag combinations found in OpenStreetMap nodes and ways.
-## Basic structure of profiles
+## Basic structure of a profile
 A profile will process every node and way in the OSM input data to determine what ways are routable in which direction, at what speed, etc.
-A profile will typically:
+You can understand these lua scripts enough to make interesting modifications, without needing to get to grips with how they work completely.
- Define api version (required)
+Towards the top of the file, a profile (such as [car.lua](../profiles/car.lua)) will typically define various configurations as global variables. A lot of these are look-up hashes of one sort or another.
 - Require library files (optional)
 - Define setup function (required)
 - Define process functions (some are required)
 - Return functions table (required)
-A profile can also define various local functions it needs.
+As you scroll down the file you'll see local variables, and then local functions, and finally...
-Looking at [car.lua](../profiles/car.lua) as an example, at the top of the file the api version is defined and then required library files are included.
+`way_function` and `node_function` are the important functions which are called when extracting OpenStreetMap data with `osrm-extract`.
-Then follows the `setup` function, which is called once when the profile is loaded. It returns a big hash table of configurations, specifying things like what speed to use for different way types. The configurations are used later in the various processing functions. Many adjustments can be done just by modifying this configuration table.
+## way_function
-The setup function is also where you can do other setup, like loading an elevation data source if you want to consider that when processing ways.
+Given an OpenStreetMap way, the way_function will either return nothing (meaning we are not going to route over this way at all), or it will set up a result hash to be returned. The most important thing it will do is set the value of `result.forward_speed` and `result.backward_speed` as a suitable integer value representing the speed for traversing the way.
-Then come the `process_node` and `process_way` functions, which are called for each OSM node and way when extracting OpenStreetMap data with `osrm-extract`.
+All other calculations stem from that, including the returned timings in driving directions, but also, less directly, it feeds into the actual routing decisions the engine will take (a way with a slow traversal speed, may be less favoured than a way with fast traversal speed, but it depends how long it is, and... what it connects to in the rest of the network graph)
-The `process_turn` function processes every possible turn in the network, and sets a penalty depending on the angle and turn of the movement.
+Using the power of the scripting language you wouldn't typically see something as simple as a `result.forward_speed = 20` line within the way_function. Instead a way_function will examine the tagging (e.g. `way:get_value_by_key("highway")` and many others), process this information in various ways, calling other local functions, referencing the global variables and look-up hashes, before arriving at the result.
 Profiles can also define a `process_segment` function to handle differences in speed along an OSM way, for example to handle elevation. As you can see, this is not currently used in the car profile.
 At the end of the file, a table is returned with references to the setup and processing functions the profile has defined.
 ## Understanding speed, weight and rate
 When computing a route from A to B there can be different measures of what is the best route. That's why there's a need for different profiles.
 Because speeds vary on different types of roads, the shortest and the fastest route are typically different. But there are many other possible preferences. For example a user might prefer a bicycle route that follow parks or other green areas, even though both duration and distance are a bit longer.
 To handle this, OSRM doesn't simply choose the ways with the highest speed. Instead it uses the concepts of `weight` and `rate`. The rate is an abstract measure that you can assign to ways as you like to make some ways preferable to others. Routing will prefer ways with high rate.
 The weight of a way is normally computed as length / rate. The weight can be thought of as the resistance or cost when passing the way. Routing will prefer ways with low weight.
 You can also set the weight of a way to a fixed value. In this case it's not calculated based on the length or rate, and the rate is ignored.
 You should set the speed to your best estimate of the actual speed that will be used on a particular way. This will result in the best estimated travel times.
 If you want to prefer certain ways due to other factors than the speed, adjust the rate accordingly. If you adjust the speed, the time estimation will be skewed.
 If you set the same rate on all ways, the result will be shortest path routing.
 If you set rate = speed on all ways, the result will be fastest path routing.
 If you want to prioritize certain streets, increase the rate on these.
 ## Elements
 ### api_version
 A profile should set `api_version` at the top of your profile. This is done to ensure that older profiles are still supported when the api changes. If `api_version` is not defined, 0 will be assumed. The current api version is 4.
 ### Library files
 The folder [profiles/lib/](../profiles/lib/) contains LUA library files for handling many common processing tasks.
 File              | Notes
 ------------------|------------------------------
 way_handlers.lua  | Functions for processing way tags
 tags.lua          | Functions for general parsing of OSM tags
 set.lua           | Defines the Set helper for handling sets of values
 sequence.lua      | Defines the Sequence helper for handling sequences of values
 access.lua        | Function for finding relevant access tags
 destination.lua   | Function for finding relevant destination tags
 maxspeed.lua      | Function for determining maximum speed
 guidance.lua      | Function for processing guidance attributes
 They all return a table of functions when you use `require` to load them. You can either store this table and reference its functions later, or if you need only a single function you can store that directly.
 ### setup()
 The `setup` function is called once when the profile is loaded and must return a table of configurations. It's also where you can do other global setup, like loading data sources that are used during processing.
 Note that processing of data is parallelized and several unconnected LUA interpreters will be running at the same time. The `setup` function will be called once for each. Each LUA interpreter will have its own set of globals.
 The following global properties can be set under `properties` in the hash you return in the `setup` function:
 Attribute                            | Type     | Notes
 -------------------------------------|----------|----------------------------------------------------------------------------
 weight_name                          | String   | Name used in output for the routing weight property (default `'duration'`)
 weight_precision                     | Unsigned | Decimal precision of edge weights (default `1`)
 left_hand_driving                    | Boolean  | Are vehicles assumed to drive on the left? (used in guidance, default `false`)
 use_turn_restrictions                | Boolean  | Are turn restrictions followed? (default `false`)
 continue_straight_at_waypoint        | Boolean  | Must the route continue straight on at a via point, or are U-turns allowed? (default `true`)
 max_speed_for_map_matching           | Float    | Maximum vehicle speed to be assumed in matching (in m/s)
 max_turn_weight                      | Float    | Maximum turn penalty weight
 force_split_edges                    | Boolean  | True value forces a split of forward and backward edges of extracted ways and guarantees that `process_segment` will be called for all segments (default `false`)
 The following additional global properties can be set in the hash you return in the `setup` function:
 Attribute                            | Type             | Notes
 -------------------------------------|------------------|----------------------------------------------------------------------------
 excludable                           | Sequence of Sets | Determines which class-combinations are supported by the `exclude` option at query time. E.g. `Sequence{Set{"ferry", "motorway"}, Set{"motorway"}}` will allow you to exclude ferries and motorways, or only motorways.
 classes                              | Sequence         | Determines the allowed classes that can be referenced using `{forward,backward}_classes` on the way in the `process_way` function.
 restrictions                         | Sequence         | Determines which turn restrictions will be used for this profile.
 suffix_list                          | Set              | List of name suffixes needed for determining if "Highway 101 NW" the same road as "Highway 101 ES".
 relation_types                       | Sequence         | Determines which relations should be cached for processing in this profile. It contains relations types
 ### process_node(profile, node, result, relations)
 Process an OSM node to determine whether this node is a barrier or can be passed and whether passing it incurs a delay.
 Argument | Description
 ---------|-------------------------------------------------------
 profile  | The configuration table you returned in `setup`.
 node     | The input node to process (read-only).
 result   | The output that you will modify.
 relations| Storage of relations to access relations, where `node` is a member.
 The following attributes can be set on `result`:
 Attribute       | Type    | Notes
 ----------------|---------|---------------------------------------------------------
 barrier         | Boolean | Is it an impassable barrier?
 traffic_lights  | Boolean | Is it a traffic light (incurs delay in `process_turn`)?
 ### process_way(profile, way, result, relations)
 Given an OpenStreetMap way, the `process_way` function will either return nothing (meaning we are not going to route over this way at all), or it will set up a result hash.
 Argument | Description
 ---------|-------------------------------------------------------
 profile  | The configuration table you returned in `setup`.
 way      | The input way to process (read-only).
 result   | The output that you will modify.
 relations| Storage of relations to access relations, where `way` is a member.
 Importantly it will set `result.forward_mode` and `result.backward_mode` to indicate the travel mode in each direction, as well as set `result.forward_speed` and `result.backward_speed` to integer values representing the speed for traversing the way.
 It will also set a number of other attributes on `result`.
 Using the power of the scripting language you wouldn't typically see something as simple as a `result.forward_speed = 20` line within the `process_way` function. Instead `process_way` will examine the tag set on the way, process this information in various ways, calling other local functions and referencing the configuration in `profile`, etc., before arriving at the result.
 The following attributes can be set on the result in `process_way`:
 Attribute                               | Type     | Notes
 ----------------------------------------|----------|--------------------------------------------------------------------------
 forward_speed                           | Float    | Speed on this way in km/h. Mandatory.
 backward_speed                          | Float    |  ""
 forward_rate                            | Float    | Routing weight, expressed as meters/*weight* (e.g. for a fastest-route weighting, you would want this to be meters/second, so set it to forward_speed/3.6)
 backward_rate                           | Float    |  ""
 forward_mode                            | Enum     | Mode of travel (e.g. `car`, `ferry`). Mandatory. Defined in `include/extractor/travel_mode.hpp`.
 backward_mode                           | Enum     |  ""
 forward_classes                         | Table    | Mark this way as being of a specific class, e.g. `result.classes["toll"] = true`. This will be exposed in the API as `classes` on each `RouteStep`.
 backward_classes                        | Table    |  ""
 duration                                | Float    | Alternative setter for duration of the whole way in both directions
 weight                                  | Float    | Alternative setter for weight of the whole way in both directions
 turn_lanes_forward                      | String   | Directions for individual lanes (normalized OSM `turn:lanes` value)
 turn_lanes_backward                     | String   |  ""
 forward_restricted                      | Boolean  | Is this a restricted access road? (e.g. private, or deliveries only; used to enable high turn penalty, so that way is only chosen for start/end of route)
 backward_restricted                     | Boolean  |  ""
 is_startpoint                           | Boolean  | Can a journey start on this way? (e.g. ferry; if `false`, prevents snapping the start point to this way)
 roundabout                              | Boolean  | Is this part of a roundabout?
 circular                                | Boolean  | Is this part of a non-roundabout circular junction?
 name                                    | String   | Name of the way
 ref                                     | String   | Road number (equal to set `forward_ref` and `backward_ref` with one value)
 forward_ref                             | String   | Road number in forward way direction
 backward_ref                            | String   | Road number in backward way direction
 destinations                            | String   | The road's destinations
 exits                                   | String   | The ramp's exit numbers or names
 pronunciation                           | String   | Name pronunciation
 road_classification.motorway_class      | Boolean  | Guidance: way is a motorway
 road_classification.link_class          | Boolean  | Guidance: way is a slip/link road
 road_classification.road_priority_class | Enum     | Guidance: order in priority list. Defined in `include/extractor/road_classification.hpp`
 road_classification.may_be_ignored      | Boolean  | Guidance: way is non-highway
 road_classification.num_lanes           | Unsigned | Guidance: total number of lanes in way
 ### process_segment(profile, segment)
 The `process_segment` function is called for every segment of OSM ways. A segment is a straight line between two OSM nodes.
 On OpenStreetMap way cannot have different tags on different parts of a way. Instead you would split the way into several smaller ways. However many ways are long. For example, many ways pass hills without any change in tags.
 Processing each segment of an OSM way makes it possible to have different speeds on different parts of a way based on external data like data about elevation, pollution, noise or scenic value and adjust weight and duration of the segment accordingly.
 In the `process_segment` function you don't have access to OSM tags. Instead you use the geographical location of the start and end point of the way to look up information from another data source, like elevation data. See [rasterbot.lua](../profiles/rasterbot.lua) for an example.
 The following attributes can be read and set on the result in `process_segment`:
 Attribute          | Read/write? | Type    | Notes
 -------------------|-------------|---------|----------------------------------------
 source.lon         | Read        | Float   | Co-ordinates of segment start
 source.lat         | Read        | Float   |  ""
 target.lon         | Read        | Float   | Co-ordinates of segment end
 target.lat         | Read        | Float   |  ""
 distance           | Read        | Float   | Length of segment
 weight             | Read/write  | Float   | Routing weight for this segment
 duration           | Read/write  | Float   | Duration for this segment
 ### process_turn(profile, turn)
 The `process_turn` function is called for every possible turn in the network. Based on the angle and type of turn you assign the weight and duration of the movement.
 The following attributes can be read and set on the result in `process_turn`:
 Attribute                          | Read/write?   | Type                      | Notes
 ---------------------              | ------------- | ---------                 | ------------------------------------------------------
 angle                              | Read          | Float                     | Angle of turn in degrees (`[-179, 180]`: `0`=straight, `180`=u turn, `+x`=x degrees to the right, `-x`= x degrees to the left)
 number_of_roads                    | Read          | Integer                   | Number of ways at the intersection of the turn
 is_u_turn                          | Read          | Boolean                   | Is the turn a u-turn?
 has_traffic_light                  | Read          | Boolean                   | Is a traffic light present at this turn?
 is_left_hand_driving               | Read          | Boolean                   | Is left-hand traffic?
 source_restricted                  | Read          | Boolean                   | Is it from a restricted access road? (See definition in `process_way`)
 source_mode                        | Read          | Enum                      | Travel mode before the turn. Defined in `include/extractor/travel_mode.hpp`
 source_is_motorway                 | Read          | Boolean                   | Is the source road a motorway?
 source_is_link                     | Read          | Boolean                   | Is the source road a link?
 source_number_of_lanes             | Read          | Integer                   | How many lanes does the source road have? (default when not tagged: 0)
 source_highway_turn_classification | Read          | Integer                   | Classification based on highway tag defined by user during setup. (default when not set: 0, allowed classification values are: 0-15))
 source_access_turn_classification  | Read          | Integer                   | Classification based on access tag defined by user during setup. (default when not set: 0, allowed classification values are: 0-15))
 source_speed                       | Read          | Integer                   | Speed on this source road in km/h
 source_priority_class              | Read          | Enum                      | The type of road priority class of the source. Defined in `include/extractor/road_classification.hpp`
 target_restricted                  | Read          | Boolean                   | Is the target a restricted access road? (See definition in `process_way`)
 target_mode                        | Read          | Enum                      | Travel mode after the turn. Defined in `include/extractor/travel_mode.hpp`
 target_is_motorway                 | Read          | Boolean                   | Is the target road a motorway?
 target_is_link                     | Read          | Boolean                   | Is the target road a link?
 target_number_of_lanes             | Read          | Integer                   | How many lanes does the target road have? (default when not tagged: 0)
 target_highway_turn_classification | Read          | Integer                   | Classification based on highway tag defined by user during setup. (default when not set: 0, allowed classification values are: 0-15))
 target_access_turn_classification  | Read          | Integer                   | Classification based on access tag defined by user during setup. (default when not set: 0, allowed classification values are: 0-15))
 target_speed                       | Read          | Integer                   | Speed on this target road in km/h
 target_priority_class              | Read          | Enum                      | The type of road priority class of the target. Defined in `include/extractor/road_classification.hpp`
 roads_on_the_right                 | Read          | Vector<ExtractionTurnLeg> | Vector with information about other roads on the right of the turn that are also connected at the intersection
 roads_on_the_left                  | Read          | Vector<ExtractionTurnLeg> | Vector with information about other roads on the left of the turn that are also connected at the intersection. If turn is a u turn, this is empty.
 weight                             | Read/write    | Float                     | Penalty to be applied for this turn (routing weight)
 duration                           | Read/write    | Float                     | Penalty to be applied for this turn (duration in deciseconds)
 #### `roads_on_the_right` and `roads_on_the_left`
 The information of `roads_on_the_right` and `roads_on_the_left` that can be read are as follows:
 Attribute                   | Read/write?   | Type      | Notes
 ---------------------       | ------------- | --------- | ------------------------------------------------------
 is_restricted               | Read          | Boolean   | Is it a restricted access road? (See definition in `process_way`)
 mode                        | Read          | Enum      | Travel mode before the turn. Defined in `include/extractor/travel_mode.hpp`
 is_motorway                 | Read          | Boolean   | Is the road a motorway?
 is_link                     | Read          | Boolean   | Is the road a link?
 number_of_lanes             | Read          | Integer   | How many lanes does the road have? (default when not tagged: 0)
 highway_turn_classification | Read          | Integer   | Classification based on highway tag defined by user during setup. (default when not set: 0, allowed classification values are: 0-15)
 access_turn_classification  | Read          | Integer   | Classification based on access tag defined by user during setup. (default when not set: 0, allowed classification values are: 0-15)
 speed                       | Read          | Integer   | Speed on this road in km/h
 priority_class              | Read          | Enum      | The type of road priority class of the leg. Defined in `include/extractor/road_classification.hpp`
 is_incoming                 | Read          | Boolean   | Is the road an incoming road of the intersection
 is_outgoing                 | Read          | Boolean   | Is the road an outgoing road of the intersection
 The order of the roads in `roads_on_the_right` and `roads_on_the_left` are *counter clockwise*. If the turn is a u turn, all other connected roads will be in `roads_on_the_right`.
 **Example**
 ```
           c   e
           |  /
           | /
    a ---- x ---- b
          /|
         / |
        f  d
 ```
 When turning from `a` to `b` via `x`,
 * `roads_on_the_right[1]` is the road `xf`
 * `roads_on_the_right[2]` is the road `xd`
 * `roads_on_the_left[1]` is the road `xe`
 * `roads_on_the_left[2]` is the road `xc`
 Note that indices of arrays in lua are 1-based.
 #### `highway_turn_classification` and `access_turn_classification`
 When setting appropriate turn weights and duration, information about the highway and access tags of roads that are involved in the turn are necessary. The lua turn function `process_turn` does not have access to the original osrm tags anymore. However, `highway_turn_classification` and `access_turn_classification` can be set during setup. The classification set during setup can be later used in `process_turn`.
 **Example**
 In the following example we use `highway_turn_classification` to set the turn weight to `10` if the turn is on a highway and to `5` if the turn is on a primary.
 ```
 function setup()
  return {
    highway_turn_classification = {
      ['motorway'] = 2,
      ['primary'] = 1
    }
  }
 end
 function process_turn(profile, turn) {
  if turn.source_highway_turn_classification == 2 and turn.target_highway_turn_classification == 2 then
    turn.weight = 10
  end
  if turn.source_highway_turn_classification == 1 and turn.target_highway_turn_classification == 1 then
    turn.weight = 5
  end
 }
 ```
 ## Guidance
 The guidance parameters in profiles are currently a work in progress. They can and will change.
 Please be aware of this when using guidance configuration possibilities.
 ### Road Classification
 Guidance uses road classes to decide on when/if to emit specific instructions and to discover which road is obvious when following a route.
 Classification uses three flags and a priority-category.
-The flags indicate whether a road is a motorway (required for on/off ramps), a link type (the ramps itself, if also a motorway) and whether a road may be omitted in considerations (is considered purely for connectivity).
+The flags indicate whether a road is a motorway (required for on/off ramps), a link type (the ramps itself, if also a motorway) and whether a road may be omittted in considerations (is considered purely for connectivity).
 The priority-category influences the decision which road is considered the obvious choice and which roads can be seen as fork.
 Forks can be emitted between roads of similar priority category only. Obvious choices follow a major priority road, if the priority difference is large.
 ### Using raster data
 OSRM has built-in support for loading an interpolating raster data in ASCII format. This can be used e.g. for factoring in elevation when computing routes.
 Use `raster:load()` in your `setup` function to load data and store the source in your configuration hash:
 ```lua
 function setup()
  return {
    raster_source = raster:load(
      "rastersource.asc",  -- file to load
      0,    -- longitude min
      0.1,  -- longitude max
      0,    -- latitude min
      0.1,  -- latitude max
      5,    -- number of rows
      4     -- number of columns
    )
  }
 end
 ```
 The input data must an ASCII file with rows of integers. e.g.:
 ```
 0  0  0   0
 0  0  0   250
 0  0  250 500
 0  0  0   250
 0  0  0   0
 ```
 In your `segment_function` you can then access the raster source and use `raster:query()` to query to find the nearest data point, or `raster:interpolate()` to interpolate a value based on nearby data points.
 You must check whether the result is valid before using it.
 Example:
 ```lua
 function process_segment (profile, segment)
  local sourceData = raster:query(profile.raster_source, segment.source.lon, segment.source.lat)
  local targetData = raster:query(profile.raster_source, segment.target.lon, segment.target.lat)
  local invalid = sourceData.invalid_data()
  if sourceData.datum ~= invalid and targetData.datum ~= invalid then
      -- use values to adjust weight and duration
    [...]
 end
 ```
 See [rasterbot.lua](../profiles/rasterbot.lua) and [rasterbotinterp.lua](../profiles/rasterbotinterp.lua) for examples.
 ### Helper functions
 There are a few helper functions defined in the global scope that profiles can use:
 - `durationIsValid`
 - `parseDuration`
 - `trimLaneString`
 - `applyAccessTokens`
 - `canonicalizeStringList`
--- a/docs/releasing.md
+++ b/docs/releasing.md
@ -32,28 +32,21 @@ We may introduce forward-compatible changes: query parameters and response prope
 - The `master` branch is for the bleeding edge development
 - We create and maintain release branches `x.y` to control the release flow
- We create the release branch once we create release branches once we want to release the first RC
+- We create the release branch once we tagged the final version `x.y.0` version, RCs go on master
 - RCs go in the release branch, commits needs to be cherry-picked from master
 - No minor or major version will be released without a code-equal release candidates
- For quality assurance, release candidates need to be staged beforing tagging a final release
+- For quality assurance, release candidates will be run on the demo server for 24 hours before releaseing the version proper
 - Patch versions may be released without a release candidate
 - We may backport fixes to older versions and release them as patch versions
 ## Releasing a version
 1. Check out the appropriate release branch `x.y`
-2. Make sure `CHANGELOG.md` is up to date.
+2. Make sure all tests are passing (e.g. Travis CI gives you a :thumbs_up:)
-3. Make sure the `package.json` on branch `x.y` has been committed.
+3. Make sure `CHANGELOG.md` is up to date.
-4. Make sure all tests are passing (e.g. Github Actions CI gives you a :heavy_check_mark:)
+4. Make sure the OSRM version in `CMakeLists.txt` is up to date
-5. Use an annotated tag to mark the release: `git tag vx.y.z -a` Body of the tag description should be the changelog entries. Commit should be one in which the `package.json` version matches the version you want to release.
+5. Use an annotated tag to mark the release: `git tag vx.y.z -a` Body of the tag description should be the changelog entries.
-6. Use `npm run docs` to generate the API documentation.  Copy `build/docs/*` to `https://github.com/Project-OSRM/project-osrm.github.com` in the `docs/vN.N.N/api` directory
+6. Use `npm run build-api-docs` to generate the API documentation.  Copy `build/docs/*` to `https://github.com/Project-OSRM/project-osrm.github.com` in the `docs/vN.N.N/api` directory
-7. Push tags and commits: `git push; git push --tags`
+6. Push tags and commits: `git push; git push --tags`
-8. On https://github.com/Project-OSRM/osrm-backend/releases press `Draft a new release`,
+8. Proceede with the `node-osrm` release as [outlined in the repository](https://github.com/Project-OSRM/node-osrm/blob/master/docs/releasing.md).
   write the release tag `vx.y.z` in the `Tag version` field, write the changelog entries in the `Describe this release` field
   and press `Publish release`. Note that Github Actions CI deployments will create a release when publishing node binaries, so the release
   may already exist. In which case the description should be updated with the changelog entries.
 9. If not a release-candidate: Write a mailing-list post to osrm-talk@openstreetmap.org to announce the release
-10. Wait until the Github Actions build has been completed and check if the node binaries were published by doing:
+
    `rm -rf node_modules && npm install` locally.
 11. For final releases run `npm publish` or `npm publish --tag next` for release candidates.
 12. Bump version in `package.json` to `{MAJOR}.{MINOR+1}.0-unreleased` on the `master` branch after the release.
--- a/docs/testing.md
+++ b/docs/testing.md
@ -28,23 +28,6 @@ This dataset is a small extract and may not even contain all tags or edge cases.
 Furthermore this dataset is not in sync with what you see in up-to-date OSM maps or on the demo server.
 See the library tests for how to add new dataset dependent tests.
 To prepare the test data simply `cd test/data/` and then run `make`.
 ### Running Tests
 To build the unit tests:
 ```
 cd build
 cmake ..
 make tests
 ```
 You should see the compiled binaries in `build/unit_tests`, you can then run each suite individually:
 ```
 ./engine-tests
 ```
 ## Cucumber
@ -300,7 +283,7 @@ And the relations
 The setting looks perfectly fine at first glance. However, it is not well defined.
 The forbidden right turn could be either a superfluous addition, forbidding the turn `cb` to `be`, or actually refer to the turn `ab` to `bd` to say that a turn is forbidden here.
-To model turn-restrictions correctly and uniquely, we need to split segments that contribute to the restriction into the smallest possible parts.
+To model turn-restrictions correctly and unique, we need to split segments that contribute to the restriction into the smallest possible parts.
 E.g. the above scenario could correctly be expressed as:
 ```
@ -360,7 +343,7 @@ When I route I should get
 And the test reports `turn right` for the route `a->e`, where before it said `slight right`.
-If you change the turn angles, obviously you can expect changes in the distinction between `slight right` and `right`.
+If you changed the turn angles, obviously you can expect changes in the distinction between `slight right` and `right`.
 In such a case it is, of course, reasonable to change the expected route to report `right` instead of `slight right`. You should consider inspecting the actual turn angles at `b` to see if you feel that change is justified.
 However, you should never adjust the test itself.
@ -390,9 +373,9 @@ In this case we would see a very slight turn angle. If your change now reports d
 ### Consider Post-Processing Impacts
-Some changes you might see could look completely unrelated. To understand the impact of your changes, you can make use of the debugging utilities you can find in `util/debug.hpp` (and potentially other related headers).
+Some changes you might see could look completely unrelated. To understand the impact of your changes, you can make use of the debugging utilities you can finde in `util/debug.hpp` (and potentially other related headers).
-If your test is inspecting a series of turns (remember, a turn does not necessarily equals an instruction), you could see interaction with post-processing.
+If your test is inspecting a series of turns (remember, a turn not necessarily equals an instruction), you could see interaction with post-processing.
 To see the unprocessed turns, you should print the steps at the end of step assembly (`assembleSteps` in `engine/guidance/assemble_steps.hpp`).
 If you see unexpected changes, you can consider adding the `locations` field to your test to study what location a turn is reported at.
--- a/docs/windows-deps.md
+++ b/docs/windows-deps.md
@ -1,31 +0,0 @@
 # Building OSRM for Windows
 There is experimental support for building OSRM on Windows.
 ## Dependencies
 You will need a modern Windows development stack (e.g. Visual Studio 17). The published binaries are built with
 [Windows Server 2022](https://github.com/actions/runner-images/blob/main/images/win/Windows2022-Readme.md) Github hosted runners.
 Dependencies are managed via [Conan](https://conan.io/) and built with [CMake](https://cmake.org/).
 ## Building
 ```bat
 cmake -DENABLE_CONAN=ON -DENABLE_NODE_BINDINGS=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "Visual Studio 17 2022" ..
 msbuild OSRM.sln ^
 /p:Configuration=%CONFIGURATION% ^
 /p:Platform=x64 ^
 /t:rebuild ^
 /p:BuildInParallel=true ^
 /m:%NUMBER_OF_PROCESSORS% ^
 /toolsversion:Current ^
 /clp:Verbosity=normal ^
 /nologo
 ```
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 2.8.8)
 if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR AND NOT MSVC_IDE)
  message(FATAL_ERROR "In-source builds are not allowed.
@ -12,18 +12,20 @@ endif()
 project(osrm-example C CXX)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set(bitness 32)
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
  set(bitness 64)
  message(STATUS "Building on a 64 bit system")
 else()
  message(STATUS "Building on a 32 bit system")
 endif()
 if(WIN32 AND MSVC_VERSION LESS 1900)
  message(FATAL_ERROR "Building with Microsoft compiler needs Latest Visual Studio 2015 (Community or better)")
 endif()
 link_directories(${LibOSRM_LIBRARY_DIRS})
 add_executable(osrm-example example.cpp)
--- a/example/cmake/FindTBB.cmake
+++ b/example/cmake/FindTBB.cmake
@ -1 +0,0 @@
 ../../cmake/FindTBB.cmake
--- a/example/cmake/FindTBB.cmake
+++ b/example/cmake/FindTBB.cmake
@ -0,0 +1,283 @@
 # Locate Intel Threading Building Blocks include paths and libraries
 # FindTBB.cmake can be found at https://code.google.com/p/findtbb/
 # Written by Hannes Hofmann <hannes.hofmann _at_ informatik.uni-erlangen.de>
 # Improvements by Gino van den Bergen <gino _at_ dtecta.com>,
 #   Florian Uhlig <F.Uhlig _at_ gsi.de>,
 #   Jiri Marsik <jiri.marsik89 _at_ gmail.com>
 # The MIT License
 #
 # Copyright (c) 2011 Hannes Hofmann
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
 # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 # copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 # GvdB: This module uses the environment variable TBB_ARCH_PLATFORM which defines architecture and compiler.
 #   e.g. "ia32/vc8" or "em64t/cc4.1.0_libc2.4_kernel2.6.16.21"
 #   TBB_ARCH_PLATFORM is set by the build script tbbvars[.bat|.sh|.csh], which can be found
 #   in the TBB installation directory (TBB_INSTALL_DIR).
 #
 # GvdB: Mac OS X distribution places libraries directly in lib directory.
 #
 # For backwards compatibility, you may explicitely set the CMake variables TBB_ARCHITECTURE and TBB_COMPILER.
 # TBB_ARCHITECTURE [ ia32 | em64t | itanium ]
 #   which architecture to use
 # TBB_COMPILER e.g. vc9 or cc3.2.3_libc2.3.2_kernel2.4.21 or cc4.0.1_os10.4.9
 #   which compiler to use (detected automatically on Windows)
 # This module respects
 # TBB_INSTALL_DIR or $ENV{TBB21_INSTALL_DIR} or $ENV{TBB_INSTALL_DIR}
 # This module defines
 # TBB_INCLUDE_DIRS, where to find task_scheduler_init.h, etc.
 # TBB_LIBRARY_DIRS, where to find libtbb, libtbbmalloc
 # TBB_DEBUG_LIBRARY_DIRS, where to find libtbb_debug, libtbbmalloc_debug
 # TBB_INSTALL_DIR, the base TBB install directory
 # TBB_LIBRARIES, the libraries to link against to use TBB.
 # TBB_DEBUG_LIBRARIES, the libraries to link against to use TBB with debug symbols.
 # TBB_FOUND, If false, don't try to use TBB.
 # TBB_INTERFACE_VERSION, as defined in tbb/tbb_stddef.h
 if (WIN32)
    # has em64t/vc8 em64t/vc9
    # has ia32/vc7.1 ia32/vc8 ia32/vc9
    set(_TBB_DEFAULT_INSTALL_DIR "C:/Program Files/Intel/TBB" "C:/Program Files (x86)/Intel/TBB")
    set(_TBB_LIB_NAME "tbb")
    set(_TBB_LIB_MALLOC_NAME "${_TBB_LIB_NAME}malloc")
    set(_TBB_LIB_DEBUG_NAME "${_TBB_LIB_NAME}_debug")
    set(_TBB_LIB_MALLOC_DEBUG_NAME "${_TBB_LIB_MALLOC_NAME}_debug")
    if (MSVC71)
        set (_TBB_COMPILER "vc7.1")
    endif(MSVC71)
    if (MSVC80)
        set(_TBB_COMPILER "vc8")
    endif(MSVC80)
    if (MSVC90)
        set(_TBB_COMPILER "vc9")
    endif(MSVC90)
    if(MSVC10)
        set(_TBB_COMPILER "vc10")
    endif(MSVC10)
    # Todo: add other Windows compilers such as ICL.
    set(_TBB_ARCHITECTURE ${TBB_ARCHITECTURE})
 endif (WIN32)
 if (UNIX)
    if (APPLE)
        # MAC
        set(_TBB_DEFAULT_INSTALL_DIR "/Library/Frameworks/Intel_TBB.framework/Versions")
        # libs: libtbb.dylib, libtbbmalloc.dylib, *_debug
        set(_TBB_LIB_NAME "tbb")
        set(_TBB_LIB_MALLOC_NAME "${_TBB_LIB_NAME}malloc")
        set(_TBB_LIB_DEBUG_NAME "${_TBB_LIB_NAME}_debug")
        set(_TBB_LIB_MALLOC_DEBUG_NAME "${_TBB_LIB_MALLOC_NAME}_debug")
        # default flavor on apple: ia32/cc4.0.1_os10.4.9
        # Jiri: There is no reason to presume there is only one flavor and
        #       that user's setting of variables should be ignored.
        if(NOT TBB_COMPILER)
            set(_TBB_COMPILER "cc4.0.1_os10.4.9")
        elseif (NOT TBB_COMPILER)
            set(_TBB_COMPILER ${TBB_COMPILER})
        endif(NOT TBB_COMPILER)
        if(NOT TBB_ARCHITECTURE)
            set(_TBB_ARCHITECTURE "ia32")
        elseif(NOT TBB_ARCHITECTURE)
            set(_TBB_ARCHITECTURE ${TBB_ARCHITECTURE})
        endif(NOT TBB_ARCHITECTURE)
    else (APPLE)
        # LINUX
        set(_TBB_DEFAULT_INSTALL_DIR "/opt/intel/tbb" "/usr/local/include" "/usr/include")
        set(_TBB_LIB_NAME "tbb")
        set(_TBB_LIB_MALLOC_NAME "${_TBB_LIB_NAME}malloc")
        set(_TBB_LIB_DEBUG_NAME "${_TBB_LIB_NAME}_debug")
        set(_TBB_LIB_MALLOC_DEBUG_NAME "${_TBB_LIB_MALLOC_NAME}_debug")
        # has em64t/cc3.2.3_libc2.3.2_kernel2.4.21 em64t/cc3.3.3_libc2.3.3_kernel2.6.5 em64t/cc3.4.3_libc2.3.4_kernel2.6.9 em64t/cc4.1.0_libc2.4_kernel2.6.16.21
        # has ia32/*
        # has itanium/*
        set(_TBB_COMPILER ${TBB_COMPILER})
        set(_TBB_ARCHITECTURE ${TBB_ARCHITECTURE})
    endif (APPLE)
 endif (UNIX)
 if (CMAKE_SYSTEM MATCHES "SunOS.*")
 # SUN
 # not yet supported
 # has em64t/cc3.4.3_kernel5.10
 # has ia32/*
 endif (CMAKE_SYSTEM MATCHES "SunOS.*")
 #-- Clear the public variables
 set (TBB_FOUND "NO")
 #-- Find TBB install dir and set ${_TBB_INSTALL_DIR} and cached ${TBB_INSTALL_DIR}
 # first: use CMake variable TBB_INSTALL_DIR
 if (TBB_INSTALL_DIR)
    set (_TBB_INSTALL_DIR ${TBB_INSTALL_DIR})
 endif (TBB_INSTALL_DIR)
 # second: use environment variable
 if (NOT _TBB_INSTALL_DIR)
    if (NOT "$ENV{TBB_INSTALL_DIR}" STREQUAL "")
        set (_TBB_INSTALL_DIR $ENV{TBB_INSTALL_DIR})
    endif (NOT "$ENV{TBB_INSTALL_DIR}" STREQUAL "")
    # Intel recommends setting TBB21_INSTALL_DIR
    if (NOT "$ENV{TBB21_INSTALL_DIR}" STREQUAL "")
        set (_TBB_INSTALL_DIR $ENV{TBB21_INSTALL_DIR})
    endif (NOT "$ENV{TBB21_INSTALL_DIR}" STREQUAL "")
    if (NOT "$ENV{TBB22_INSTALL_DIR}" STREQUAL "")
        set (_TBB_INSTALL_DIR $ENV{TBB22_INSTALL_DIR})
    endif (NOT "$ENV{TBB22_INSTALL_DIR}" STREQUAL "")
    if (NOT "$ENV{TBB30_INSTALL_DIR}" STREQUAL "")
        set (_TBB_INSTALL_DIR $ENV{TBB30_INSTALL_DIR})
    endif (NOT "$ENV{TBB30_INSTALL_DIR}" STREQUAL "")
 endif (NOT _TBB_INSTALL_DIR)
 # third: try to find path automatically
 if (NOT _TBB_INSTALL_DIR)
    if (_TBB_DEFAULT_INSTALL_DIR)
        set (_TBB_INSTALL_DIR ${_TBB_DEFAULT_INSTALL_DIR})
    endif (_TBB_DEFAULT_INSTALL_DIR)
 endif (NOT _TBB_INSTALL_DIR)
 # sanity check
 if (NOT _TBB_INSTALL_DIR)
    message ("ERROR: Unable to find Intel TBB install directory. ${_TBB_INSTALL_DIR}")
 else (NOT _TBB_INSTALL_DIR)
 # finally: set the cached CMake variable TBB_INSTALL_DIR
 if (NOT TBB_INSTALL_DIR)
    set (TBB_INSTALL_DIR ${_TBB_INSTALL_DIR} CACHE PATH "Intel TBB install directory")
    mark_as_advanced(TBB_INSTALL_DIR)
 endif (NOT TBB_INSTALL_DIR)
 #-- A macro to rewrite the paths of the library. This is necessary, because
 #   find_library() always found the em64t/vc9 version of the TBB libs
 macro(TBB_CORRECT_LIB_DIR var_name)
 #    if (NOT "${_TBB_ARCHITECTURE}" STREQUAL "em64t")
        string(REPLACE em64t "${_TBB_ARCHITECTURE}" ${var_name} ${${var_name}})
 #    endif (NOT "${_TBB_ARCHITECTURE}" STREQUAL "em64t")
    string(REPLACE ia32 "${_TBB_ARCHITECTURE}" ${var_name} ${${var_name}})
    string(REPLACE vc7.1 "${_TBB_COMPILER}" ${var_name} ${${var_name}})
    string(REPLACE vc8 "${_TBB_COMPILER}" ${var_name} ${${var_name}})
    string(REPLACE vc9 "${_TBB_COMPILER}" ${var_name} ${${var_name}})
    string(REPLACE vc10 "${_TBB_COMPILER}" ${var_name} ${${var_name}})
 endmacro(TBB_CORRECT_LIB_DIR var_content)
 #-- Look for include directory and set ${TBB_INCLUDE_DIR}
 set (TBB_INC_SEARCH_DIR ${_TBB_INSTALL_DIR}/include)
 # Jiri: tbbvars now sets the CPATH environment variable to the directory
 #       containing the headers.
 find_path(TBB_INCLUDE_DIR
    tbb/task_scheduler_init.h
    PATHS ${TBB_INC_SEARCH_DIR} ENV CPATH
 )
 mark_as_advanced(TBB_INCLUDE_DIR)
 #-- Look for libraries
 # GvdB: $ENV{TBB_ARCH_PLATFORM} is set by the build script tbbvars[.bat|.sh|.csh]
 if (NOT $ENV{TBB_ARCH_PLATFORM} STREQUAL "")
    set (_TBB_LIBRARY_DIR 
         ${_TBB_INSTALL_DIR}/lib/$ENV{TBB_ARCH_PLATFORM}
         ${_TBB_INSTALL_DIR}/$ENV{TBB_ARCH_PLATFORM}/lib
        )
 endif (NOT $ENV{TBB_ARCH_PLATFORM} STREQUAL "")
 # Jiri: This block isn't mutually exclusive with the previous one
 #       (hence no else), instead I test if the user really specified
 #       the variables in question.
 if ((NOT ${TBB_ARCHITECTURE} STREQUAL "") AND (NOT ${TBB_COMPILER} STREQUAL ""))
    # HH: deprecated
    message(STATUS "[Warning] FindTBB.cmake: The use of TBB_ARCHITECTURE and TBB_COMPILER is deprecated and may not be supported in future versions. Please set \$ENV{TBB_ARCH_PLATFORM} (using tbbvars.[bat|csh|sh]).")
    # Jiri: It doesn't hurt to look in more places, so I store the hints from
    #       ENV{TBB_ARCH_PLATFORM} and the TBB_ARCHITECTURE and TBB_COMPILER
    #       variables and search them both.
    set (_TBB_LIBRARY_DIR "${_TBB_INSTALL_DIR}/${_TBB_ARCHITECTURE}/${_TBB_COMPILER}/lib" ${_TBB_LIBRARY_DIR})
 endif ((NOT ${TBB_ARCHITECTURE} STREQUAL "") AND (NOT ${TBB_COMPILER} STREQUAL ""))
 # GvdB: Mac OS X distribution places libraries directly in lib directory.
 list(APPEND _TBB_LIBRARY_DIR ${_TBB_INSTALL_DIR}/lib)
 # Jiri: No reason not to check the default paths. From recent versions,
 #       tbbvars has started exporting the LIBRARY_PATH and LD_LIBRARY_PATH
 #       variables, which now point to the directories of the lib files.
 #       It all makes more sense to use the ${_TBB_LIBRARY_DIR} as a HINTS
 #       argument instead of the implicit PATHS as it isn't hard-coded
 #       but computed by system introspection. Searching the LIBRARY_PATH
 #       and LD_LIBRARY_PATH environment variables is now even more important
 #       that tbbvars doesn't export TBB_ARCH_PLATFORM and it facilitates
 #       the use of TBB built from sources.
 find_library(TBB_LIBRARY ${_TBB_LIB_NAME} HINTS ${_TBB_LIBRARY_DIR}
        PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
 find_library(TBB_MALLOC_LIBRARY ${_TBB_LIB_MALLOC_NAME} HINTS ${_TBB_LIBRARY_DIR}
        PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
 #Extract path from TBB_LIBRARY name
 get_filename_component(TBB_LIBRARY_DIR ${TBB_LIBRARY} PATH)
 #TBB_CORRECT_LIB_DIR(TBB_LIBRARY)
 #TBB_CORRECT_LIB_DIR(TBB_MALLOC_LIBRARY)
 mark_as_advanced(TBB_LIBRARY TBB_MALLOC_LIBRARY)
 #-- Look for debug libraries
 # Jiri: Changed the same way as for the release libraries.
 find_library(TBB_LIBRARY_DEBUG ${_TBB_LIB_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}
        PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
 find_library(TBB_MALLOC_LIBRARY_DEBUG ${_TBB_LIB_MALLOC_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}
        PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
 # Jiri: Self-built TBB stores the debug libraries in a separate directory.
 #       Extract path from TBB_LIBRARY_DEBUG name
 get_filename_component(TBB_LIBRARY_DEBUG_DIR ${TBB_LIBRARY_DEBUG} PATH)
 #TBB_CORRECT_LIB_DIR(TBB_LIBRARY_DEBUG)
 #TBB_CORRECT_LIB_DIR(TBB_MALLOC_LIBRARY_DEBUG)
 mark_as_advanced(TBB_LIBRARY_DEBUG TBB_MALLOC_LIBRARY_DEBUG)
 if (TBB_INCLUDE_DIR)
    if (TBB_LIBRARY)
        set (TBB_FOUND "YES")
        set (TBB_LIBRARIES ${TBB_LIBRARY} ${TBB_MALLOC_LIBRARY} ${TBB_LIBRARIES})
        set (TBB_DEBUG_LIBRARIES ${TBB_LIBRARY_DEBUG} ${TBB_MALLOC_LIBRARY_DEBUG} ${TBB_DEBUG_LIBRARIES})
        set (TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR} CACHE PATH "TBB include directory" FORCE)
        set (TBB_LIBRARY_DIRS ${TBB_LIBRARY_DIR} CACHE PATH "TBB library directory" FORCE)
        # Jiri: Self-built TBB stores the debug libraries in a separate directory.
        set (TBB_DEBUG_LIBRARY_DIRS ${TBB_LIBRARY_DEBUG_DIR} CACHE PATH "TBB debug library directory" FORCE)
        mark_as_advanced(TBB_INCLUDE_DIRS TBB_LIBRARY_DIRS TBB_DEBUG_LIBRARY_DIRS TBB_LIBRARIES TBB_DEBUG_LIBRARIES)
        message(STATUS "Found Intel TBB")
    endif (TBB_LIBRARY)
 endif (TBB_INCLUDE_DIR)
 if (NOT TBB_FOUND)
    message("ERROR: Intel TBB NOT found!")
    message(STATUS "Looked for Threading Building Blocks in ${_TBB_INSTALL_DIR}")
    # do only throw fatal, if this pkg is REQUIRED
    if (TBB_FIND_REQUIRED)
        message(FATAL_ERROR "Could NOT find TBB library.")
    endif (TBB_FIND_REQUIRED)
 endif (NOT TBB_FOUND)
 endif (NOT _TBB_INSTALL_DIR)
 if (TBB_FOUND)
 	set(TBB_INTERFACE_VERSION 0)
 	FILE(READ "${TBB_INCLUDE_DIRS}/tbb/tbb_stddef.h" _TBB_VERSION_CONTENTS)
 	STRING(REGEX REPLACE ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1" TBB_INTERFACE_VERSION "${_TBB_VERSION_CONTENTS}")
 	set(TBB_INTERFACE_VERSION "${TBB_INTERFACE_VERSION}")
 endif (TBB_FOUND)
--- a/example/example.cpp
+++ b/example/example.cpp
@ -30,17 +30,9 @@ int main(int argc, const char *argv[])
    // Configure based on a .osrm base path, and no datasets in shared mem from osrm-datastore
    EngineConfig config;
    config.storage_config = {argv[1]};
    config.use_shared_memory = false;
    // We support two routing speed up techniques:
    // - Contraction Hierarchies (CH): requires extract+contract pre-processing
    // - Multi-Level Dijkstra (MLD): requires extract+partition+customize pre-processing
    //
    // config.algorithm = EngineConfig::Algorithm::CH;
    config.algorithm = EngineConfig::Algorithm::MLD;
    // Routing machine with several services (such as Route, Table, Nearest, Trip, Match)
    const OSRM osrm{config};
@ -52,23 +44,22 @@ int main(int argc, const char *argv[])
    params.coordinates.push_back({util::FloatLongitude{7.419505}, util::FloatLatitude{43.736825}});
    // Response is in JSON format
-    engine::api::ResultT result = json::Object();
+    json::Object result;
    // Execute routing request, this does the heavy lifting
    const auto status = osrm.Route(params, result);
    auto &json_result = std::get<json::Object>(result);
    if (status == Status::Ok)
    {
-        auto &routes = std::get<json::Array>(json_result.values["routes"]);
+        auto &routes = result.values["routes"].get<json::Array>();
        // Let's just use the first route
-        auto &route = std::get<json::Object>(routes.values.at(0));
+        auto &route = routes.values.at(0).get<json::Object>();
-        const auto distance = std::get<json::Number>(route.values["distance"]).value;
+        const auto distance = route.values["distance"].get<json::Number>().value;
-        const auto duration = std::get<json::Number>(route.values["duration"]).value;
+        const auto duration = route.values["duration"].get<json::Number>().value;
-        // Warn users if extract does not contain the default coordinates from above
+        // Warn users if extract does not contain the default Berlin coordinates from above
-        if (distance == 0 || duration == 0)
+        if (distance == 0 or duration == 0)
        {
            std::cout << "Note: distance or duration is zero. ";
            std::cout << "You are probably doing a query outside of the OSM extract.\n\n";
@ -80,8 +71,8 @@ int main(int argc, const char *argv[])
    }
    else if (status == Status::Error)
    {
-        const auto code = std::get<json::String>(json_result.values["code"]).value;
+        const auto code = result.values["code"].get<json::String>().value;
-        const auto message = std::get<json::String>(json_result.values["message"]).value;
+        const auto message = result.values["message"].get<json::String>().value;
        std::cout << "Code: " << code << "\n";
        std::cout << "Message: " << code << "\n";
--- a/example/example.js
+++ b/example/example.js
@ -1,32 +0,0 @@
 process.env.UV_THREADPOOL_SIZE = Math.ceil(require('os').cpus().length * 1.5);
 var express = require('express');
 var OSRM = require('..');
 var path = require('path');
 var app = express();
 var osrm = new OSRM(path.join(__dirname,"../test/data/ch/monaco.osrm"));
 // Accepts a query like:
 // http://localhost:8888?start=13.414307,52.521835&end=13.402290,52.523728
 app.get('/', function(req, res) {
    if (!req.query.start || !req.query.end) {
        return res.json({"error":"invalid start and end query"});
    }
    var coordinates = [];
    var start = req.query.start.split(',');
    coordinates.push([+start[0],+start[1]]);
    var end = req.query.end.split(',');
    coordinates.push([+end[0],+end[1]]);
    var query = {
        coordinates: coordinates,
        alternateRoute: req.query.alternatives !== 'false'
    };
    osrm.route(query, function(err, result) {
        if (err) return res.json({"error":err.message});
        return res.json(result);
    });
 });
 console.log('Listening on port: ' + 8888);
 app.listen(8888);
--- a/features/bicycle/access.feature
+++ b/features/bicycle/access.feature
@ -7,180 +7,193 @@ Feature: Bike - Access tags on ways
    Scenario: Bike - Access tag hierarchy on ways
        Then routability should be
-            | highway | access | vehicle | bicycle | bothw   |
+            | highway | access | vehicle | bicycle | bothw |
-            | primary |        |         |         | cycling |
+            |         |        |         |         | x     |
-            | primary | yes    |         |         | cycling |
+            |         | yes    |         |         | x     |
-            | primary | no     |         |         |         |
+            |         | no     |         |         |       |
-            | primary |        | yes     |         | cycling |
+            |         |        | yes     |         | x     |
-            | primary |        | no      |         |         |
+            |         |        | no      |         |       |
-            | primary | no     | yes     |         | cycling |
+            |         | no     | yes     |         | x     |
-            | primary | yes    | no      |         |         |
+            |         | yes    | no      |         |       |
-            | primary |        |         | yes     | cycling |
+            |         |        |         | yes     | x     |
-            | primary |        |         | no      |         |
+            |         |        |         | no      |       |
-            | primary | no     |         | yes     | cycling |
+            |         | no     |         | yes     | x     |
-            | primary | yes    |         | no      |         |
+            |         | yes    |         | no      |       |
-            | primary |        | no      | yes     | cycling |
+            |         |        | no      | yes     | x     |
-            | primary |        | yes     | no      |         |
+            |         |        | yes     | no      |       |
            | runway  |        |         |         |       |
            | runway  | yes    |         |         | x     |
            | runway  | no     |         |         |       |
            | runway  |        | yes     |         | x     |
            | runway  |        | no      |         |       |
            | runway  | no     | yes     |         | x     |
            | runway  | yes    | no      |         |       |
            | runway  |        |         | yes     | x     |
            | runway  |        |         | no      |       |
            | runway  | no     |         | yes     | x     |
            | runway  | yes    |         | no      |       |
            | runway  |        | no      | yes     | x     |
            | runway  |        | yes     | no      |       |
    @todo
    Scenario: Bike - Access tag in forward direction
        Then routability should be
-            | highway | access:forward | vehicle:forward | bicycle:forward | forw    | backw |
+            | highway | access:forward | vehicle:forward | bicycle:forward | forw | backw |
-            | primary |                |                 |                 | cycling |       |
+            |         |                |                 |                 | x    |       |
-            | primary | yes            |                 |                 | cycling |       |
+            |         | yes            |                 |                 | x    |       |
-            | primary | no             |                 |                 |         |       |
+            |         | no             |                 |                 |      |       |
-            | primary |                | yes             |                 | cycling |       |
+            |         |                | yes             |                 | x    |       |
-            | primary |                | no              |                 |         |       |
+            |         |                | no              |                 |      |       |
-            | primary | no             | yes             |                 | cycling |       |
+            |         | no             | yes             |                 | x    |       |
-            | primary | yes            | no              |                 |         |       |
+            |         | yes            | no              |                 |      |       |
-            | primary |                |                 | yes             | cycling |       |
+            |         |                |                 | yes             | x    |       |
-            | primary |                |                 | no              |         |       |
+            |         |                |                 | no              |      |       |
-            | primary | no             |                 | yes             | cycling |       |
+            |         | no             |                 | yes             | x    |       |
-            | primary | yes            |                 | no              |         |       |
+            |         | yes            |                 | no              |      |       |
-            | primary |                | no              | yes             | cycling |       |
+            |         |                | no              | yes             | x    |       |
-            | primary |                | yes             | no              |         |       |
+            |         |                | yes             | no              |      |       |
-            | runway  |                |                 |                 | cycling |       |
+            | runway  |                |                 |                 | x    |       |
-            | runway  | yes            |                 |                 | cycling |       |
+            | runway  | yes            |                 |                 | x    |       |
-            | runway  | no             |                 |                 |         |       |
+            | runway  | no             |                 |                 |      |       |
-            | runway  |                | yes             |                 | cycling |       |
+            | runway  |                | yes             |                 | x    |       |
-            | runway  |                | no              |                 |         |       |
+            | runway  |                | no              |                 |      |       |
-            | runway  | no             | yes             |                 | cycling |       |
+            | runway  | no             | yes             |                 | x    |       |
-            | runway  | yes            | no              |                 |         |       |
+            | runway  | yes            | no              |                 |      |       |
-            | runway  |                |                 | yes             | cycling |       |
+            | runway  |                |                 | yes             | x    |       |
-            | runway  |                |                 | no              |         |       |
+            | runway  |                |                 | no              |      |       |
-            | runway  | no             |                 | yes             | cycling |       |
+            | runway  | no             |                 | yes             | x    |       |
-            | runway  | yes            |                 | no              |         |       |
+            | runway  | yes            |                 | no              |      |       |
-            | runway  |                | no              | yes             | cycling |       |
+            | runway  |                | no              | yes             | x    |       |
-            | runway  |                | yes             | no              |         |       |
+            | runway  |                | yes             | no              |      |       |
    @todo
    Scenario: Bike - Access tag in backward direction
        Then routability should be
-            | highway | access:forward | vehicle:forward | bicycle:forward | forw | backw   |
+            | highway | access:forward | vehicle:forward | bicycle:forward | forw | backw |
-            | primary |                |                 |                 |      | cycling |
+            |         |                |                 |                 |      | x     |
-            | primary | yes            |                 |                 |      | cycling |
+            |         | yes            |                 |                 |      | x     |
-            | primary | no             |                 |                 |      |         |
+            |         | no             |                 |                 |      |       |
-            | primary |                | yes             |                 |      | cycling |
+            |         |                | yes             |                 |      | x     |
-            | primary |                | no              |                 |      |         |
+            |         |                | no              |                 |      |       |
-            | primary | no             | yes             |                 |      | cycling |
+            |         | no             | yes             |                 |      | x     |
-            | primary | yes            | no              |                 |      |         |
+            |         | yes            | no              |                 |      |       |
-            | primary |                |                 | yes             |      | cycling |
+            |         |                |                 | yes             |      | x     |
-            | primary |                |                 | no              |      |         |
+            |         |                |                 | no              |      |       |
-            | primary | no             |                 | yes             |      | cycling |
+            |         | no             |                 | yes             |      | x     |
-            | primary | yes            |                 | no              |      |         |
+            |         | yes            |                 | no              |      |       |
-            | primary |                | no              | yes             |      | cycling |
+            |         |                | no              | yes             |      | x     |
-            | primary |                | yes             | no              |      |         |
+            |         |                | yes             | no              |      |       |
-            | runway  |                |                 |                 |      | cycling |
+            | runway  |                |                 |                 |      | x     |
-            | runway  | yes            |                 |                 |      | cycling |
+            | runway  | yes            |                 |                 |      | x     |
-            | runway  | no             |                 |                 |      |         |
+            | runway  | no             |                 |                 |      |       |
-            | runway  |                | yes             |                 |      | cycling |
+            | runway  |                | yes             |                 |      | x     |
-            | runway  |                | no              |                 |      |         |
+            | runway  |                | no              |                 |      |       |
-            | runway  | no             | yes             |                 |      | cycling |
+            | runway  | no             | yes             |                 |      | x     |
-            | runway  | yes            | no              |                 |      |         |
+            | runway  | yes            | no              |                 |      |       |
-            | runway  |                |                 | yes             |      | cycling |
+            | runway  |                |                 | yes             |      | x     |
-            | runway  |                |                 | no              |      |         |
+            | runway  |                |                 | no              |      |       |
-            | runway  | no             |                 | yes             |      | cycling |
+            | runway  | no             |                 | yes             |      | x     |
-            | runway  | yes            |                 | no              |      |         |
+            | runway  | yes            |                 | no              |      |       |
-            | runway  |                | no              | yes             |      | cycling |
+            | runway  |                | no              | yes             |      | x     |
-            | runway  |                | yes             | no              |      |         |
+            | runway  |                | yes             | no              |      |       |
    Scenario: Bike - Overwriting implied acccess on ways
        Then routability should be
-            | highway  | access | vehicle | bicycle | bothw   |
+            | highway  | access | vehicle | bicycle | bothw |
-            | cycleway |        |         |         | cycling |
+            | cycleway |        |         |         | x     |
-            | runway   |        |         |         |         |
+            | runway   |        |         |         |       |
-            | cycleway | no     |         |         |         |
+            | cycleway | no     |         |         |       |
-            | cycleway |        | no      |         |         |
+            | cycleway |        | no      |         |       |
-            | cycleway |        |         | no      |         |
+            | cycleway |        |         | no      |       |
-            | runway   | yes    |         |         | cycling |
+            | runway   | yes    |         |         | x     |
-            | runway   |        | yes     |         | cycling |
+            | runway   |        | yes     |         | x     |
-            | runway   |        |         | yes     | cycling |
+            | runway   |        |         | yes     | x     |
    Scenario: Bike - Access tags on ways
        Then routability should be
-            | access       | vehicle      | bicycle      | bothw   |
+            | access       | vehicle      | bicycle      | bothw |
-            |              |              |              | cycling |
+            |              |              |              | x     |
-            | yes          |              |              | cycling |
+            | yes          |              |              | x     |
-            | permissive   |              |              | cycling |
+            | permissive   |              |              | x     |
-            | designated   |              |              | cycling |
+            | designated   |              |              | x     |
-            | some_tag     |              |              | cycling |
+            | some_tag     |              |              | x     |
-            | no           |              |              |         |
+            | no           |              |              |       |
-            | private      |              |              |         |
+            | private      |              |              |       |
-            | agricultural |              |              |         |
+            | agricultural |              |              |       |
-            | forestry     |              |              |         |
+            | forestry     |              |              |       |
-            | delivery     |              |              |         |
+            | delivery     |              |              |       |
-            |              | yes          |              | cycling |
+            |              | yes          |              | x     |
-            |              | permissive   |              | cycling |
+            |              | permissive   |              | x     |
-            |              | designated   |              | cycling |
+            |              | designated   |              | x     |
-            |              | some_tag     |              | cycling |
+            |              | some_tag     |              | x     |
-            |              | no           |              |         |
+            |              | no           |              |       |
-            |              | private      |              |         |
+            |              | private      |              |       |
-            |              | agricultural |              |         |
+            |              | agricultural |              |       |
-            |              | forestry     |              |         |
+            |              | forestry     |              |       |
-            |              | delivery     |              |         |
+            |              | delivery     |              |       |
-            |              |              | yes          | cycling |
+            |              |              | yes          | x     |
-            |              |              | permissive   | cycling |
+            |              |              | permissive   | x     |
-            |              |              | designated   | cycling |
+            |              |              | designated   | x     |
-            |              |              | some_tag     | cycling |
+            |              |              | some_tag     | x     |
-            |              |              | no           |         |
+            |              |              | no           |       |
-            |              |              | private      |         |
+            |              |              | private      |       |
-            |              |              | agricultural |         |
+            |              |              | agricultural |       |
-            |              |              | forestry     |         |
+            |              |              | forestry     |       |
-            |              |              | delivery     |         |
+            |              |              | delivery     |       |
            |              |              | use_sidepath |         |
    Scenario: Bike - Access tags on both node and way
        Then routability should be
-            | access   | node/access | bothw   |
+            | access   | node/access | bothw |
-            | yes      | yes         | cycling |
+            | yes      | yes         | x     |
-            | yes      | no          |         |
+            | yes      | no          |       |
-            | yes      | some_tag    | cycling |
+            | yes      | some_tag    | x     |
-            | no       | yes         |         |
+            | no       | yes         |       |
-            | no       | no          |         |
+            | no       | no          |       |
-            | no       | some_tag    |         |
+            | no       | some_tag    |       |
-            | some_tag | yes         | cycling |
+            | some_tag | yes         | x     |
-            | some_tag | no          |         |
+            | some_tag | no          |       |
-            | some_tag | some_tag    | cycling |
+            | some_tag | some_tag    | x     |
    Scenario: Bike - Access combinations
        Then routability should be
-            | highway     | access     | vehicle    | bicycle    | forw    | backw   |
+            | highway     | access     | vehicle    | bicycle    | forw | backw |
-            | runway      | private    |            | yes        | cycling | cycling |
+            | runway      | private    |            | yes        | x    | x     |
-            | footway     |            | no         | permissive | cycling | cycling |
+            | footway     |            | no         | permissive | x    | x     |
-            | motorway    |            |            | yes        | cycling |         |
+            | motorway    |            |            | yes        | x    |       |
-            | track       | forestry   |            | permissive | cycling | cycling |
+            | track       | forestry   |            | permissive | x    | x     |
-            | cycleway    | yes        | designated | no         |         |         |
+            | cycleway    | yes        | designated | no         |      |       |
-            | primary     |            | yes        | private    |         |         |
+            | primary     |            | yes        | private    |      |       |
-            | residential | permissive |            | no         |         |         |
+            | residential | permissive |            | no         |      |       |
    Scenario: Bike - Ignore access tags for other modes
        Then routability should be
-            | highway  | boat | motor_vehicle | moped | bothw   |
+            | highway  | boat | motor_vehicle | moped | bothw |
-            | river    | yes  |               |       |         |
+            | river    | yes  |               |       |       |
-            | cycleway | no   |               |       | cycling |
+            | cycleway | no   |               |       | x     |
-            | runway   |      | yes           |       |         |
+            | runway   |      | yes           |       |       |
-            | cycleway |      | no            |       | cycling |
+            | cycleway |      | no            |       | x     |
-            | runway   |      |               | yes   |         |
+            | runway   |      |               | yes   |       |
-            | cycleway |      |               | no    | cycling |
+            | cycleway |      |               | no    | x     |
    Scenario: Bike - Bridleways when access is explicit
        Then routability should be
-            | highway   | horse      | foot | bicycle | bothw        |
+            | highway   | horse      | foot | bicycle | bothw |
-            | bridleway |            |      | yes     | cycling      |
+            | bridleway |            |      | yes     | x     |
-            | bridleway |            | yes  |         | pushing bike |
+            | bridleway |            | yes  |         | x     |
-            | bridleway | designated |      |         |              |
+            | bridleway | designated |      |         |       |
-            | bridleway |            |      |         |              |
+            | bridleway |            |      |         |       |
    Scenario: Bike - Tram with oneway when access is implicit
        Then routability should be
-            | highway     | railway | access | oneway | forw    | backw        |
+            | highway     | railway | access | oneway | bothw |
-            | residential | tram    |        | yes    | cycling | pushing bike |
+            | residential | tram    |        | yes    | x     |
-            | service     | tram    | psv    | yes    | cycling | pushing bike |
+            | service     | tram    | psv    | yes    | x     |
    Scenario: Bike - Access combinations
        Then routability should be
-            | highway    | access     | bothw   |
+            | highway    | access     | bothw |
-            | primary    | permissive | cycling |
+            | primary    | permissive | x     |
-            | steps      | permissive | cycling |
+            | steps      | permissive | x     |
-            | footway    | permissive | cycling |
+            | footway    | permissive | x     |
-            | garbagetag | permissive | cycling |
+            | garbagetag | permissive | x     |
--- a/features/bicycle/access_node.feature
+++ b/features/bicycle/access_node.feature
@ -7,62 +7,62 @@ Feature: Bike - Access tags on nodes
    Scenario: Bike - Access tag hierarchy on nodes
        Then routability should be
-            | node/access | node/vehicle | node/bicycle | node/highway | bothw   |
+            | node/access | node/vehicle | node/bicycle | node/highway  | bothw |
-            |             |              |              |              | cycling |
+            |             |              |              |               | x     |
-            | yes         |              |              |              | cycling |
+            | yes         |              |              |               | x     |
-            | no          |              |              |              |         |
+            | no          |              |              |               |       |
-            |             | yes          |              |              | cycling |
+            |             | yes          |              |               | x     |
-            |             | no           |              |              |         |
+            |             | no           |              |               |       |
-            | no          | yes          |              |              | cycling |
+            | no          | yes          |              |               | x     |
-            | yes         | no           |              |              |         |
+            | yes         | no           |              |               |       |
-            |             |              | yes          |              | cycling |
+            |             |              | yes          |               | x     |
-            |             |              | no           |              |         |
+            |             |              | no           |               |       |
-            |             |              | no           | crossing     | cycling |
+            |             |              | no           | crossing      | x     |
-            | no          |              | yes          |              | cycling |
+            | no          |              | yes          |               | x     |
-            | yes         |              | no           |              |         |
+            | yes         |              | no           |               |       |
-            |             | no           | yes          |              | cycling |
+            |             | no           | yes          |               | x     |
-            |             | yes          | no           |              |         |
+            |             | yes          | no           |               |       |
    Scenario: Bike - Overwriting implied acccess on nodes doesn't overwrite way
        Then routability should be
-            | highway  | node/access | node/vehicle | node/bicycle | bothw   |
+            | highway  | node/access | node/vehicle | node/bicycle | bothw |
-            | cycleway |             |              |              | cycling |
+            | cycleway |             |              |              | x     |
-            | runway   |             |              |              |         |
+            | runway   |             |              |              |       |
-            | cycleway | no          |              |              |         |
+            | cycleway | no          |              |              |       |
-            | cycleway |             | no           |              |         |
+            | cycleway |             | no           |              |       |
-            | cycleway |             |              | no           |         |
+            | cycleway |             |              | no           |       |
-            | runway   | yes         |              |              |         |
+            | runway   | yes         |              |              |       |
-            | runway   |             | yes          |              |         |
+            | runway   |             | yes          |              |       |
-            | runway   |             |              | yes          |         |
+            | runway   |             |              | yes          |       |
    Scenario: Bike - Access tags on nodes
        Then routability should be
-            | node/access  | node/vehicle | node/bicycle | bothw   |
+            | node/access  | node/vehicle | node/bicycle | bothw |
-            |              |              |              | cycling |
+            |              |              |              | x     |
-            | yes          |              |              | cycling |
+            | yes          |              |              | x     |
-            | permissive   |              |              | cycling |
+            | permissive   |              |              | x     |
-            | designated   |              |              | cycling |
+            | designated   |              |              | x     |
-            | some_tag     |              |              | cycling |
+            | some_tag     |              |              | x     |
-            | no           |              |              |         |
+            | no           |              |              |       |
-            | private      |              |              |         |
+            | private      |              |              |       |
-            | agricultural |              |              |         |
+            | agricultural |              |              |       |
-            | forestry     |              |              |         |
+            | forestry     |              |              |       |
-            | delivery     |              |              |         |
+            | delivery     |              |              |       |
-            |              | yes          |              | cycling |
+            |              | yes          |              | x     |
-            |              | permissive   |              | cycling |
+            |              | permissive   |              | x     |
-            |              | designated   |              | cycling |
+            |              | designated   |              | x     |
-            |              | some_tag     |              | cycling |
+            |              | some_tag     |              | x     |
-            |              | no           |              |         |
+            |              | no           |              |       |
-            |              | private      |              |         |
+            |              | private      |              |       |
-            |              | agricultural |              |         |
+            |              | agricultural |              |       |
-            |              | forestry     |              |         |
+            |              | forestry     |              |       |
-            |              | delivery     |              |         |
+            |              | delivery     |              |       |
-            |              |              | yes          | cycling |
+            |              |              | yes          | x     |
-            |              |              | permissive   | cycling |
+            |              |              | permissive   | x     |
-            |              |              | designated   | cycling |
+            |              |              | designated   | x     |
-            |              |              | some_tag     | cycling |
+            |              |              | some_tag     | x     |
-            |              |              | no           |         |
+            |              |              | no           |       |
-            |              |              | private      |         |
+            |              |              | private      |       |
-            |              |              | agricultural |         |
+            |              |              | agricultural |       |
-            |              |              | forestry     |         |
+            |              |              | forestry     |       |
-            |              |              | delivery     |         |
+            |              |              | delivery     |       |
--- a/features/bicycle/alley.feature
+++ b/features/bicycle/alley.feature
@ -1,34 +0,0 @@
@routing @bicycle @alley
 Feature: Bicycle - Route around alleys
    Background:
        Given the profile file "bicycle" initialized with
        """
        profile.properties.weight_name = 'cyclability'
        """
    Scenario: Bicycle - Avoid taking alleys
        Given the query options
            | annotations | nodes |
        Given the node map
            """
            a-----b-----c
            |     :     |
            d.....e.....f
            """
        And the ways
            | nodes | highway     | service  |
            | abc   | residential |          |
            | def   | service     | alley    |
            | ad    | residential |          |
            | be    | service     | alley    |
            | cf    | residential |          |
        When I route I should get
            | from | to | a:nodes    | weight | #                                |
            | a    | f  | 1:2:3:6    | 196.2  | Avoids d,e,f                     |
            | a    | e  | 1:2:5      | 172.2  | Take the alley b,e if neccessary |
            | d    | f  | 4:1:2:3:6  | 248.4  | Avoids the alley d,e,f           |
--- a/features/bicycle/area.feature
+++ b/features/bicycle/area.feature
@ -71,17 +71,17 @@ Feature: Bike - Squares and other areas
            | abcda | (nil)   | parking |
        When I route I should get
-            | from | to | route       |
+            | from | to | route          |
-            | x    | y  | xa,abcda,by |
+            | x    | y  | xa,abcda,by,by |
-            | y    | x  | by,abcda,xa |
+            | y    | x  | by,abcda,xa,xa |
-            | a    | b  | abcda,abcda |
+            | a    | b  | abcda,abcda    |
-            | a    | d  | abcda,abcda |
+            | a    | d  | abcda,abcda    |
-            | b    | c  | abcda,abcda |
+            | b    | c  | abcda,abcda    |
-            | c    | b  | abcda,abcda |
+            | c    | b  | abcda,abcda    |
-            | c    | d  | abcda,abcda |
+            | c    | d  | abcda,abcda    |
-            | d    | c  | abcda,abcda |
+            | d    | c  | abcda,abcda    |
-            | d    | a  | abcda,abcda |
+            | d    | a  | abcda,abcda    |
-            | a    | d  | abcda,abcda |
+            | a    | d  | abcda,abcda    |
    @train @platform
@ -99,14 +99,14 @@ Feature: Bike - Squares and other areas
            | abcda | (nil)   | platform |
        When I route I should get
-            | from | to | route       |
+            | from | to | route          |
-            | x    | y  | xa,abcda,by |
+            | x    | y  | xa,abcda,by,by |
-            | y    | x  | by,abcda,xa |
+            | y    | x  | by,abcda,xa,xa |
-            | a    | b  | abcda,abcda |
+            | a    | b  | abcda,abcda    |
-            | a    | d  | abcda,abcda |
+            | a    | d  | abcda,abcda    |
-            | b    | c  | abcda,abcda |
+            | b    | c  | abcda,abcda    |
-            | c    | b  | abcda,abcda |
+            | c    | b  | abcda,abcda    |
-            | c    | d  | abcda,abcda |
+            | c    | d  | abcda,abcda    |
-            | d    | c  | abcda,abcda |
+            | d    | c  | abcda,abcda    |
-            | d    | a  | abcda,abcda |
+            | d    | a  | abcda,abcda    |
-            | a    | d  | abcda,abcda |
+            | a    | d  | abcda,abcda    |
--- a/features/bicycle/barrier.feature
+++ b/features/bicycle/barrier.feature
@ -10,7 +10,6 @@ Feature: Barriers
            |                | x     |
            | bollard        | x     |
            | gate           | x     |
            | lift_gate      | x     |
            | cycle_barrier  | x     |
            | cattle_grid    | x     |
            | border_control | x     |
@ -19,7 +18,7 @@ Feature: Barriers
            | entrance       | x     |
            | wall           |       |
            | fence          |       |
-            | some_tag       | x     |
+            | some_tag       |       |
            | block          | x     |
    Scenario: Bike - Access tag trumphs barriers
--- a/features/bicycle/bridge.feature
+++ b/features/bicycle/bridge.feature
@ -4,12 +4,12 @@ Feature: Bicycle - Handle cycling
    Background:
        Given the profile "bicycle"
-    Scenario: Bicycle - Use a movable bridge
+    Scenario: Bicycle - Use a ferry route
        Given the node map
            """
-            a b   c
+            a b c
-                  d
+                d
-                  e   f g
+                e f g
            """
        And the ways
@ -19,15 +19,22 @@ Feature: Bicycle - Handle cycling
            | efg   | primary |         |         |
        When I route I should get
-            | from | to | route           | modes                           |
+            | from | to | route           | modes                                  |
            | a    | g  | abc,cde,efg,efg | cycling,cycling,cycling,cycling |
            | b    | f  | abc,cde,efg,efg | cycling,cycling,cycling,cycling |
            | e    | c  | cde,cde         | cycling,cycling          |
            | e    | b  | cde,abc,abc     | cycling,cycling,cycling         |
            | e    | a  | cde,abc,abc     | cycling,cycling,cycling         |
            | c    | e  | cde,cde         | cycling,cycling          |
            | c    | f  | cde,efg,efg     | cycling,cycling,cycling         |
            | c    | g  | cde,efg,efg     | cycling,cycling,cycling         |
    Scenario: Bicycle - Properly handle durations
        Given the node map
            """
-            a b   c
+            a b c
-                  d
+                d
-                  e   f g
+                e f g
            """
        And the ways
@ -38,7 +45,7 @@ Feature: Bicycle - Handle cycling
        When I route I should get
            | from | to | route           | modes                           | speed  |
-            | a    | g  | abc,cde,efg,efg | cycling,cycling,cycling,cycling | 6 km/h |
+            | a    | g  | abc,cde,efg,efg | cycling,cycling,cycling,cycling | 5 km/h |
-            | b    | f  | abc,cde,efg,efg | cycling,cycling,cycling,cycling | 5 km/h |
+            | b    | f  | abc,cde,efg,efg | cycling,cycling,cycling,cycling | 4 km/h |
            | c    | e  | cde,cde         | cycling,cycling                 | 2 km/h |
            | e    | c  | cde,cde         | cycling,cycling                 | 2 km/h |
--- a/features/bicycle/classes.feature
+++ b/features/bicycle/classes.feature
@ -1,92 +0,0 @@
@routing @bicycle @mode
 Feature: Bicycle - Mode flag
    Background:
        Given the profile "bicycle"
    Scenario: Bicycle - We tag ferries with a class
        Given the node map
            """
            a b
              c d
            """
        And the ways
            | nodes | highway | route |
            | ab    | primary |       |
            | bc    |         | ferry |
            | cd    | primary |       |
        When I route I should get
            | from | to | route       | turns                                              | classes                  |
            | a    | d  | ab,bc,cd,cd | depart,notification right,notification left,arrive | [()],[(ferry)],[()],[()] |
            | d    | a  | cd,bc,ab,ab | depart,notification right,notification left,arrive | [()],[(ferry)],[()],[()] |
            | c    | a  | bc,ab,ab    | depart,notification left,arrive                    | [(ferry)],[()],[()]      |
            | d    | b  | cd,bc,bc    | depart,notification right,arrive                   | [()],[(ferry)],[()]      |
            | a    | c  | ab,bc,bc    | depart,notification right,arrive                   | [()],[(ferry)],[()]      |
            | b    | d  | bc,cd,cd    | depart,notification left,arrive                    | [(ferry)],[()],[()]      |
    Scenario: Bicycle - We tag tunnel with a class
        Background:
            Given a grid size of 200 meters
        Given the node map
            """
            a b
              c d
            """
        And the ways
            | nodes | tunnel               |
            | ab    | no                   |
            | bc    | yes                  |
            | cd    |                      |
        When I route I should get
            | from | to | route       | turns                                      | classes                   |
            | a    | d  | ab,bc,cd,cd | depart,new name right,new name left,arrive | [()],[(tunnel)],[()],[()] |
    Scenario: Bicycle - We tag classes without intersections
        Background:
            Given a grid size of 200 meters
        Given the node map
            """
            a b c d
            """
        And the ways
            | nodes | name | tunnel |
            | ab    | road |        |
            | bc    | road | yes    |
            | cd    | road |        |
        When I route I should get
          | from | to | route     | turns         | classes               |
          | a    | d  | road,road | depart,arrive | [(),(tunnel),()],[()] |
    Scenario: Bicycle - From roundabout on ferry
        Given the node map
            """
                     c
                  /     \
            a---b         d---f--h
                  \     /
                     e
                     |
                     g
            """
        And the ways
            | nodes | oneway | highway | junction   | route    |
            | ab    | yes    | service |            |          |
            | cb    | yes    | service | roundabout |          |
            | dc    | yes    | service | roundabout |          |
            | be    | yes    | service | roundabout |          |
            | ed    | yes    | service | roundabout |          |
            | eg    | yes    | service |            |          |
            | df    |        |         |            | ferry    |
            | fh    | yes    | service |            |          |
        When I route I should get
            | from | to | route          | turns                                                                              | classes                          |
            | a    | h  | ab,df,df,fh,fh | depart,roundabout-exit-2,exit roundabout slight right,notification straight,arrive | [()],[(),()],[(ferry)],[()],[()] |
--- a/features/bicycle/cycleway.feature
+++ b/features/bicycle/cycleway.feature
@ -46,14 +46,12 @@ Feature: Bike - Cycle tracks/lanes
            | primary  |          |               |                | x    | x     |
            | motorway |          |               |                |      |       |
            | motorway | track    |               |                | x    |       |
-            | motorway | opposite |               |                | x    | x     |
+            | motorway | opposite |               |                |      | x     |
-            | motorway |          | track         |                | x    |       |
+            | motorway |          | track         |                |      | x     |
-            | motorway |          | opposite      |                | x    | x     |
+            | motorway |          | opposite      |                |      | x     |
            | motorway |          |               | track          | x    |       |
-            | motorway |          |               | opposite       | x    | x     |
+            | motorway |          |               | opposite       | x    |       |
-            # motorways are implicit oneways and cycleway tracks next to oneways always
+            | motorway |          | track         | track          | x    | x     |
            # follow the oneway direction (unless tagged as opposite)
            | motorway |          | track         | track          | x    |       |
            | motorway |          | opposite      | opposite       | x    | x     |
            | motorway |          | track         | opposite       | x    | x     |
            | motorway |          | opposite      | track          | x    | x     |
@ -81,19 +79,3 @@ Feature: Bike - Cycle tracks/lanes
            | residential | lane     | yes    | x    | x     |
            | footway     | lane     | yes    | x    | x     |
            | cycleway    | lane     | yes    | x    | x     |
    Scenario: Bike - Cycleway on oneways, modes
        Then routability should be
            | highway     | cycleway | oneway | forw    | backw        |
            | motorway    | track    | yes    | cycling |              |
            | residential | track    | yes    | cycling | pushing bike |
            | cycleway    | track    | yes    | cycling | pushing bike |
            | footway     | track    | yes    | cycling | pushing bike |
    Scenario: Bike - Cycleway on oneways, speeds
        Then routability should be
            | highway     | cycleway | oneway | forw    | backw      |
            | motorway    | track    | yes    | 15 km/h |            |
            | residential | track    | yes    | 15 km/h | 4 km/h +-1 |
            | cycleway    | track    | yes    | 15 km/h | 4 km/h +-1 |
            | footway     | track    | yes    | 15 km/h | 4 km/h +-1 |
--- a/features/bicycle/destination.feature
+++ b/features/bicycle/destination.feature
@ -21,15 +21,15 @@ Feature: Bike - Destination only, no passing through
            | axye  |             |
        When I route I should get
-            | from | to | route     |
+            | from | to | route      |
-            | a    | b  | ab,ab     |
+            | a    | b  | ab,ab      |
-            | a    | c  | ab,bcd    |
+            | a    | c  | ab,bcd,bcd |
-            | a    | d  | ab,bcd    |
+            | a    | d  | ab,bcd,bcd |
-            | a    | e  | axye,axye |
+            | a    | e  | axye,axye  |
-            | e    | d  | de,de     |
+            | e    | d  | de,de      |
-            | e    | c  | de,bcd    |
+            | e    | c  | de,bcd,bcd |
-            | e    | b  | de,bcd    |
+            | e    | b  | de,bcd,bcd |
-            | e    | a  | axye,axye |
+            | e    | a  | axye,axye  |
    Scenario: Bike - Destination only street
        Given the node map
@ -49,15 +49,15 @@ Feature: Bike - Destination only, no passing through
            | axye  |             |
        When I route I should get
-            | from | to | route     |
+            | from | to | route       |
-            | a    | b  | ab,ab     |
+            | a    | b  | ab,ab       |
-            | a    | c  | ab,bc     |
+            | a    | c  | ab,bc,bc    |
-            | a    | d  | ab,bc,cd  |
+            | a    | d  | ab,bc,cd,cd |
-            | a    | e  | axye,axye |
+            | a    | e  | axye,axye   |
-            | e    | d  | de,de     |
+            | e    | d  | de,de       |
-            | e    | c  | de,cd,cd  |
+            | e    | c  | de,cd,cd    |
-            | e    | b  | de,cd,bc  |
+            | e    | b  | de,cd,bc,bc |
-            | e    | a  | axye,axye |
+            | e    | a  | axye,axye   |
    Scenario: Bike - Routing inside a destination only area
        Given the node map
@ -76,8 +76,8 @@ Feature: Bike - Destination only, no passing through
            | axye  |             |
        When I route I should get
-            | from | to | route       |
+            | from | to | route          |
-            | a    | e  | ab,bc,cd,de |
+            | a    | e  | ab,bc,cd,de,de |
-            | e    | a  | de,cd,bc,ab |
+            | e    | a  | de,cd,bc,ab,ab |
-            | b    | d  | bc,cd       |
+            | b    | d  | bc,cd,cd       |
-            | d    | b  | cd,bc       |
+            | d    | b  | cd,bc,bc       |
--- a/features/bicycle/distance.feature
+++ b/features/bicycle/distance.feature
@ -1,35 +0,0 @@
@routing @bicycle
 Feature: Bike - Use distance weight
    Background:
        Given a grid size of 200 meters
    Scenario: Bike - Check distance weight
        Given the profile file
        """
        local functions = require('bicycle')
        functions.setup_testbot = functions.setup
        functions.setup = function()
          local profile = functions.setup_testbot()
          profile.properties.weight_name = 'distance'
          return profile
        end
        return functions
        """
        Given the node map
            """
            a-b-c
            """
        And the ways
            | nodes | highway     |
            | abc   | residential |
        When I route I should get
            | from | to | route   | weight | time | distance |
            | a    | b  | abc,abc |    200 | 48s  | 200m +-1 |
            | a    | c  | abc,abc |    400 | 96s  | 400m +-1 |
--- a/features/bicycle/exclude.feature
+++ b/features/bicycle/exclude.feature
@ -1,55 +0,0 @@
@routing @bicycle @exclude
 Feature: Bicycle - Exclude flags
    Background:
        Given the profile file "bicycle" initialized with
        """
        profile.excludable = Sequence { Set { 'ferry' } }
        """
        Given the node map
            """
            a....b~~~~~c...f
                 :     :
                 d.....e
            """
        And the ways
            | nodes | highway  | route | duration | #                                           |
            | ab    | service  |       |          | always drivable                             |
            | bc    |          | ferry | 00:00:01 | not drivable for exclude=ferry, but fast.   |
            | bd    | service  |       |          | always drivable                             |
            | de    | service  |       |          | always drivable                             |
            | ec    | service  |       |          | always drivable                             |
            | cf    | service  |       |          | always drivable                             |
    Scenario: Bicycle - exclude nothing
        When I route I should get
            | from | to | route          |
            | a    | f  | ab,bc,cf,cf    |
        When I match I should get
            | trace | matchings | duration |
            | abcf  | abcf      | 109      |
        When I request a travel time matrix I should get
            |   | a   | f   |
            | a | 0   | 109 |
            | f | 109 | 0   |
    Scenario: Bicycle - exclude ferry
        Given the query options
            | exclude  | ferry        |
        When I route I should get
            | from | to | route             |
            | a    | f  | ab,bd,de,ec,cf,cf |
        When I match I should get
            | trace | matchings | duration |
            | abcf  | abcf      | 301      |
        When I request a travel time matrix I should get
            |   | a          | f        |
            | a | 0          | 301 +- 1 |
            | f | 301.2 +- 1 | 0        |
--- a/features/bicycle/ferry.feature
+++ b/features/bicycle/ferry.feature
@ -21,7 +21,12 @@ Feature: Bike - Handle ferry routes
        When I route I should get
            | from | to | route           |
            | a    | g  | abc,cde,efg,efg |
            | b    | f  | abc,cde,efg,efg |
            | e    | c  | cde,cde         |
            | e    | b  | cde,abc,abc     |
            | e    | a  | cde,abc,abc     |
            | c    | e  | cde,cde         |
            | c    | f  | cde,efg,efg     |
            | c    | g  | cde,efg,efg     |
    Scenario: Bike - Ferry duration, single node
@ -48,7 +53,8 @@ Feature: Bike - Handle ferry routes
    Scenario: Bike - Ferry duration, multiple nodes
        Given the node map
            """
-            x a b c d y
+            x         y
              a b c d
            """
        And the ways
--- a/features/bicycle/maxspeed.feature
+++ b/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       | 10 km/h |
+            | residential | 10       | 9 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       |                  |                   | 10 km/h | 10 km/h |
+            | 10       |                  |                   | 9 km/h  | 9 km/h  |
-            |          | 10               |                   | 10 km/h | 15 km/h |
+            |          | 10               |                   | 9 km/h  | 15 km/h |
-            |          |                  | 10                | 15 km/h | 10 km/h |
+            |          |                  | 10                | 14 km/h | 9 km/h  |
-            | 2        | 10               |                   | 10 km/h | 2 km/h  |
+            | 2        | 10               |                   | 9 km/h  | 2 km/h  |
-            | 2        |                  | 10                | 2 km/h  | 10 km/h |
+            | 2        |                  | 10                | 2 km/h  | 9 km/h  |
-            | 2        | 5                | 10                | 5 km/h  | 10 km/h |
+            | 2        | 5                | 10                | 5 km/h  | 9 km/h  |
    Scenario: Bike - Maxspeed should not allow routing on unroutable ways
        Then routability should be
--- a/features/bicycle/mode.feature
+++ b/features/bicycle/mode.feature
@ -20,8 +20,11 @@ Feature: Bike - Mode flag
    	When I route I should get
    	 | from | to | route       | modes                         |
    	 | a    | d  | ab,bc,cd,cd | cycling,ferry,cycling,cycling |
    	 | d    | a  | cd,bc,ab,ab | cycling,ferry,cycling,cycling |
    	 | c    | a  | bc,ab,ab    | ferry,cycling,cycling         |
    	 | d    | b  | cd,bc,bc    | cycling,ferry,ferry           |
    	 | a    | c  | ab,bc,bc    | cycling,ferry,ferry           |
    	 | b    | d  | bc,cd,cd    | ferry,cycling,cycling         |
     Scenario: Bike - Mode when using a train
     	Given the node map
@ -39,10 +42,12 @@ Feature: Bike - Mode flag
     	When I route I should get
     	 | from | to | route       | modes                         |
     	 | a    | d  | ab,bc,cd,cd | cycling,train,cycling,cycling |
     	 | d    | a  | cd,bc,ab,ab | cycling,train,cycling,cycling |
     	 | c    | a  | bc,ab,ab    | train,cycling,cycling         |
     	 | d    | b  | cd,bc,bc    | cycling,train,train           |
     	 | a    | c  | ab,bc,bc    | cycling,train,train           |
     	 | b    | d  | bc,cd,cd    | train,cycling,cycling         |
     #representative test for all pushes (and mode changes). Where a bike is pushed is tested over in access.feature
     Scenario: Bike - Mode when pushing bike against oneways
     	Given the node map
     	 """
@ -65,6 +70,96 @@ Feature: Bike - Mode flag
     	 | d    | a  | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling |
     	 | c    | a  | bc,ab,ab    | pushing bike,cycling,cycling         |
     	 | d    | b  | cd,bc,bc    | cycling,pushing bike,pushing bike    |
     	 | a    | c  | ab,bc,bc    | cycling,cycling,cycling              |
     	 | b    | d  | bc,cd,cd    | cycling,cycling,cycling              |
     Scenario: Bike - Mode when pushing on pedestrain streets
     	Given the node map
     	 """
     	 a b
     	   c d
     	 """
     	And the ways
     	 | nodes | highway    |
     	 | ab    | primary    |
     	 | bc    | pedestrian |
     	 | cd    | primary    |
     	When I route I should get
     	 | from | to | route       | modes                                |
     	 | a    | d  | ab,bc,cd,cd | cycling,pushing bike,cycling,cycling |
     	 | d    | a  | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling |
     	 | c    | a  | bc,ab,ab    | pushing bike,cycling,cycling         |
     	 | d    | b  | cd,bc,bc    | cycling,pushing bike,pushing bike    |
     	 | a    | c  | ab,bc,bc    | cycling,pushing bike,pushing bike    |
     	 | b    | d  | bc,cd,cd    | pushing bike,cycling,cycling         |
     Scenario: Bike - Mode when pushing on pedestrain areas
     	Given the node map
     	 """
     	 a b
     	   c d f
     	 """
     	And the ways
     	 | nodes | highway    | area |
     	 | ab    | primary    |      |
     	 | bcd   | pedestrian | yes  |
     	 | df    | primary    |      |
     	When I route I should get
     	 | from | to | route        | modes                                |
     	 | a    | f  | ab,bcd,df,df | cycling,pushing bike,cycling,cycling |
     	 | f    | a  | df,bcd,ab,ab | cycling,pushing bike,cycling,cycling |
     	 | d    | a  | bcd,ab,ab    | pushing bike,cycling,cycling         |
     	 | f    | b  | df,bcd,bcd   | cycling,pushing bike,pushing bike    |
     	 | a    | d  | ab,bcd,bcd   | cycling,pushing bike,pushing bike    |
     	 | b    | f  | bcd,df,df    | pushing bike,cycling,cycling         |
     Scenario: Bike - Mode when pushing on steps
     	Given the node map
     	 """
     	 a b
     	   c d f
     	 """
     	And the ways
    	 | nodes | highway |
    	 | ab    | primary |
    	 | bc    | steps   |
    	 | cd    | primary |
     	When I route I should get
    	 | from | to | route       | modes                                |
    	 | a    | d  | ab,bc,cd,cd | cycling,pushing bike,cycling,cycling |
    	 | d    | a  | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling |
    	 | c    | a  | bc,ab,ab    | pushing bike,cycling,cycling         |
    	 | d    | b  | cd,bc,bc    | cycling,pushing bike,pushing bike    |
    	 | a    | c  | ab,bc,bc    | cycling,pushing bike,pushing bike    |
    	 | b    | d  | bc,cd,cd    | pushing bike,cycling,cycling         |
     Scenario: Bike - Mode when bicycle=dismount
     	Given the node map
     	 """
     	 a b
     	   c d f
     	 """
     	And the ways
    	 | nodes | highway | bicycle  |
    	 | ab    | primary |          |
    	 | bc    | primary | dismount |
    	 | cd    | primary |          |
     	When I route I should get
    	 | from | to | route       | modes                                |
    	 | a    | d  | ab,bc,cd,cd | cycling,pushing bike,cycling,cycling |
    	 | d    | a  | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling |
    	 | c    | a  | bc,ab,ab    | pushing bike,cycling,cycling         |
    	 | d    | b  | cd,bc,bc    | cycling,pushing bike,pushing bike    |
    	 | a    | c  | ab,bc,bc    | cycling,pushing bike,pushing bike    |
         | b    | d  | bc,cd,cd    | pushing bike,cycling,cycling         |
    Scenario: Bicycle - Modes when starting on forward oneway
        Given the node map
--- a/features/bicycle/names.feature
+++ b/features/bicycle/names.feature
@ -17,8 +17,8 @@ Feature: Bike - Street names in instructions
            | bc    | Your Way | A7  |
        When I route I should get
-            | from | to | route           | ref   |
+            | from | to | route                                   | ref      |
-            | a    | c  | My Way,Your Way | A6,A7 |
+            | a    | c  | My Way,Your Way,Your Way                | A6,A7,A7 |
    @unnamed
    Scenario: Bike - No longer use way type to describe unnamed ways, see #3231
--- a/features/bicycle/oneway.feature
+++ b/features/bicycle/oneway.feature
@ -8,15 +8,13 @@ Feature: Bike - Oneway streets
    Scenario: Bike - Simple oneway
        Then routability should be
-            | highway | foot | oneway | forw    | backw        |
+            | highway | foot | oneway | forw | backw |
-            | primary | no   | yes    | cycling |              |
+            | primary | no   | yes    | x    |       |
            | primary |      | yes    | cycling | pushing bike |
    Scenario: Simple reverse oneway
        Then routability should be
-            | highway | foot | oneway | forw         | backw   |
+            | highway | foot | oneway | forw | backw |
-            | primary | no   | -1     |              | cycling |
+            | primary | no   | -1     |      | x     |
            | primary |      | -1     | pushing bike | cycling |
    Scenario: Bike - Around the Block
        Given the node map
@ -41,83 +39,83 @@ Feature: Bike - Oneway streets
    Scenario: Bike - Handle various oneway tag values
        Then routability should be
-            | foot | oneway   | forw    | backw   |
+            | foot | oneway   | forw | backw |
-            | no   |          | cycling | cycling |
+            | no   |          | x    | x     |
-            | no   | nonsense | cycling | cycling |
+            | no   | nonsense | x    | x     |
-            | no   | no       | cycling | cycling |
+            | no   | no       | x    | x     |
-            | no   | false    | cycling | cycling |
+            | no   | false    | x    | x     |
-            | no   | 0        | cycling | cycling |
+            | no   | 0        | x    | x     |
-            | no   | yes      | cycling |         |
+            | no   | yes      | x    |       |
-            | no   | true     | cycling |         |
+            | no   | true     | x    |       |
-            | no   | 1        | cycling |         |
+            | no   | 1        | x    |       |
-            | no   | -1       |         | cycling |
+            | no   | -1       |      | x     |
    Scenario: Bike - Implied oneways
        Then routability should be
-            | highway       | foot | bicycle | junction   | forw    | backw   | #                     |
+            | highway         | foot | bicycle | junction   | forw | backw | #                     |
-            |               | no   |         |            | cycling | cycling |                       |
+            |                 | no   |         |            | x    | x     |                       |
-            |               | no   |         | roundabout | cycling |         |                       |
+            |                 | no   |         | roundabout | x    |       |                       |
-            | motorway      | no   | yes     |            | cycling |         |                       |
+            | motorway        | no   | yes     |            | x    |       |                       |
-            | motorway_link | no   | yes     |            | cycling | cycling | does not imply oneway |
+            | motorway_link   | no   | yes     |            | x    | x     | does not imply oneway |
-            | motorway      | no   | yes     | roundabout | cycling |         |                       |
+            | motorway        | no   | yes     | roundabout | x    |       |                       |
-            | motorway_link | no   | yes     | roundabout | cycling |         |                       |
+            | motorway_link   | no   | yes     | roundabout | x    |       |                       |
    Scenario: Bike - Overriding implied oneways
        Then routability should be
-            | highway       | foot | junction   | oneway | forw    | backw   |
+            | highway         | foot | junction   | oneway | forw | backw |
-            | primary       | no   | roundabout | no     | cycling | cycling |
+            | primary         | no   | roundabout | no     | x    | x     |
-            | primary       | no   | roundabout | yes    | cycling |         |
+            | primary         | no   | roundabout | yes    | x    |       |
-            | motorway_link | no   |            | -1     |         |         |
+            | motorway_link   | no   |            | -1     |      |       |
-            | trunk_link    | no   |            | -1     |         |         |
+            | trunk_link      | no   |            | -1     |      |       |
-            | primary       | no   | roundabout | -1     |         | cycling |
+            | primary         | no   | roundabout | -1     |      | x     |
    Scenario: Bike - Oneway:bicycle should override normal oneways tags
        Then routability should be
-            | foot | oneway:bicycle | oneway | junction   | forw    | backw   |
+            | foot | oneway:bicycle | oneway | junction   | forw | backw |
-            | no   | yes            |        |            | cycling |         |
+            | no   | yes            |        |            | x    |       |
-            | no   | yes            | yes    |            | cycling |         |
+            | no   | yes            | yes    |            | x    |       |
-            | no   | yes            | no     |            | cycling |         |
+            | no   | yes            | no     |            | x    |       |
-            | no   | yes            | -1     |            | cycling |         |
+            | no   | yes            | -1     |            | x    |       |
-            | no   | yes            |        | roundabout | cycling |         |
+            | no   | yes            |        | roundabout | x    |       |
-            | no   | no             |        |            | cycling | cycling |
+            | no   | no             |        |            | x    | x     |
-            | no   | no             | yes    |            | cycling | cycling |
+            | no   | no             | yes    |            | x    | x     |
-            | no   | no             | no     |            | cycling | cycling |
+            | no   | no             | no     |            | x    | x     |
-            | no   | no             | -1     |            | cycling | cycling |
+            | no   | no             | -1     |            | x    | x     |
-            | no   | no             |        | roundabout | cycling | cycling |
+            | no   | no             |        | roundabout | x    | x     |
-            | no   | -1             |        |            |         | cycling |
+            | no   | -1             |        |            |      | x     |
-            | no   | -1             | yes    |            |         | cycling |
+            | no   | -1             | yes    |            |      | x     |
-            | no   | -1             | no     |            |         | cycling |
+            | no   | -1             | no     |            |      | x     |
-            | no   | -1             | -1     |            |         | cycling |
+            | no   | -1             | -1     |            |      | x     |
-            | no   | -1             |        | roundabout |         | cycling |
+            | no   | -1             |        | roundabout |      | x     |
    Scenario: Bike - Contra flow
        Then routability should be
-            | foot | oneway | cycleway       | forw    | backw   |
+            | foot | oneway | cycleway       | forw | backw |
-            | no   | yes    | opposite       | cycling | cycling |
+            | no   | yes    | opposite       | x    | x     |
-            | no   | yes    | opposite_track | cycling | cycling |
+            | no   | yes    | opposite_track | x    | x     |
-            | no   | yes    | opposite_lane  | cycling | cycling |
+            | no   | yes    | opposite_lane  | x    | x     |
-            | no   | -1     | opposite       | cycling | cycling |
+            | no   | -1     | opposite       | x    | x     |
-            | no   | -1     | opposite_track | cycling | cycling |
+            | no   | -1     | opposite_track | x    | x     |
-            | no   | -1     | opposite_lane  | cycling | cycling |
+            | no   | -1     | opposite_lane  | x    | x     |
-            | no   | no     | opposite       | cycling | cycling |
+            | no   | no     | opposite       | x    | x     |
-            | no   | no     | opposite_track | cycling | cycling |
+            | no   | no     | opposite_track | x    | x     |
-            | no   | no     | opposite_lane  | cycling | cycling |
+            | no   | no     | opposite_lane  | x    | x     |
    Scenario: Bike - Should not be affected by car tags
        Then routability should be
-            | foot | junction   | oneway | oneway:car | forw    | backw   |
+            | foot | junction   | oneway | oneway:car | forw | backw |
-            | no   |            | yes    | yes        | cycling |         |
+            | no   |            | yes    | yes        | x    |       |
-            | no   |            | yes    | no         | cycling |         |
+            | no   |            | yes    | no         | x    |       |
-            | no   |            | yes    | -1         | cycling |         |
+            | no   |            | yes    | -1         | x    |       |
-            | no   |            | no     | yes        | cycling | cycling |
+            | no   |            | no     | yes        | x    | x     |
-            | no   |            | no     | no         | cycling | cycling |
+            | no   |            | no     | no         | x    | x     |
-            | no   |            | no     | -1         | cycling | cycling |
+            | no   |            | no     | -1         | x    | x     |
-            | no   |            | -1     | yes        |         | cycling |
+            | no   |            | -1     | yes        |      | x     |
-            | no   |            | -1     | no         |         | cycling |
+            | no   |            | -1     | no         |      | x     |
-            | no   |            | -1     | -1         |         | cycling |
+            | no   |            | -1     | -1         |      | x     |
-            | no   | roundabout |        | yes        | cycling |         |
+            | no   | roundabout |        | yes        | x    |       |
-            | no   | roundabout |        | no         | cycling |         |
+            | no   | roundabout |        | no         | x    |       |
-            | no   | roundabout |        | -1         | cycling |         |
+            | no   | roundabout |        | -1         | x    |       |
    Scenario: Bike - Two consecutive oneways
        Given the node map
@ -134,19 +132,3 @@ Feature: Bike - Oneway streets
        When I route I should get
            | from | to | route    |
            | a    | c  | ab,bc,bc |
    Scenario: Bike - Left/right cycleways on oneways
        Then routability should be
            | highway     | oneway | cycleway:left  | cycleway:right | forw    | backw        |
            | primary     | yes    |                |                | cycling | pushing bike |
            | primary     | yes    |                | track          | cycling | pushing bike |
            | primary     | yes    | track          |                | cycling | pushing bike |
            | primary     | yes    | track          | track          | cycling | pushing bike |
    Scenario: Bike - Left/right cycleways on any oneways
        Then routability should be
            | foot | oneway | cycleway:left | cycleway:right | forw         | backw        |
            | no   | yes    | track         |                | cycling      |              |
            | yes  | yes    | track         |                | cycling      | pushing bike |
            | yes  | -1     | track         |                | pushing bike | cycling      |
--- a/features/bicycle/pushing.feature
+++ b/features/bicycle/pushing.feature
@ -3,30 +3,34 @@ Feature: Bike - Accessability of different way types
    Background:
        Given the profile "bicycle"
        Given the shortcuts
            | key  | value        |
            | bike | 15 km/h ~20% |
            | foot | 5 km/h ~20%  |
    Scenario: Bike - Pushing bikes on pedestrian-only ways
        Then routability should be
-            | highway    | oneway | forw         | backw        |
+            | highway    | oneway | forw | backw |
-            | (nil)      |        |              |              |
+            | (nil)      |        |      |       |
-            | cycleway   |        | cycling      | cycling      |
+            | cycleway   |        | bike | bike  |
-            | primary    |        | cycling      | cycling      |
+            | primary    |        | bike | bike  |
-            | pedestrian |        | pushing bike | pushing bike |
+            | pedestrian |        | foot | foot  |
-            | cycleway   |        | cycling      | cycling      |
+            | footway    |        | foot | foot  |
-            | primary    | yes    | cycling      | pushing bike |
+            | primary    | yes    | bike | foot  |
    Scenario: Bike - Pushing bikes against normal oneways
        Then routability should be
-            | highway    | oneway | forw         | backw        |
+            | highway    | oneway | forw | backw |
-            | (nil)      |        |              |              |
+            | (nil)      |        |      |       |
-            | primary    | yes    | cycling      | pushing bike |
+            | primary    | yes    | bike | foot  |
-            | pedestrian | yes    | pushing bike | pushing bike |
+            | pedestrian | yes    | foot | foot  |
    Scenario: Bike - Pushing bikes against reverse oneways
        Then routability should be
-            | highway    | oneway | forw         | backw        |
+            | highway    | oneway | forw | backw |
-            | (nil)      |        |              |              |
+            | (nil)      |        |      |       |
-            | primary    | -1     | pushing bike | cycling      |
+            | primary    | -1     | foot | bike  |
-            | pedestrian | -1     | pushing bike | pushing bike |
+            | pedestrian | -1     | foot | foot  |
    @square
    Scenario: Bike - Push bikes on pedestrian areas
@ -43,7 +47,7 @@ Feature: Bike - Accessability of different way types
            | abcda | yes  | pedestrian |
        When I route I should get
-            | from | to | route       |
+            | from | to | route |
            | a    | b  | abcda,abcda |
            | a    | d  | abcda,abcda |
            | b    | c  | abcda,abcda |
@ -55,19 +59,19 @@ Feature: Bike - Accessability of different way types
    Scenario: Bike - Pushing bikes on ways with foot=yes
        Then routability should be
-            | highway  | foot | forw         | backw        |
+            | highway  | foot | forw | backw |
-            | motorway |      |              |              |
+            | motorway |      |      |       |
-            | motorway | yes  | pushing bike |              |
+            | motorway | yes  | foot |       |
-            | runway   |      |              |              |
+            | runway   |      |      |       |
-            | runway   | yes  | pushing bike | pushing bike |
+            | runway   | yes  | foot | foot  |
    @todo
    Scenario: Bike - Pushing bikes on ways with foot=yes in one direction
        Then routability should be
-            | highway  | foot:forward | foot:backward | forw         | backw        |
+            | highway  | foot:forward | foot:backward | forw | backw |
-            | motorway |              |               |              |              |
+            | motorway |              |               |      |       |
-            | motorway | yes          |               | pushing bike |              |
+            | motorway | yes          |               | foot |       |
-            | motorway |              | yes           |              | pushing bike |
+            | motorway |              | yes           |      | foot  |
    @construction
    Scenario: Bike - Don't allow routing on ways still under construction
@ -78,15 +82,6 @@ Feature: Bike - Accessability of different way types
            | construction | yes  |         |       |
            | construction |      | yes     |       |
    @proposed
    Scenario: Bike - Don't allow routing on ways still being proposed
        Then routability should be
            | highway  | foot | bicycle | proposed | bothw |
            | primary  |      |         |          | x     |
            | proposed |      |         |          |       |
            | proposed | yes  |         | yes      |       |
            | proposed |      | yes     | yes      |       |
    @roundabout
    Scenario: Bike - Don't push bikes against oneway flow on roundabouts
        Then routability should be
@ -109,11 +104,11 @@ Feature: Bike - Accessability of different way types
            | cf    | primary |        |
        When I route I should get
-            | from | to | route       | modes                                |
+            | from | to | route       | modes                                   |
-            | a    | d  | ab,bc,cd,cd | cycling,cycling,cycling,cycling      |
+            | a    | d  | ab,bc,cd,cd | cycling,cycling,cycling,cycling         |
-            | d    | a  | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling |
+            | d    | a  | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling    |
-            | c    | a  | bc,ab,ab    | pushing bike,cycling,cycling         |
+            | c    | a  | bc,ab,ab    | pushing bike,cycling,cycling            |
-            | d    | b  | cd,bc,bc    | cycling,pushing bike,pushing bike    |
+            | d    | b  | cd,bc,bc    | cycling,pushing bike,pushing bike       |
    Scenario: Bike - Instructions when pushing bike on footway/pedestrian, etc.
        Given the node map
--- a/features/bicycle/ref.feature
+++ b/features/bicycle/ref.feature
@ -0,0 +1,47 @@
@routing @bicycle @ref @name
 Feature: Bike - Way ref
    Background:
        Given the profile "bicycle"
    Scenario: Bike - Way with both name and ref
        Given the node map
            """
            a b
            """
        And the ways
            | nodes | name         | ref |
            | ab    | Utopia Drive | E7  |
        When I route I should get
            | from | to | route                               | ref   |
            | a    | b  | Utopia Drive,Utopia Drive           | E7,E7 |
    Scenario: Bike - Way with only ref
        Given the node map
            """
            a b
            """
        And the ways
            | nodes | name | ref |
            | ab    |      | E7  |
        When I route I should get
            | from | to | route | ref   |
            | a    | b  | ,     | E7,E7 |
    Scenario: Bike - Way with only name
        Given the node map
            """
            a b
            """
        And the ways
            | nodes | name         |
            | ab    | Utopia Drive |
        When I route I should get
            | from | to | route                     |
            | a    | b  | Utopia Drive,Utopia Drive |
--- a/features/bicycle/restrictions.feature
+++ b/features/bicycle/restrictions.feature
@ -5,10 +5,7 @@ Feature: Bike - Turn restrictions
    Background:
        Given the profile "bicycle"
        Given a grid size of 200 meters
    # check to see if bicycle profiles handle relations. The code path is the same as in cars.
    # If relations are passed, all variants tested in car also work for bike
    @no_turning
    Scenario: Bike - No left turn
        Given the node map
@ -35,7 +32,188 @@ Feature: Bike - Turn restrictions
            | s    | n  | sj,nj,nj |
            | s    | e  | sj,ej,ej |
-    ## exceptions are different for bike over car and need to be tested here
+    @no_turning
    Scenario: Bike - No right turn
        Given the node map
            """
              n
            w j e
              s
            """
        And the ways
            | nodes | oneway | foot |
            | sj    | yes    | no   |
            | nj    | -1     | no   |
            | wj    | -1     | no   |
            | ej    | -1     | no   |
        And the relations
            | type        | way:from | way:to | node:via | restriction   |
            | restriction | sj       | ej     | j        | no_right_turn |
        When I route I should get
            | from | to | route    |
            | s    | w  | sj,wj,wj |
            | s    | n  | sj,nj,nj |
            | s    | e  | sj,ej,ej |
    @no_turning
    Scenario: Bike - No u-turn
        Given the node map
            """
              n
            w j e
              s
            """
        And the ways
            | nodes | oneway | foot |
            | sj    | yes    | no   |
            | nj    | -1     | no   |
            | wj    | -1     | no   |
            | ej    | -1     | no   |
        And the relations
            | type        | way:from | way:to | node:via | restriction |
            | restriction | sj       | wj     | j        | no_u_turn   |
        When I route I should get
            | from | to | route    |
            | s    | w  | sj,wj,wj |
            | s    | n  | sj,nj,nj |
            | s    | e  | sj,ej,ej |
    @no_turning
    Scenario: Bike - Handle any no_* relation
        Given the node map
            """
              n
            w j e
              s
            """
        And the ways
            | nodes | oneway | foot |
            | sj    | yes    | no   |
            | nj    | -1     | no   |
            | wj    | -1     | no   |
            | ej    | -1     | no   |
        And the relations
            | type        | way:from | way:to | node:via | restriction      |
            | restriction | sj       | wj     | j        | no_weird_zigzags |
        When I route I should get
            | from | to | route    |
            | s    | w  | sj,wj,wj |
            | s    | n  | sj,nj,nj |
            | s    | e  | sj,ej,ej |
    @only_turning
    Scenario: Bike - Only left turn
        Given the node map
            """
              n
            w j e
              s
            """
        And the ways
            | nodes | oneway | foot |
            | sj    | yes    | no   |
            | nj    | -1     | no   |
            | wj    | -1     | no   |
            | ej    | -1     | no   |
        And the relations
            | type        | way:from | way:to | node:via | restriction    |
            | restriction | sj       | wj     | j        | only_left_turn |
        When I route I should get
            | from | to | route    |
            | s    | w  | sj,wj,wj |
            | s    | n  | sj,nj,nj |
            | s    | e  | sj,ej,ej |
    @only_turning
    Scenario: Bike - Only right turn
        Given the node map
            """
              n
            w j e
              s
            """
        And the ways
            | nodes | oneway | foot |
            | sj    | yes    | no   |
            | nj    | -1     | no   |
            | wj    | -1     | no   |
            | ej    | -1     | no   |
        And the relations
            | type        | way:from | way:to | node:via | restriction     |
            | restriction | sj       | ej     | j        | only_right_turn |
        When I route I should get
            | from | to | route    |
            | s    | w  | sj,wj,wj |
            | s    | n  | sj,nj,nj |
            | s    | e  | sj,ej,ej |
    @only_turning
    Scenario: Bike - Only straight on
        Given the node map
            """
              n
            w j e
              s
            """
        And the ways
            | nodes | oneway | foot |
            | sj    | yes    | no   |
            | nj    | -1     | no   |
            | wj    | -1     | no   |
            | ej    | -1     | no   |
        And the relations
            | type        | way:from | way:to | node:via | restriction      |
            | restriction | sj       | nj     | j        | only_straight_on |
        When I route I should get
            | from | to | route    |
            | s    | w  | sj,wj,wj |
            | s    | n  | sj,nj,nj |
            | s    | e  | sj,ej,ej |
    @no_turning
    Scenario: Bike - Handle any only_* restriction
        Given the node map
            """
              n
            w j e
              s
            """
        And the ways
            | nodes | oneway | foot |
            | sj    | yes    | no   |
            | nj    | -1     | no   |
            | wj    | -1     | no   |
            | ej    | -1     | no   |
        And the relations
            | type        | way:from | way:to | node:via | restriction        |
            | restriction | sj       | nj     | j        | only_weird_zigzags |
        When I route I should get
            | from | to | route    |
            | s    | w  | sj,wj,wj |
            | s    | n  | sj,nj,nj |
            | s    | e  | sj,ej,ej |
    @except
    Scenario: Bike - Except tag and on no_ restrictions
        Given the node map
--- a/features/bicycle/safety.feature
+++ b/features/bicycle/safety.feature
@ -1,104 +0,0 @@
@routing @bicycle @safety
 Feature: Bicycle - Adds penalties to unsafe roads
    Background:
        Given the profile file "bicycle" initialized with
        """
        profile.properties.weight_name = 'cyclability'
        """
    Scenario: Bike - Apply penalties to ways without cycleways
        Then routability should be
            | highway        | cycleway | forw       | backw      | forw_rate | backw_rate |
            | motorway       |          |            |            |           |            |
            | primary        |          | 15 km/h    | 15 km/h    |       2.1 |        2.1 |
            | secondary      |          | 15 km/h    | 15 km/h    |       2.7 |        2.7 |
            | tertiary       |          | 15 km/h    | 15 km/h    |       3.3 |        3.3 |
            | primary_link   |          | 15 km/h    | 15 km/h    |       2.1 |        2.1 |
            | secondary_link |          | 15 km/h    | 15 km/h    |       2.7 |        2.7 |
            | tertiary_link  |          | 15 km/h    | 15 km/h    |       3.3 |        3.3 |
            | residential    |          | 15 km/h    | 15 km/h    |       4.2 |        4.2 |
            | cycleway       |          | 15 km/h    | 15 km/h    |       4.2 |        4.2 |
            | footway        |          | 4 km/h +-1 | 4 km/h +-1 |       1.1 |        1.1 |
    Scenario: Bike - Apply no penalties to ways with cycleways
        Then routability should be
            | highway        | cycleway    | forw    | backw   | forw_rate | backw_rate |
            | motorway       | track       | 15 km/h |         |       4.2 |            |
            | primary        | track       | 15 km/h | 15 km/h |       4.2 |        4.2 |
            | secondary      | track       | 15 km/h | 15 km/h |       4.2 |        4.2 |
            | tertiary       | track       | 15 km/h | 15 km/h |       4.2 |        4.2 |
            | primary_link   | track       | 15 km/h | 15 km/h |       4.2 |        4.2 |
            | secondary_link | track       | 15 km/h | 15 km/h |       4.2 |        4.2 |
            | 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       | 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 |
            | tertiary       | lane        | 15 km/h | 15 km/h |       4.2 |        4.2 |
            | 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        | 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 |            |
            | primary        | shared_lane | 15 km/h | 15 km/h |       4.2 |        4.2 |
    Scenario: Bike - Apply no penalties to ways in direction of cycleways
        Then routability should be
            | highway        | cycleway:right | cycleway:left | forw        | backw       | forw_rate | backw_rate |
            | motorway       | track          |               | 15 km/h     |             |       4.2 |            |
            | primary        | track          |               | 15 km/h     | 15 km/h     |       4.2 |        2.1 |
            | secondary      | track          |               | 15 km/h     | 15 km/h     |       4.2 |        2.7 |
            | tertiary       | track          |               | 15 km/h     | 15 km/h     |       4.2 |        3.3 |
            | primary_link   | track          |               | 15 km/h     | 15 km/h     |       4.2 |        2.1 |
            | secondary_link | track          |               | 15 km/h     | 15 km/h     |       4.2 |        2.7 |
            | 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          |               | 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 |
            | tertiary       |                | track         | 15 km/h     | 15 km/h     |       3.3 |        4.2 |
            | 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         | 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 |            |
            | primary        | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        2.1 |
            | 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           |               | 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 |
            | footway        | lane           |               | 15 km/h     | 4 km/h +-1  |       4.2 |        1.1 |
            | motorway       |                | lane          | 15 km/h     |             |       4.2 |            |
            | 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          | 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 |
            | cycleway       |                | lane          | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
            | 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   | 14 km/h     |             |       4.2 |            |
            | primary        |                | shared_lane   | 15 km/h     | 15 km/h     |       2.1 |        4.2 |
    Scenario: Bike - Don't apply penalties for all kind of cycleways
        Then routability should be
            | highway  | cycleway    | forw    | backw   | forw_rate | backw_rate |
            | tertiary | shared_lane | 15 km/h | 15 km/h |       4.2 |        4.2 |
            | tertiary | lane        | 15 km/h | 15 km/h |       4.2 |        4.2 |
            | tertiary | opposite    | 15 km/h | 15 km/h |       3.3 |        3.3 |
--- a/features/bicycle/startpoint.feature
+++ b/features/bicycle/startpoint.feature
@ -1,53 +0,0 @@
@routing @bicycle @startpoint
 Feature: Bike - Allowed start/end modes
    Background:
        Given the profile "bicycle"
    Scenario: Bike - Don't start/stop on ferries
        Given the node map
            """
            a 1 b 2 c
            """
        And the ways
            | nodes | highway | route | bicycle |
            | ab    | primary |       |         |
            | bc    |         | ferry | yes     |
        When I route I should get
            | from | to | route | modes           |
            | 1    | 2  | ab,ab | cycling,cycling |
            | 2    | 1  | ab,ab | cycling,cycling |
    Scenario: Bike - Don't start/stop on trains
        Given the node map
            """
            a 1 b 2 c
            """
        And the ways
            | nodes | highway | railway | bicycle |
            | ab    | primary |         |         |
            | bc    |         | train   | yes     |
        When I route I should get
            | from | to | route | modes           |
            | 1    | 2  | ab,ab | cycling,cycling |
            | 2    | 1  | ab,ab | cycling,cycling |
    Scenario: Bike - OK to start pushing bike
        Given the node map
            """
            a 1 b 2 c
            """
        And the ways
            | nodes | highway |
            | ab    | primary |
            | bc    | steps   |
        When I route I should get
            | from | to | route    | modes                             |
            | 1    | 2  | ab,bc,bc | cycling,pushing bike,pushing bike |
            | 2    | 1  | bc,ab,ab | pushing bike,cycling,cycling      |
--- a/features/bicycle/surface.feature
+++ b/features/bicycle/surface.feature
@ -8,38 +8,29 @@ Feature: Bike - Surfaces
        Then routability should be
            | highway  | surface               | bothw   |
            | cycleway |                       | 48 s    |
-            | cycleway | asphalt               | 47.9 s  |
+            | cycleway | asphalt               | 48 s    |
            | cycleway | chipseal              | 48 s    |
            | cycleway | concrete              | 48 s    |
            | cycleway | concrete_lanes        | 48 s    |
            | cycleway | cobblestone:flattened | 72 s    |
            | cycleway | paving_stones         | 72 s    |
            | cycleway | wood                  | 72 s    |
            | cycleway | metal                 | 72 s    |
            | cycleway | compacted             | 72 s    |
-            | cycleway | fine_gravel           | 72 s    |
+            | cycleway | cobblestone           | 120 s   |
-            | cycleway | ground                | 72 s    |
+            | cycleway | fine_gravel           | 120 s   |
            | cycleway | dirt                  | 90 s    |
            | cycleway | cobblestone           | 102.9 s |
            | cycleway | gravel                | 120 s   |
-            | cycleway | pebblestone           | 120 s   |
+            | cycleway | pebblestone           | 120.1 s |
-            | cycleway | grass_paver           | 120 s   |
+            | cycleway | dirt                  | 120 s   |
            | cycleway | dirt                  | 90 s    |
            | cycleway | earth                 | 120 s   |
            | cycleway | grass                 | 120 s   |
            | cycleway | mud                   | 240 s   |
-            | cycleway | sand                  | 240 s   |
+            | cycleway | sand                  | 240.1 s |
-            | cycleway | woodchips             | 240 s   |
+            | cycleway | sett                  | 72 s    |
            | cycleway | sett                  | 80 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     |         | 55.3 s |
+        | path     |         | 60 s  |
-        | track    |         | 60 s   |
+        | track    |         | 60 s  |
-        | track    | asphalt | 60 s   |
+        | track    | asphalt | 60 s  |
-        | path     | asphalt | 55.4 s |
+        | path     | asphalt | 60 s  |
    Scenario: Bicycle - Surfaces should not make unknown ways routable
        Then routability should be
@ -63,6 +54,6 @@ Feature: Bike - Surfaces
      When I route I should get
        | from | to | route | modes                     | speed   |
        | a    | b  | ab,ab | cycling,cycling           | 15 km/h |
-        | b    | a  | ab,ab | pushing bike,pushing bike | 4 km/h  |
+        | b    | a  | ab,ab | pushing bike,pushing bike | 6 km/h  |
-        | c    | d  | cd,cd | pushing bike,pushing bike | 4 km/h  |
+        | c    | d  | cd,cd | pushing bike,pushing bike | 6 km/h  |
-        | d    | c  | cd,cd | pushing bike,pushing bike | 4 km/h  |
+        | d    | c  | cd,cd | pushing bike,pushing bike | 6 km/h  |
--- a/features/bicycle/train.feature
+++ b/features/bicycle/train.feature
@ -1,71 +1,39 @@
@routing @bicycle @train
 Feature: Bike - Handle ferry routes
 # Bringing bikes on trains and subways
 # We cannot currently use a 'routability' type test, since the bike
 # profile does not allow starting/stopping on trains, and
 # it's not possible to modify the bicycle profile table because it's
 # defined as local.
    Background:
        Given the profile "bicycle"
    Scenario: Bike - Bringing bikes on trains
-        Given the node map
+        Then routability should be
-            """
+            | highway | railway    | bicycle | bothw |
-            a 1 b   c 2 d   e 3 f   g 4 h
+            | primary |            |         | x     |
-            """
+            | (nil)   | train      |         |       |
-
+            | (nil)   | train      | no      |       |
-        And the ways
+            | (nil)   | train      | yes     | x     |
-            | nodes | highway | railway | bicycle |
+            | (nil)   | railway    |         |       |
-            | ab    | primary |         |         |
+            | (nil)   | railway    | no      |       |
-            | cd    | primary |         |         |
+            | (nil)   | railway    | yes     | x     |
-            | ef    | primary |         |         |
+            | (nil)   | subway     |         |       |
-            | gh    | primary |         |         |
+            | (nil)   | subway     | no      |       |
-            | bc    |         | train   |         |
+            | (nil)   | subway     | yes     | x     |
-            | de    |         | train   | yes     |
+            | (nil)   | tram       |         |       |
-            | fg    |         | train   | no      |
+            | (nil)   | tram       | no      |       |
-
+            | (nil)   | tram       | yes     | x     |
-        When I route I should get
+            | (nil)   | light_rail |         |       |
-            | from | to | route       |
+            | (nil)   | light_rail | no      |       |
-            | 1    | 2  |             |
+            | (nil)   | light_rail | yes     | x     |
-            | 2    | 3  | cd,de,ef,ef |
+            | (nil)   | monorail   |         |       |
-            | 3    | 4  |             |
+            | (nil)   | monorail   | no      |       |
-
+            | (nil)   | monorail   | yes     | x     |
-    Scenario: Bike - Bringing bikes on trains, invalid railway tag is accepted if access specified
+            | (nil)   | some_tag   |         |       |
-        Given the node map
+            | (nil)   | some_tag   | no      |       |
-            """
+            | (nil)   | some_tag   | yes     | x     |
            a 1 b   c 2 d   e 3 f   g 4 h
            """
        And the ways
            | nodes | highway | railway     | bicycle |
            | ab    | primary |             |         |
            | cd    | primary |             |         |
            | ef    | primary |             |         |
            | gh    | primary |             |         |
            | bc    |         | invalid_tag |         |
            | de    |         | invalid_tag | yes     |
            | fg    |         | invalid_tag | no      |
        When I route I should get
            | from | to | route |
            | 1    | 2  |       |
            | 2    | 3  | cd,de,ef|
            | 3    | 4  |       |
    @construction
    Scenario: Bike - Don't route on railways under construction
-        Given the node map
+        Then routability should be
-            """
+            | highway | railway      | bicycle | bothw |
-            a 1 b   c 2 d
+            | primary |              |         | x     |
-            """
+            | (nil)   | construction | yes     |       |
        And the ways
            | nodes | highway | railway      | bicycle |
            | ab    | primary |              |         |
            | cd    | primary |              |         |
            | bc    |         | construction | yes     |
        When I route I should get
            | from | to | route |
            | 1    | 2  |       |
--- a/features/bicycle/turn_penalty.feature
+++ b/features/bicycle/turn_penalty.feature
@ -2,41 +2,34 @@
 Feature: Turn Penalties
    Background:
-        Given the profile "bicycle"
+        Given the profile "turnbot"
        Given a grid size of 200 meters
-
+    Scenario: Bike - turns should incur a delay that depend on the angle
    Scenario: Bicycle - Turn penalties on cyclability
        Given the profile file "bicycle" initialized with
        """
        profile.properties.weight_name = 'cyclability'
        """
        Given the node map
            """
-            a--b-----c
+            c d e
-               |
+            b j f
-               |
+            a s g
               d
            e--------f-----------g
                  /
                /
              /
            h
            """
        And the ways
-            | nodes | highway     |
+            | nodes |
-            | abc   | residential |
+            | sj    |
-            | bd    | residential |
+            | ja    |
-            | efg   | residential |
+            | jb    |
-            | fh    | residential |
+            | jc    |
            | jd    |
            | je    |
            | jf    |
            | jg    |
        When I route I should get
-            | from | to | distance  | weight | #                                         |
+            | from | to | route    | time    | distance |
-            | a    | c  | 900m +- 1 | 216    | Going straight has no penalties           |
+            | s    | a  | sj,ja,ja | 39s +-1 | 242m +-1 |
-            | a    | d  | 900m +- 1 | 220.2  | Turning right had penalties               |
+            | s    | b  | sj,jb,jb | 30s +-1 | 200m +-1 |
-            | e    | g  | 2100m +- 5| 503.9  | Going straght has no penalties            |
+            | s    | c  | sj,jc,jc | 29s +-1 | 242m +-1 |
-            | e    | h  | 2100m +- 5| 515.1  | Turn sharp right has even higher penalties|
+            | s    | d  | sj,jd,jd | 20s +-1 | 200m +-1 |
-
+            | s    | e  | sj,je,je | 29s +-1 | 242m +-1 |
            | s    | f  | sj,jf,jf | 30s +-1 | 200m +-1 |
            | s    | g  | sj,jg,jg | 39s +-1 | 242m +-1 |
--- a/features/car/access.feature
+++ b/features/car/access.feature
@ -119,13 +119,12 @@ Feature: Car - Restricted access
            | permissive   | x     |
            | designated   | x     |
            | no           |       |
-            | private      | x     |
+            | private      |       |
            | agricultural |       |
            | forestry     |       |
            | psv          |       |
-            | delivery     | x     |
+            | delivery     |       |
            | some_tag     | x     |
            | destination  | x     |
    Scenario: Car - Access tags on nodes
@ -135,11 +134,11 @@ Feature: Car - Restricted access
            | permissive   | x     |
            | designated   | x     |
            | no           |       |
-            | private      | x     |
+            | private      |       |
            | agricultural |       |
            | forestry     |       |
            | psv          |       |
-            | delivery     | x     |
+            | delivery     |       |
            | some_tag     | x     |
    Scenario: Car - Access tags on both node and way
@ -157,16 +156,15 @@ Feature: Car - Restricted access
    Scenario: Car - Access combinations
        Then routability should be
-            | highway      | access       | vehicle    | motor_vehicle | motorcar    | forw | backw | # |
+            | highway     | accesss      | vehicle    | motor_vehicle | motorcar    | bothw |
-            | runway       | private      |            |               | permissive  | x    | x     |   |
+            | runway      | private      |            |               | permissive  | x     |
-            | primary      | forestry     |            | yes           |             | x    | x     |   |
+            | primary     | forestry     |            | yes           |             | x     |
-            | cycleway     |              |            | designated    |             | x    | x     |   |
+            | cycleway    |              |            | designated    |             | x     |
-            | unclassified |              |            | destination   | destination | x    | x     |   |
+            | residential |              | yes        | no            |             |       |
-            | residential  |              | yes        | no            |             |      |       |   |
+            | motorway    | yes          | permissive |               | private     |       |
-            | motorway     | yes          | permissive |               | private     | x    |       | implied oneway  |
+            | trunk       | agricultural | designated | permissive    | no          |       |
-            | trunk        | agricultural | designated | permissive    | no          |      |       |   |
+            | pedestrian  |              |            |               |             |       |
-            | pedestrian   |              |            |               |             |      |       |   |
+            | pedestrian  |              |            |               | destination | x     |
            | pedestrian   |              |            |               | destination |      |       | temporary disabled #3773 |
    Scenario: Car - Ignore access tags for other modes
        Then routability should be
@ -184,9 +182,9 @@ Feature: Car - Restricted access
    Scenario: Car - designated HOV ways are rated low
        Then routability should be
            | highway | hov        | bothw | forw_rate  | backw_rate  |
-            | primary | designated | x     | 18.2       | 18.2        |
+            | primary | designated | x     | 2          | 2           |
-            | primary | yes        | x     | 18.3       | 18.3        |
+            | primary | yes        | x     | 18         | 18          |
-            | primary | no         | x     | 18.2       | 18.2        |
+            | primary | no         | x     | 18         | 18          |
    # Models:
    # https://www.openstreetmap.org/way/124891268
@ -195,31 +193,30 @@ Feature: Car - Restricted access
    Scenario: Car - I-66 use HOV-only roads with heavy penalty
        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 | designated  | designated\|designated\|designated | 3     | hov        | yes    | x    |       | 3          |
-            | motorway | lane        |                                    | 3     | designated | yes    | x    |       | 25.3       |
+            | motorway | lane        |                                    | 3     | designated | yes    | x    |       | 25         |
    @hov
    Scenario: Car - a way with all lanes HOV-designated is highly penalized by default (similar to hov=designated)
        Then routability should be
            | highway | hov:lanes:forward      | hov:lanes:backward     | hov:lanes              | oneway | forw | backw | forw_rate | backw_rate |
-            | primary | designated             | designated             |                        |        | x    | x     | 18.2      | 18.2       |
+            | primary | designated             | designated             |                        |        | x    | x     | 2         | 2          |
-            # 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          |
-            #| primary |                        | designated             |                        |        | x    | x     | 18.2      | 18.2       |
+            | primary | designated             |                        |                        |        | x    | x     | 2         | 18         |
-            #| primary | designated             |                        |                        |        | x    | x     | 18.2      | 18.2       |
+            | primary | designated\|designated | designated\|designated |                        |        | x    | x     | 2         | 2          |
-            | primary | designated\|designated | designated\|designated |                        |        | x    | x     | 18.3      | 18.3       |
+            | primary | designated\|no         | designated\|no         |                        |        | x    | x     | 18        | 18         |
-            | primary | designated\|no         | designated\|no         |                        |        | x    | x     | 18.2      | 18.2       |
+            | primary | yes\|no                | yes\|no                |                        |        | x    | x     | 18        | 18         |
-            | primary | yes\|no                | yes\|no                |                        |        | x    | x     | 18.2      | 18.2       |
+            | primary |                        |                        |                        |        | x    | x     | 18        | 18         |
-            | primary |                        |                        |                        |        | x    | x     | 18.2      | 18.2       |
+            | primary | designated             |                        |                        | -1     |      | x     |           | 18         |
-            | primary | designated             |                        |                        | -1     |      | x     |           | 18.2       |
+            | primary |                        | designated             |                        | -1     |      | x     |           | 2          |
-            | primary |                        | designated             |                        | -1     |      | x     |           | 18.2       |
+            | primary |                        |                        | designated             | yes    | x    |       | 2         |            |
-            | primary |                        |                        | designated             | yes    | x    |       | 18.2      |            |
+            | primary |                        |                        | designated             | -1     |      | x     |           | 2          |
-            | primary |                        |                        | designated             | -1     |      | x     |           | 18.2       |
+            | primary |                        |                        | designated\|           | yes    | x    |       | 18        |            |
-            | primary |                        |                        | designated\|           | yes    | x    |       | 18.2      |            |
+            | primary |                        |                        | designated\|           | -1     |      | x     |           | 18         |
-            | primary |                        |                        | designated\|           | -1     |      | x     |           | 18.2       |
+            | primary |                        |                        | designated\|designated | yes    | x    |       | 2         |            |
-            | primary |                        |                        | designated\|designated | yes    | x    |       | 18.2      |            |
+            | primary |                        |                        | designated\|designated | -1     |      | x     |           | 2          |
-            | primary |                        |                        | designated\|designated | -1     |      | x     |           | 18.2       |
+            | primary |                        |                        | designated\|yes        | yes    | x    |       | 18        |            |
-            | primary |                        |                        | designated\|yes        | yes    | x    |       | 18.2      |            |
+            | primary |                        |                        | designated\|no         | -1     |      | x     |           | 18         |
            | primary |                        |                        | designated\|no         | -1     |      | x     |           | 18.2       |
     Scenario: Car - these toll roads always work
        Then routability should be
@ -227,10 +224,12 @@ Feature: Car - Restricted access
            | primary | no          | x     |
            | primary | snowmobile  | x     |
-     Scenario: Car - toll=yes ways are enabled by default
+     # To test this we need issue #2781
     @todo
     Scenario: Car - only toll=yes ways are ignored by default
        Then routability should be
            | highway | toll        | bothw |
-            | primary | yes         | x     |
+            | primary | yes         |       |
    Scenario: Car - directional access tags
        Then routability should be
@ -253,7 +252,7 @@ Feature: Car - Restricted access
            | gate         | yes        | x     |
            | gate         | permissive | x     |
            | gate         | designated | x     |
-            | gate         | private    | x     |
+            | gate         | private    |       |
            | gate         | garbagetag | x     |
    Scenario: Car - a way with conditional access
@ -263,11 +262,9 @@ Feature: Car - Restricted access
    Scenario: Car - a way with a list of tags
        Then routability should be
-            | highway | motor_vehicle            | motor_vehicle:forward | motor_vehicle:backward | forw | backw | # |
+            | highway | motor_vehicle            | motor_vehicle:forward | motor_vehicle:backward | forw | backw |
-            | primary |                          | no                    | destination            |      | x     |   |
+            | footway |                          |                       | destination            |      | x     |
-            | primary | destination;agricultural | destination           |                        | x    | x     |   |
+            | track   | destination;agricultural | destination           |                        | x    | x     |
            | footway |                          |                       | destination            |      |       | temporary #3373 |
            | track   | destination;agricultural | destination           |                        |      | x     | temporary #3373 |
    Scenario: Car - Don't route over steps even if marked as accessible
        Then routability should be
@ -283,25 +280,3 @@ Feature: Car - Restricted access
            | steps      | permissive |       |
            | footway    | permissive | x     |
            | garbagetag | permissive | x     |
    Scenario: Car - Access private blacklist
        Then routability should be
            | highway    | access     | bothw |
            | footway    | yes        |   x   |
            | pedestrian | private    |       |
            | footway    | private    |       |
            | service    | private    |       |
            | cycleway   | private    |       |
            | track      | private    |       |
            | footway    | customers  |       |
    Scenario: Car - Access blacklist
        Then routability should be
            | highway    | access       | bothw |
            | primary    |              |   x   |
            | primary    | emergency    |       |
            | primary    | forestry     |       |
            | primary    | agricultural |       |
            | primary    | psv          |       |
            | primary    | no           |       |
            | primary    | customers    |   x   |
--- a/features/car/avoid.feature
+++ b/features/car/avoid.feature
@ -1,23 +0,0 @@
@routing @car @way
 Feature: Car - Avoid defined areas
    Background:
        Given the profile file "car" initialized with
        """
        profile.avoid = Set { 'motorway', 'motorway_link' }
        profile.speeds = Sequence {
            highway = {
                motorway      = 90,
                motorway_link = 45,
                primary       = 50
            }
        }
        """
    Scenario: Car - Avoid motorways
        Then routability should be
            | highway        | bothw |
            | motorway       |       |
            | motorway_link  |       |
            | primary        | x     |
--- a/features/car/barrier.feature
+++ b/features/car/barrier.feature
@ -29,14 +29,14 @@ Feature: Car - Barriers
            | gate         | permissive    | x     |
            | gate         | designated    | x     |
            | gate         | no            |       |
-            | gate         | private       | x     |
+            | gate         | private       |       |
            | gate         | agricultural  |       |
            | wall         |               |       |
            | wall         | yes           | x     |
            | wall         | permissive    | x     |
            | wall         | designated    | x     |
            | wall         | no            |       |
-            | wall         | private       | x     |
+            | wall         | private       |       |
            | wall         | agricultural  |       |
    Scenario: Car - Rising bollard exception for barriers
@ -45,23 +45,3 @@ Feature: Car - Barriers
            | bollard      |               |       |
            | bollard      | rising        | x     |
            | bollard      | removable     |       |
    # https://github.com/Project-OSRM/osrm-backend/issues/5996
    Scenario: Car - Kerb exception for barriers
        Then routability should be
            | node/barrier | node/highway  | node/kerb  | bothw |
            | kerb         |               |            |       |
            | kerb         | crossing      |            |  x    |
            | kerb         | crossing      | yes        |  x    |
            | kerb         |               | lowered    |  x    |
            | kerb         |               | flush      |  x    |
            | kerb         |               | raised     |       |
            | kerb         |               | yes        |       |
    Scenario: Car - Height restrictions
        Then routability should be
            | node/barrier      | node/maxheight | bothw |
            | height_restrictor |                | x     |
            | height_restrictor |              1 |       |
            | height_restrictor |              3 | x     |
            | height_restrictor |        default | x     |
--- a/features/car/bridge.feature
+++ b/features/car/bridge.feature
@ -3,7 +3,6 @@ Feature: Car - Handle driving
    Background:
        Given the profile "car"
        Given a grid size of 200 meters
    Scenario: Car - Use a ferry route
        Given the node map
@ -16,13 +15,19 @@ Feature: Car - Handle driving
        And the ways
            | nodes | highway | bridge  | bicycle |
            | abc   | primary |         |         |
-            | cde   | primary | movable | yes     |
+            | cde   |         | movable | yes     |
            | efg   | primary |         |         |
        When I route I should get
-            | from | to | route           | modes                           | turns                                      |
+            | from | to | route           | modes                           |
-            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving | depart,new name right,new name left,arrive |
+            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving |
-            | e    | a  | cde,abc,abc     | driving,driving,driving         | depart,new name left,arrive                |
+            | b    | f  | abc,cde,efg,efg | driving,driving,driving,driving |
            | e    | c  | cde,cde         | driving,driving                 |
            | e    | b  | cde,abc,abc     | driving,driving,driving         |
            | e    | a  | cde,abc,abc     | driving,driving,driving         |
            | c    | e  | cde,cde         | driving,driving                 |
            | c    | f  | cde,efg,efg     | driving,driving,driving         |
            | c    | g  | cde,efg,efg     | driving,driving,driving         |
    Scenario: Car - Control test without durations, osrm uses movable bridge speed to calculate duration
        Given the node map
@ -35,13 +40,15 @@ Feature: Car - Handle driving
        And the ways
            | nodes | highway | bridge  |
            | abc   | primary |         |
-            | cde   | primary | movable |
+            | cde   |         | movable |
            | efg   | primary |         |
        When I route I should get
-            | from | to | route           | modes                           | speed   | time     | turns                                      |
+            | from | to | route           | modes                           | speed   | time     |
-            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving | 13 km/h | 332s +-1 | depart,new name right,new name left,arrive |
+            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving | 12 km/h | 173s +-1 |
-            | e    | c  | cde,cde         | driving,driving                 | 5 km/h  | 288s +-1 | depart,arrive                              |
+            | b    | f  | abc,cde,efg,efg | driving,driving,driving,driving | 9 km/h  | 162s +-1 |
            | c    | e  | cde,cde         | driving,driving                 | 5 km/h  | 146s +-1 |
            | e    | c  | cde,cde         | driving,driving                 | 5 km/h  | 149s +-1 |
    Scenario: Car - Properly handle durations
        Given the node map
@ -54,11 +61,12 @@ Feature: Car - Handle driving
        And the ways
            | nodes | highway | bridge  | duration |
            | abc   | primary |         |          |
-            | cde   | primary | movable | 00:10:00 |
+            | cde   |         | movable | 00:05:00 |
            | efg   | primary |         |          |
        When I route I should get
-            | from | to | route           | modes                           | speed  | turns                                      |
+            | from | to | route           | modes                           | speed  |
-            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving | 7 km/h | depart,new name right,new name left,arrive |
+            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving | 7 km/h |
-            | c    | e  | cde,cde         | driving,driving                 | 2 km/h | depart,arrive                              |
+            | b    | f  | abc,cde,efg,efg | driving,driving,driving,driving | 5 km/h |
-            | e    | c  | cde,cde         | driving,driving                 | 2 km/h | depart,arrive                              |
+            | c    | e  | cde,cde         | driving,driving                 | 2 km/h |
            | e    | c  | cde,cde         | driving,driving                 | 2 km/h |
--- a/features/car/classes.feature
+++ b/features/car/classes.feature
@ -1,165 +0,0 @@
@routing @car @mode
 Feature: Car - Mode flag
    Background:
        Given the profile "car"
    Scenario: Car - We tag ferries with a class
        Given the node map
            """
            a b
              c d
            """
        And the ways
            | nodes | highway | route |
            | ab    | primary |       |
            | bc    |         | ferry |
            | cd    | primary |       |
        When I route I should get
            | from | to | route       | turns                                              | classes                  |
            | a    | d  | ab,bc,cd,cd | depart,notification right,notification left,arrive | [()],[(ferry)],[()],[()] |
            | d    | a  | cd,bc,ab,ab | depart,notification right,notification left,arrive | [()],[(ferry)],[()],[()] |
            | c    | a  | bc,ab,ab    | depart,notification left,arrive                    | [(ferry)],[()],[()]      |
            | d    | b  | cd,bc,bc    | depart,notification right,arrive                   | [()],[(ferry)],[()]      |
            | a    | c  | ab,bc,bc    | depart,notification right,arrive                   | [()],[(ferry)],[()]      |
            | b    | d  | bc,cd,cd    | depart,notification left,arrive                    | [(ferry)],[()],[()]      |
    Scenario: Car - We tag motorways with a class
        Given the node map
            """
            a b
              c d
            """
        And the ways
            | nodes | highway |
            | ab    | primary |
            | bc    | motorway|
            | cd    | primary |
        When I route I should get
            | from | to | route    | turns         | classes                 |
            | a    | d  | ab,cd    | depart,arrive | [(),(motorway),()],[()] |
            | a    | c  | ab,bc    | depart,arrive | [(),(motorway)],[()]    |
            | b    | d  | bc,cd    | depart,arrive | [(motorway),()],[()]    |
    Scenario: Car - We tag motorway_link with a class
        Given the node map
            """
            a b
              c d
            """
        And the ways
            | nodes | highway       |
            | ab    | primary       |
            | bc    | motorway_link |
            | cd    | primary       |
        When I route I should get
            | from | to | route    | turns                       | classes                   | #                                |
            | a    | d  | ab,bc,cd | depart,on ramp right,arrive | [()],[(motorway),()],[()] | on-ramp at class change          |
            | a    | c  | ab,bc,bc | depart,on ramp right,arrive | [()],[(motorway)],[()]    |    "                "            |
            | b    | d  | bc,cd    | depart,arrive               | [(motorway),()],[()]      | no announcement                  |
    Scenario: Car - We tag restricted with a class
        Given the node map
            """
            a b
              c d
            """
        And the ways
            | nodes | highway | access   |
            | ab    | primary | private  |
            | bc    | motorway| private  |
            | cd    | primary |          |
        When I route I should get
            | from | to | route | turns        | classes                                      |
            | a    | d  | ab,cd | depart,arrive| [(restricted),(motorway,restricted),()],[()] |
    Scenario: Car - We tag toll with a class
        Given the node map
            """
            a b
              c d
            """
        And the ways
            | nodes | highway | toll     |
            | ab    | primary | yes      |
            | bc    | motorway| yes      |
            | cd    | primary |          |
        When I route I should get
            | from | to | route    | turns         | classes                          |
            | a    | d  | ab,cd    | depart,arrive | [(toll),(motorway,toll),()],[()] |
    Scenario: Car - We tag tunnel with a class
        Background:
            Given a grid size of 200 meters
        Given the node map
            """
            a b
              c d
            """
        And the ways
            | nodes | tunnel               |
            | ab    | no                   |
            | bc    | yes                  |
            | cd    |                      |
        When I route I should get
            | from | to | route       | turns                                      | classes                   |
            | a    | d  | ab,bc,cd,cd | depart,new name right,new name left,arrive | [()],[(tunnel)],[()],[()] |
    Scenario: Car - We tag classes without intersections
        Background:
            Given a grid size of 200 meters
        Given the node map
            """
            a b c d
            """
        And the ways
            | nodes | name | tunnel |
            | ab    | road |        |
            | bc    | road | yes    |
            | cd    | road |        |
        When I route I should get
          | from | to | route     | turns         | classes               |
          | a    | d  | road,road | depart,arrive | [(),(tunnel),()],[()] |
    Scenario: Car - From roundabout on toll road
        Given the node map
            """
                     c
                  /     \
            a---b         d---f
                  \     /
                     e
                     |
                     g
            """
        And the ways
            | nodes | oneway | highway | junction   | toll     |
            | ab    | yes    | primary |            |          |
            | cb    | yes    | primary | roundabout |          |
            | dc    | yes    | primary | roundabout |          |
            | be    | yes    | primary | roundabout |          |
            | ed    | yes    | motorway| roundabout |          |
            | eg    | yes    | primary |            |          |
            | df    | yes    | motorway|            | yes      |
        When I route I should get
            | from | to | route       | turns                                                        | classes                                     |
            | a    | f  | ab,df,df,df | depart,roundabout-exit-2,exit roundabout slight right,arrive | [()],[(),(motorway)],[(toll,motorway)],[()] |
--- a/features/car/conditional_restrictions.feature
+++ b/features/car/conditional_restrictions.feature
@ -1,876 +0,0 @@
@routing @car @restrictions
 Feature: Car - Turn restrictions
 # Handle turn restrictions as defined by http://wiki.openstreetmap.org/wiki/Relation:restriction
 # Note that if u-turns are allowed, turn restrictions can lead to suprising, but correct, routes.
    Background: Use car routing
        Given the profile "car"
        Given a grid size of 200 meters
        Given the origin -9.2972,10.3811
        # coordinate in Guinée, a country that observes GMT year round
    @no_turning @conditionals
    Scenario: Car - ignores unrecognized restriction
        Given the extract extra arguments "--parse-conditional-restrictions"
                                            # time stamp for 10am on Tues, 02 May 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
              a
            d j b
              c
            """
        And the ways
            | nodes | oneway |
            | aj    | no     |
            | jc    | no     |
            | bj    | yes    |
            | jd    | yes    |
        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional                |
            | restriction | bj       | aj     | j        | only_right_turn @ (has_pygmies > 10 p) |
        When I route I should get
            | from | to | route    |
            | b    | c  | bj,jc,jc |
            | b    | a  | bj,aj,aj |
            | b    | d  | bj,jd,jd |
    @no_turning @conditionals
    Scenario: Car - Restriction would be on, but the restriction was badly tagged
        Given the extract extra arguments "--parse-conditional-restrictions"
                                            # time stamp for 10am on Tues, 02 May 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
              a
           p  |
            \ |
              j
              | \
              c  m
            """
        And the ways
            | nodes |
            | aj    |
            | jc    |
            | pjm   |
        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional             |
            | restriction | aj       | pjm    | j        | no_left_turn @ (Mo-Fr 07:00-10:30)  |
            | restriction | jc       | pjm    | j        | no_right_turn @ (Mo-Fr 07:00-10:30) |
        When I route I should get
            | from | to | route      |
            | a    | m  | aj,pjm,pjm |
            | c    | m  | jc,pjm,pjm |
    @no_turning @conditionals
    Scenario: Car - Restriction With Compressed Geometry
        Given the extract extra arguments "--parse-conditional-restrictions"
                                            # time stamp for 10am on Tues, 02 May 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
            n
            |
            i
            |
            j-k-l-m
            |
            s
            """
        And the ways
            | nodes |
            | nij   |
            | js    |
            | jklm  |
        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional             |
            | restriction | nij      | jklm   | j        | no_left_turn @ (Mo-Fr 07:00-10:30)  |
        When I route I should get
            | from | to | route               |
            | n    | m  | nij,js,js,jklm,jklm |
    @no_turning @conditionals
    Scenario: Car - Restriction With Compressed Geometry and Traffic Signal
        Given the extract extra arguments "--parse-conditional-restrictions"
                                            # time stamp for 10am on Tues, 02 May 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
            n
            |
            i
            |
            j-k-l-m
            |
            s
            """
        And the ways
            | nodes |
            | nij   |
            | js    |
            | jklm  |
        And the nodes
            | node | highway        |
            | i    | traffic_signal |
            | k    | traffic_signal |
        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional             |
            | restriction | nij      | jklm   | j        | no_left_turn @ (Mo-Fr 07:00-10:30)  |
        When I route I should get
            | from | to | route               |
            | n    | m  | nij,js,js,jklm,jklm |
    @no_turning @conditionals
    Scenario: Car - ignores except restriction
        Given the extract extra arguments "--parse-conditional-restrictions"
                                            # time stamp for 10am on Tues, 02 May 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
              a
            d j b
              c
            """
        And the ways
            | nodes | oneway |
            | aj    | no     |
            | jc    | no     |
            | bj    | no     |
            | jd    | no     |
        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional               | except   |
            | restriction | bj       | aj     | j        | only_right_turn @ (Mo-Su 08:00-12:00) | motorcar |
            | restriction | jd       | aj     | j        | only_left_turn @ (Mo-Su 08:00-12:00)  | bus      |
        When I route I should get
            | from | to | route          | # |
            | b    | c  | bj,jc,jc       |   |
            | b    | a  | bj,aj,aj       | restriction does not apply to cars |
            | b    | d  | bj,jd,jd       |   |
            | d    | c  | jd,aj,aj,jc,jc | restriction excepting busses still applies to cars  |
    @no_turning @conditionals
    Scenario: Car - only_right_turn
        Given the extract extra arguments "--parse-conditional-restrictions"
                                            # time stamp for 10am on Tues, 02 May 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
              a
            d j b
              c
            """
        And the ways
            | nodes | oneway |
            | aj    | no     |
            | jc    | no     |
            | bj    | yes    |
            | jd    | yes    |
        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional               |
            | restriction | bj       | aj     | j        | only_right_turn @ (Mo-Su 07:00-14:00) |
        When I route I should get
            | from | to | route          |
            | b    | c  | bj,aj,aj,jc,jc |
            | b    | a  | bj,aj,aj       |
            | b    | d  | bj,aj,aj,jd,jd |
    @no_turning @conditionals
    Scenario: Car - No right turn
        Given the extract extra arguments "--parse-conditional-restrictions"
                                            # time stamp for 10am on Tues, 02 May 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
              a
            d j b
              c
            """
        And the ways
            | nodes | oneway |
            | aj    | no     |
            | jc    | no     |
            | bj    | yes    |
            | jd    | yes    |
        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional               |
            | restriction | bj       | aj     | j        | no_right_turn @ (Mo-Fr 07:00-13:00)   |
        When I route I should get
            | from | to | route          | # |
            | b    | c  | bj,jc,jc       | normal turn |
            | b    | a  | bj,jc,jc,aj,aj | avoids right turn |
            | b    | d  | bj,jd,jd       | normal maneuver |
    @only_turning @conditionals
    Scenario: Car - only_left_turn
        Given the extract extra arguments "--parse-conditional-restrictions"
                                            # time stamp for 10am on Tues, 02 May 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
              a
            d j b
              c
            """
        And the ways
            | nodes | oneway |
            | aj    | no     |
            | jc    | no     |
            | bj    | yes    |
            | jd    | yes    |
        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional              |
            | restriction | bj       | jc     | j        | only_left_turn @ (Mo-Fr 07:00-16:00) |
        When I route I should get
            | from | to | route          |
            | b    | c  | bj,jc,jc       |
            | b    | a  | bj,jc,jc,aj,aj |
            | b    | d  | bj,jc,jc,jd,jd |
    @no_turning @conditionals
    Scenario: Car - No left turn
        Given the extract extra arguments "--parse-conditional-restrictions"
                                            # time stamp for 10am on Tues, 02 May 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
              a
            d j b
              c
            """
        And the ways
            | nodes | oneway |
            | aj    | no     |
            | jc    | no     |
            | bj    | yes    |
            | jd    | yes    |
        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional            |
            | restriction | bj       | jc     | j        | no_left_turn @ (Mo-Su 00:00-23:59) |
        When I route I should get
            | from | to | route          |
            | b    | c  | bj,aj,aj,jc,jc |
            | b    | a  | bj,aj,aj       |
            | b    | d  | bj,jd,jd       |
    @no_turning @conditionals
    Scenario: Car - Conditional restriction is off
        Given the extract extra arguments "--parse-conditional-restrictions"
                                            # time stamp for 10am on Tues, 02 May 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
              a
            d j b
              c
            """
        And the ways
            | nodes | oneway |
            | aj    | no     |
            | jc    | no     |
            | bj    | yes    |
            | jd    | yes    |
        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional             |
            | restriction | bj       | aj     | j        | no_right_turn @ (Mo-Su 16:00-20:00) |
        When I route I should get
            | from | to | route    |
            | b    | c  | bj,jc,jc |
            | b    | a  | bj,aj,aj |
            | b    | d  | bj,jd,jd |
    @no_turning @conditionals
    Scenario: Car - Conditional restriction is on
        Given the extract extra arguments "--parse-conditional-restrictions"
        # 10am utc, wed
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493805600"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493805600"
        Given the node map
            """
              a
            d j b
              c
            """
        And the ways
            | nodes | oneway |
            | aj    | no     |
            | jc    | no     |
            | bj    | yes    |
            | jd    | yes    |
        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional             |
            | restriction | bj       | aj     | j        | no_right_turn @ (Mo-Fr 07:00-14:00) |
        When I route I should get
            | from | to | route          |
            | b    | c  | bj,jc,jc       |
            | b    | a  | bj,jc,jc,aj,aj |
            | b    | d  | bj,jd,jd       |
    @no_turning @conditionals
    Scenario: Car - Conditional restriction with multiple time windows
        Given the extract extra arguments "--parse-conditional-restrictions"
        # 5pm Wed 02 May, 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
        Given the node map
            """
              a
           p  |
            \ |
              j
              | \
              c  m
            """
        And the ways
            | nodes | oneway |
            | aj    | no     |
            | jc    | no     |
            | jp    | yes    |
            | mj    | yes    |
        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional                         |
            | restriction | aj       | jp     | j        | no_right_turn @ (Mo-Fr 07:00-11:00,16:00-18:30) |
        When I route I should get
            | from | to | route          |
            | a    | p  | aj,jc,jc,jp,jp |
            | m    | p  | mj,jp,jp       |
    @no_turning @conditionals
    Scenario: Car - Multiple conditional restrictions applicable to same turn
        Given the extract extra arguments "--parse-conditional-restrictions"
                                            # time stamp for 10am on Tues, 02 May 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
                j
                |
            k - l - m
                |
                n
            """
        And the ways
            | nodes |
            | kl    |
            | jl    |
            | ln    |
            | lm    |
        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional               |
            | restriction | kl       | lj     | l        | only_left_turn @ (Sa-Su 07:00-10:30)  |
            | restriction | kl       | ln     | l        | only_right_turn @ (Mo-Fr 07:00-10:30) |
        When I route I should get
            | from | to | route          |
            | k    | m  | kl,ln,ln,lm,lm |
    @restriction-way
    Scenario: Car - prohibit turn
        Given the extract extra arguments "--parse-conditional-restrictions"
        # 5pm Wed 02 May, 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
        Given the node map
            """
            c
            |
            |   f
            |   |
            b---e
            |   |
            a   d
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
            | be    |
            | de    |
            | ef    |
        And the relations
            | type        | way:from | way:via | way:to | restriction:conditional                         |
            | restriction | ab       | be      | de     | no_right_turn @ (Mo-Fr 07:00-11:00,16:00-18:30) |
        When I route I should get
            | from | to | route             | turns                                                               | locations   |
            | a    | d  | ab,be,ef,ef,de,de | depart,turn right,turn left,continue uturn,new name straight,arrive | a,b,e,f,e,d |
            | a    | f  | ab,be,ef,ef       | depart,turn right,turn left,arrive                                  | a,b,e,f     |
            | c    | d  | bc,be,de,de       | depart,turn left,turn right,arrive                                  | c,b,e,d     |
            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |
    # condition is off
    @restriction-way
    Scenario: Car - prohibit turn
        Given the extract extra arguments "--parse-conditional-restrictions"
        # time stamp for 12am on Tues, 02 May 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493726400"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493726400"
        Given the node map
            """
            c
            |
            |   f
            |   |
            b---e
            |   |
            a   d
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
            | be    |
            | de    |
            | ef    |
        And the relations
            | type        | way:from | way:via | way:to | restriction:conditional                         |
            | restriction | ab       | be      | de     | no_right_turn @ (Mo-Fr 07:00-11:00,16:00-18:30) |
        When I route I should get
            | from | to | route       |
            | a    | d  | ab,be,de,de |
            | a    | f  | ab,be,ef,ef |
            | c    | d  | bc,be,de,de |
            | c    | f  | bc,be,ef,ef |
    # https://www.openstreetmap.org/#map=18/38.91099/-77.00888
    @no_turning @conditionals
    Scenario: Car - DC North capitol situation, two on one off
        Given the extract extra arguments "--parse-conditional-restrictions"
        # 9pm Wed 02 May, 2017 UTC, 5pm EDT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493845200"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493845200"
        #    """
        #      a h
        #   d
        #      b g
        #           e
        #      c f
        #    """
        Given the node locations
            | node | lat     | lon      |
            | a    | 38.91124 | -77.00909 |
            | b    | 38.91080 | -77.00909 |
            | c    | 38.91038 | -77.00909 |
            | d    | 38.91105 | -77.00967 |
            | e    | 38.91037 | -77.00807 |
            | f    | 38.91036 | -77.00899 |
            | g    | 38.91076 | -77.00901 |
            | h    | 38.91124 | -77.00900 |
        And the ways
            | nodes | oneway | name       |
            | ab    | yes    | cap south  |
            | bc    | yes    | cap south  |
            | fg    | yes    | cap north  |
            | gh    | yes    | cap north  |
            | db    | no     | florida nw |
            | bg    | no     | florida    |
            | ge    | no     | florida ne |
        And the relations
            | type        | way:from  | way:to  | node:via | restriction:conditional                        |
            | restriction | ab        | bg      | b        | no_left_turn @ (Mo-Fr 07:00-09:30,16:00-18:30) |
            | restriction | fg        | bg      | g        | no_left_turn @ (Mo-Fr 06:00-10:00)             |
            | restriction | bg        | bc      | b        | no_left_turn @ (Mo-Fr 07:00-09:30,16:00-18:30) |
        When I route I should get
            | from | to | route                                      | turns                                       |
            | a    | e  | cap south,florida nw,florida nw,florida ne | depart,turn right,continue uturn,arrive     |
            | f    | d  | cap north,florida nw,florida nw            | depart,turn left,arrive                     |
            | e    | c  | florida ne,florida nw,cap south,cap south  | depart,continue uturn,turn right,arrive     |
    @no_turning @conditionals
    Scenario: Car - DC North capitol situation, one on two off
        Given the extract extra arguments "--parse-conditional-restrictions"
        # 10:30am utc, wed, 6:30am est
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493807400"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493807400"
        #    """
        #      a h
        #   d
        #      b g
        #           e
        #      c f
        #    """
        Given the node locations
            | node | lat     | lon      |
            | a    | 38.91124 | -77.00909 |
            | b    | 38.91080 | -77.00909 |
            | c    | 38.91038 | -77.00909 |
            | d    | 38.91105 | -77.00967 |
            | e    | 38.91037 | -77.00807 |
            | f    | 38.91036 | -77.00899 |
            | g    | 38.91076 | -77.00901 |
            | h    | 38.91124 | -77.00900 |
        And the ways
            | nodes | oneway | name       |
            | ab    | yes    | cap south  |
            | bc    | yes    | cap south  |
            | fg    | yes    | cap north  |
            | gh    | yes    | cap north  |
            | db    | no     | florida nw |
            | bg    | no     | florida    |
            | ge    | no     | florida ne |
        And the relations
            | type        | way:from  | way:to  | node:via | restriction:conditional                        |
            | restriction | ab        | bg      | b        | no_left_turn @ (Mo-Fr 07:00-09:30,16:00-18:30) |
            | restriction | fg        | bg      | g        | no_left_turn @ (Mo-Fr 06:00-10:00)             |
            | restriction | bg        | bc      | b        | no_left_turn @ (Mo-Fr 07:00-09:30,16:00-18:30) |
        When I route I should get
            | from | to | route                                      | turns                                         |
            | a    | e  | cap south,florida ne,florida ne            | depart,turn left,arrive                       |
            | f    | d  | cap north,florida ne,florida ne,florida nw | depart,turn sharp right,continue uturn,arrive |
            | e    | c  | florida ne,cap south,cap south             | depart,turn left,arrive                       |
    @only_turning @conditionals
    Scenario: Car - Restriction is always off when point not found in timezone files
        # same test as the following one, but given a different time zone file
        Given the extract extra arguments "--parse-conditional-restrictions"
        # 9am UTC, 10am BST
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493802000"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493802000"
        #    """
        #     a
        #          e
        #      b
        #   d
        #       c
        #    """
        Given the node locations
            | node | lat     | lon     |
            | a    | 51.5250 | -0.1166 |
            | b    | 51.5243 | -0.1159 |
            | c    | 51.5238 | -0.1152 |
            | d    | 51.5241 | -0.1167 |
            | e    | 51.5247 | -0.1153 |
        And the ways
            | nodes | name  |
            | ab    | albic |
            | bc    | albic |
            | db    | dobe  |
            | be    | dobe  |
        And the relations
            | type        | way:from  | way:to  | node:via | restriction:conditional               |
            | restriction | ab        | be      | b        | only_left_turn @ (Mo-Fr 07:00-11:00)  |
        When I route I should get
            | from | to | route           | turns                   |
            | a    | c  | albic,albic     | depart,arrive           |
            | a    | e  | albic,dobe,dobe | depart,turn left,arrive |
    @only_turning @conditionals
    Scenario: Car - Somewhere in london, the UK, GMT timezone
        Given the extract extra arguments "--parse-conditional-restrictions"
        # 9am UTC, 10am BST
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/london.geojson --parse-conditionals-from-now=1493802000"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/london.geojson --parse-conditionals-from-now=1493802000"
        #    """
        #     a
        #          e
        #      b
        #   d
        #       c
        #    """
        Given the node locations
            | node | lat     | lon     |
            | a    | 51.5250 | -0.1166 |
            | b    | 51.5243 | -0.1159 |
            | c    | 51.5238 | -0.1152 |
            | d    | 51.5241 | -0.1167 |
            | e    | 51.5247 | -0.1153 |
        And the ways
            | nodes | name  |
            | ab    | albic |
            | bc    | albic |
            | db    | dobe |
            | be    | dobe |
        And the relations
            | type        | way:from  | way:to  | node:via | restriction:conditional               |
            | restriction | ab        | be      | b        | only_left_turn @ (Mo-Fr 07:00-11:00)  |
        When I route I should get
            | from | to | route                       | turns                                            |
            | a    | c  | albic,dobe,dobe,albic,albic | depart,turn left,continue uturn,turn left,arrive |
            | a    | e  | albic,dobe,dobe             | depart,turn left,arrive                          |
    @only_turning @conditionals
    Scenario: Car - Somewhere in London, the UK, GMT timezone
        Given the extract extra arguments "--parse-conditional-restrictions"
        # 9am UTC, 10am BST
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/london.geojson --parse-conditionals-from-now=1493802000"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/london.geojson --parse-conditionals-from-now=1493802000"
        #    """
        #     a
        #          e
        #      b
        #   d
        #       c
        #    """
        Given the node locations
            | node | lat     | lon     |
            | a    | 51.5250 | -0.1166 |
            | b    | 51.5243 | -0.1159 |
            | c    | 51.5238 | -0.1152 |
            | d    | 51.5241 | -0.1167 |
            | e    | 51.5247 | -0.1153 |
        And the ways
            | nodes | name  |
            | ab    | albic |
            | bc    | albic |
            | db    | dobe |
            | be    | dobe |
        And the relations
            | type        | way:from  | way:to  | node:via | restriction:conditional               |
            | restriction | ab        | be      | b        | only_left_turn @ (Mo-Fr 07:00-11:00)  |
        When I route I should get
            | from | to | route                       | turns                                            |
            | a    | c  | albic,dobe,dobe,albic,albic | depart,turn left,continue uturn,turn left,arrive |
            | a    | e  | albic,dobe,dobe             | depart,turn left,arrive                          |
    @no_turning @conditionals @restriction-way
    Scenario: Car - Conditional restriction with multiple time windows
        Given the extract extra arguments "--parse-conditional-restrictions"
        # 5pm Wed 02 May, 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
        Given the node map
            """
            a   f
            |   |
            b - e - h
            |   |   |
            c   d - g
                  1
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
            | de    |
            | ef    |
            | be    |
            | eh    |
            | gh    |
            | dg    |
        And the relations
            | type        | way:from | way:via | way:to | restriction:conditional                    |
            | restriction | ab       | be      | ef     | no_uturn @ (Mo-Fr 07:00-11:00,16:00-18:30) |
        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional                    |
            | restriction | ed       | dg     | d        | no_uturn @ (Mo-Fr 07:00-11:00,16:00-18:30) |
        When I route I should get
            | from | to | route             |
            | a    | f  | ab,bc,bc,be,ef,ef |
            | f    | 1  | ef,eh,gh,dg,dg    |
    @restriction-way @overlap
    Scenario: Car - prohibit turn
        Given the extract extra arguments "--parse-conditional-restrictions"
        # 5pm Wed 02 May, 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
        Given the node map
            """
            c
            |
            |   f
            |   |
            b---e
            |   |
            a   d
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
            | be    |
            | de    |
            | ef    |
        And the relations
            | type        | way:from | way:via | way:to | restriction:conditional             |
            | restriction | ab       | be      | de     | no_right_turn @ (Mo-Fr 07:00-11:00) |
        And the relations
            | type        | way:from | way:via | way:to | restriction   |
            | restriction | ab       | be      | de     | no_right_turn |
        # condition is off, but the general restriction should take precedence
        When I route I should get
            | from | to | route             | turns                                                               | locations   |
            | a    | d  | ab,be,ef,ef,de,de | depart,turn right,turn left,continue uturn,new name straight,arrive | a,b,e,f,e,d |
            | a    | f  | ab,be,ef,ef       | depart,turn right,turn left,arrive                                  | a,b,e,f     |
            | c    | d  | bc,be,de,de       | depart,turn left,turn right,arrive                                  | c,b,e,d     |
            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |
    @restriction-way @overlap
    Scenario: Car - prohibit turn
        Given the extract extra arguments "--parse-conditional-restrictions"
        # 5pm Wed 02 May, 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
        Given the node map
            """
            c
            |
            |   f
            |   |
            b---e
            |   |
            |   d
            |
            a
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
            | be    |
            | de    |
            | ef    |
        And the relations
            | type        | way:from | way:via | way:to | restriction:conditional             |
            | restriction | ab       | be      | de     | no_right_turn @ (Mo-Fr 07:00-11:00) |
        And the relations
            | type        | way:from | node:via | way:to | restriction:conditional             |
            | restriction | be       | e        | de     | no_right_turn @ (Mo-Fr 16:00-18:00) |
        # way restriction is off, node-restriction is on
        When I route I should get
            | from | to | route             | turns                                                               | locations   |
            | a    | d  | ab,be,ef,ef,de,de | depart,turn right,turn left,continue uturn,new name straight,arrive | a,b,e,f,e,d |
            | a    | f  | ab,be,ef,ef       | depart,turn right,turn left,arrive                                  | a,b,e,f     |
            | c    | d  | bc,be,ef,ef,de,de | depart,turn left,turn left,continue uturn,new name straight,arrive  | c,b,e,f,e,d |
            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |
    @restriction-way @overlap
    Scenario: Car - prohibit turn
        Given the extract extra arguments "--parse-conditional-restrictions"
        # 5pm Wed 02 May, 2017 GMT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
        Given the node map
            """
            c
            |
            |   f
            |   |
            b---e
            |   |
            |   d
            |
            a
            """
        And the ways
            | nodes |
            | ab    |
            | bc    |
            | be    |
            | de    |
            | ef    |
        And the relations
            | type        | way:from | way:via | way:to | restriction:conditional             |
            | restriction | ab       | be      | de     | no_right_turn @ (Mo-Fr 16:00-18:00) |
        And the relations
            | type        | way:from | node:via | way:to | restriction:conditional             |
            | restriction | be       | e        | de     | no_right_turn @ (Mo-Fr 07:00-11:00) |
        # node restriction is off, way restriction is on
        When I route I should get
            | from | to | route             | turns                                                               | locations   |
            | a    | d  | ab,be,ef,ef,de,de | depart,turn right,turn left,continue uturn,new name straight,arrive | a,b,e,f,e,d |
            | a    | f  | ab,be,ef,ef       | depart,turn right,turn left,arrive                                  | a,b,e,f     |
            | c    | d  | bc,be,de,de       | depart,turn left,turn right,arrive                                  | c,b,e,d     |
            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |
--- a/features/car/construction.feature
+++ b/features/car/construction.feature
@ -1,17 +0,0 @@
@routing @car @construction
 Feature: Car - all construction tags the OpenStreetMap community could think of and then some
    Background:
        Given the profile "car"
    Scenario: Various ways to tag construction and proposed roads
        Then routability should be
            | highway      | construction | proposed | bothw |
            | primary      |              |          | x     |
            | construction |              |          |       |
            | proposed     |              |          |       |
            | primary      |          yes |          |       |
            | primary      |              |     yes  |       |
            | primary      |           no |          | x     |
            | primary      |     widening |          | x     |
            | primary      |        minor |          | x     |
--- a/features/car/destination.feature
+++ b/features/car/destination.feature
@ -1,4 +1,4 @@
-@routing @car @destination
+@routing @car @destination @todo
 Feature: Car - Destination only, no passing through
    Background:
@ -7,10 +7,10 @@ Feature: Car - Destination only, no passing through
    Scenario: Car - Destination only street
        Given the node map
            """
-            a         e
+            a       e
-              b1 c 2d
+              b c d
-            x         y
+            x       y
            """
        And the ways
@ -24,20 +24,20 @@ Feature: Car - Destination only, no passing through
            | from | to | route      |
            | a    | b  | ab,ab      |
            | a    | c  | ab,bcd,bcd |
-            | a    | 2  | ab,bcd,bcd |
+            | a    | d  | ab,bcd,bcd |
            | a    | e  | axye,axye  |
            | e    | d  | de,de      |
            | e    | c  | de,bcd,bcd |
-            | e    | 1  | de,bcd,bcd |
+            | e    | b  | de,bcd,bcd |
            | e    | a  | axye,axye  |
    Scenario: Car - Destination only street
        Given the node map
            """
-            a         e
+            a       e
-              b1 c 2d
+              b c d
-            x         y
+            x       y
            """
        And the ways
@ -52,11 +52,11 @@ Feature: Car - Destination only, no passing through
            | from | to | route       |
            | a    | b  | ab,ab       |
            | a    | c  | ab,bc,bc    |
-            | a    | 2  | ab,bc,cd    |
+            | a    | d  | ab,bc,cd,cd |
            | a    | e  | axye,axye   |
            | e    | d  | de,de       |
            | e    | c  | de,cd,cd    |
-            | e    | 1  | de,cd,bc    |
+            | e    | b  | de,cd,bc,bc |
            | e    | a  | axye,axye   |
    Scenario: Car - Routing inside a destination only area
@ -81,109 +81,3 @@ Feature: Car - Destination only, no passing through
            | e    | a  | de,cd,bc,ab,ab |
            | b    | d  | bc,cd,cd       |
            | d    | b  | cd,bc,bc       |
    Scenario: Car - Routing around a way that becomes destination only
        Given the node map
            """
            b
             \
              |
              e++d++++++c--i
              |             \
               \             h--a
                \            |
                 \___________g
            """
        And the ways
            | nodes | access      | oneway |
            | ah    |             | no     |
            | ihg   |             | no     |
            | eg    |             | no     |
            | icde  |             | no     |
            | cde   | destination | no     |
            | eb    |             | no     |
        When I route I should get
            | from | to | route           | # |
            | i    | b  | ihg,eg,eb,eb    | # goes around access=destination, though restricted way starts at two node intersection |
            | b    | d  | eb,cde,cde      | # ends in restricted way correctly     |
            | b    | i  | eb,eg,ihg,ihg   | # goes around restricted way correctly |
    Scenario: Car - Routing around a way that becomes destination only
        Given the node map
            """
               a---c---b
                   +    \
                   +    |
                   d    |
                   1    |
                    \___e
            """
        And the ways
            | nodes | access      | oneway |
            | acbe  |             | no     |
            | cd    | destination | no     |
            | de    |             | no     |
        When I route I should get
            | from | to | route         |
            | e    | a  | acbe,acbe     |
            | 1    | a  | de,acbe,acbe  |
            | c    | d  | cd,cd         |
    Scenario: Car - Routing through a parking lot tagged access=destination,service
        Given the node map
            """
               a----c++++b+++g------h---i
               |    +    +   +     /
               |    +    +   +    /
               |    +    +  +    /
               |    d++++e+f    /
               z--------------y
            """
        And the ways
            | nodes | access      | highway   |
            | ac    |             | secondary |
            | ghi   |             | secondary |
            | azyhi |             | secondary |
            | cd    | destination | service   |
            | def   | destination | service   |
            | cbg   | destination | service   |
            | be    | destination | service   |
            | gf    | destination | service   |
        When I route I should get
            | from | to | route               |
            | a    | i  | azyhi,azyhi         |
            | b    | f  | be,def,def          |
            | b    | i  | cbg,ghi,azyhi,azyhi |
    Scenario: Car - Disallow snapping to access=private,highway=service
        Given a grid size of 20 meters
        Given the node map
            """
               a---c---b
                   :
                   x
                   :
                   d
                    \__e
            """
        And the ways
            | nodes | access   | highway |
            | acb   |          | primary |
            | cx    | private  | service |
            | xd    | private  | service |
            | de    |          | primary |
        When I route I should get
            | from | to | route     |
            | a    | x  | acb,xd,xd |
            | a    | d  | acb,xd,xd |
            | a    | e  | acb,xd,de |
            | x    | e  | de,de     |
            # do not snap to access=private,highway=service roads when routing over them is not necessary
--- a/features/car/ferry.feature
+++ b/features/car/ferry.feature
@ -46,11 +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.5s  |
+            | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving | 12 km/h | 173.4s  |
-            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 9 km/h  | 162.5s  |
+            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 9 km/h  | 162.4s  |
-            | c    | e  | cde,cde         | ferry,ferry                   | 5 km/h  | 151.5s  |
+            | c    | e  | cde,cde         | ferry,ferry                   | 5 km/h  | 151.4s  |
-            | e    | c  | cde,cde         | ferry,ferry                   | 5 km/h  | 151.5s  |
+            | e    | c  | cde,cde         | ferry,ferry                   | 5 km/h  | 151.4s  |
    Scenario: Car - Properly handle simple durations
        Given the node map
            """
@ -92,29 +91,3 @@ Feature: Car - Handle ferry routes
            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 18 km/h | 78.4s |
            | c    | e  | cde,cde         | ferry,ferry                   | 11 km/h | 67.4s |
            | e    | c  | cde,cde         | ferry,ferry                   | 11 km/h | 67.4s |
 	@snapping
    Scenario: Car - Snapping when using a ferry
        Given the node map
            """
            a b   c d   e f
            """
        And the ways
            | nodes | highway | route | duration |
            | ab    | primary |       |          |
            | bcde  |         | ferry | 0:10     |
            | ef    | primary |       |          |
        When I route I should get
            | from | to | route     | modes       | time  |
            | c    | d  | bcde,bcde | ferry,ferry | 600s  |
        Given the query options
          | geometries     | geojson                  |
          | overview       | full                     |
        # Note that matching *should* work across unsnappable ferries
        When I match I should get
          | trace | geometry             | duration |
          | 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      |
--- a/features/car/hov.feature
+++ b/features/car/hov.feature
@ -1,36 +0,0 @@
@routing @car @hov
 Feature: Car - Handle driving
    Background:
        Given the profile "car"
        And a grid size of 100 meters
    Scenario: Car - Avoid hov when not on hov
        Given the node map
            """
               b=========c========================e====j
             ~            ~                         ~
            a              ~                         f----m
            |               i                        |
            |               |        ----------------l
            |               |       /
            g_______________h______k_____n
            """
        And the ways
            | nodes | highway       | hov           |
            | ab    | motorway_link |               |
            | bcej  | motorway      | designated    |
            | ag    | primary       |               |
            | ghkn  | primary       |               |
            | ih    | primary       |               |
            | kl    | secondary     |               |
            | lf    | secondary     |               |
            | ci    | motorway_link |               |
            | ef    | motorway_link |               |
            | fm    | secondary     |               |
        When I route I should get
            | from | to | route                |
            | a    | m  | ag,ghkn,kl,lf,fm,fm  |
            | c    | m  | bcej,ef,fm,fm        |
--- a/features/car/maxspeed.feature
+++ b/features/car/maxspeed.feature
@ -86,79 +86,54 @@ 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.1      | 18.1       |
+            | primary |          |       |                  |                   | 64 km/h | 64 km/h | 18        | 18         |
            | primary |          |   3   |                  |                   | 64 km/h | 64 km/h | 9         | 9          |
-            | primary | 60       |       |                  |                   | 48 km/h | 48 km/h | 13.3      | 13.3       |
+            | primary | 60       |       |                  |                   | 47 km/h | 47 km/h | 13        | 13         |
-            | primary | 60       |   3   |                  |                   | 48 km/h | 48 km/h | 6.7       | 6.7        |
+            | primary | 60       |   3   |                  |                   | 47 km/h | 47 km/h | 7         | 7          |
-            | primary |          |       | 60               |                   | 48 km/h | 64 km/h | 13.3      | 18.1       |
+            | primary |          |       | 60               |                   | 47 km/h | 64 km/h | 13        | 18         |
-            | primary |          |   3   | 60               |                   | 48 km/h | 64 km/h | 6.7       | 9          |
+            | primary |          |   3   | 60               |                   | 47 km/h | 64 km/h | 7         | 9          |
-            | primary |          |       |                  | 60                | 64 km/h | 48 km/h | 18.1      | 13.3       |
+            | primary |          |       |                  | 60                | 64 km/h | 47 km/h | 18        | 13         |
-            | primary |          |   3   |                  | 60                | 64 km/h | 48 km/h | 9         | 6.7        |
+            | primary |          |   3   |                  | 60                | 64 km/h | 47 km/h | 9         | 7          |
-            | primary | 15       |       | 60               |                   | 48 km/h | 12 km/h | 13.3      | 3.3        |
+            | primary | 15       |       | 60               |                   | 47 km/h | 11 km/h | 13        | 3          |
-            | primary | 15       |   3   | 60               |                   | 48 km/h | 12 km/h | 6.7       | 1.7        |
+            | primary | 15       |   3   | 60               |                   | 48 km/h | 12 km/h | 7         | 2          |
-            | primary | 15       |       |                  | 60                | 12 km/h | 48 km/h | 3.3       | 13.3       |
+            | primary | 15       |       |                  | 60                | 12 km/h | 47 km/h | 3         | 13         |
-            | primary | 15       |   3   |                  | 60                | 12 km/h | 48 km/h | 1.7       | 6.7        |
+            | primary | 15       |   3   |                  | 60                | 12 km/h | 47 km/h | 2         | 7          |
-            | primary | 15       |       | 30               | 60                | 24 km/h | 48 km/h | 6.7       | 13.3       |
+            | primary | 15       |       | 30               | 60                | 23 km/h | 47 km/h | 7         | 13         |
-            | primary | 15       |   3   | 30               | 60                | 24 km/h | 48 km/h | 3.3       | 6.7        |
+            | primary | 15       |   3   | 30               | 60                | 23 km/h | 47 km/h | 3         | 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.1      | 18.1       |
+            | primary |          |       |                  |                   | 64 km/h | 64 km/h | 18        | 18         |
            | primary |          |   1   |                  |                   | 64 km/h | 64 km/h | 9         | 9          |
-            | primary | 60       |       |                  |                   | 48 km/h | 48 km/h | 13.3      | 13.3       |
+            | primary | 60       |       |                  |                   | 47 km/h | 47 km/h | 13        | 13         |
-            | primary | 60       |   1   |                  |                   | 48 km/h | 48 km/h | 6.7       | 6.7        |
+            | primary | 60       |   1   |                  |                   | 47 km/h | 47 km/h | 7         | 7          |
-            | primary |          |       | 60               |                   | 48 km/h | 64 km/h | 13.3      | 18.1       |
+            | primary |          |       | 60               |                   | 47 km/h | 64 km/h | 13        | 18         |
-            | primary |          |   1   | 60               |                   | 48 km/h | 64 km/h | 6.7       | 9          |
+            | primary |          |   1   | 60               |                   | 47 km/h | 64 km/h | 7         | 9          |
-            | primary |          |       |                  | 60                | 64 km/h | 48 km/h | 18.1      | 13.3       |
+            | primary |          |       |                  | 60                | 64 km/h | 47 km/h | 18        | 13         |
-            | primary |          |   1   |                  | 60                | 64 km/h | 48 km/h | 9         | 6.7        |
+            | primary |          |   1   |                  | 60                | 64 km/h | 47 km/h | 9         | 7          |
-            | primary | 15       |       | 60               |                   | 48 km/h | 12 km/h | 13.3      | 3.3        |
+            | primary | 15       |       | 60               |                   | 47 km/h | 11 km/h | 13        | 3          |
-            | primary | 15       |   1   | 60               |                   | 48 km/h | 12 km/h | 6.7       | 1.7        |
+            | primary | 15       |   1   | 60               |                   | 48 km/h | 12 km/h | 7         | 2          |
-            | primary | 15       |       |                  | 60                | 12 km/h | 48 km/h | 3.3       | 13.3       |
+            | primary | 15       |       |                  | 60                | 12 km/h | 47 km/h | 3         | 13         |
-            | primary | 15       |   1   |                  | 60                | 12 km/h | 48 km/h | 1.7       | 6.7        |
+            | primary | 15       |   1   |                  | 60                | 12 km/h | 47 km/h | 2         | 7          |
-            | primary | 15       |       | 30               | 60                | 24 km/h | 48 km/h | 6.7       | 13.3       |
+            | primary | 15       |       | 30               | 60                | 23 km/h | 47 km/h | 7         | 13         |
-            | primary | 15       |   1   | 30               | 60                | 24 km/h | 48 km/h | 3.3       | 6.7        |
+            | primary | 15       |   1   | 30               | 60                | 23 km/h | 47 km/h | 3         | 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    | 24 km/h |         | 6.7       |            |
+            | primary |   30     |   1    | yes    | 23 km/h |         | 7         |            |
-            | primary |   30     |   1    | -1     |         | 24 km/h |           | 6.7        |
+            | primary |   30     |   1    | -1     |         | 23 km/h |           | 7          |
-            | primary |   30     |   1    |        | 24 km/h | 24 km/h | 3.3       | 3.3        |
+            | primary |   30     |   1    |        | 23 km/h | 23 km/h | 3         | 3          |
-            | primary |   30     |   2    |        | 24 km/h | 24 km/h | 6.7       | 6.7        |
+            | primary |   30     |   2    |        | 23 km/h | 23 km/h | 7         | 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.1       |
+            | primary |          |                  |                   | -1     |         | 64 km/h |           | 18         |
-            | primary | 30       |                  |                   | -1     |         | 24 km/h |           | 6.7        |
+            | primary | 30       |                  |                   | -1     |         | 23 km/h |           | 7          |
-            | primary |          | 30               |                   | -1     |         | 64 km/h |           | 18.1       |
+            | primary |          | 30               |                   | -1     |         | 64 km/h |           | 18         |
-            | primary |          |                  | 30                | -1     |         | 24 km/h |           | 6.7        |
+            | primary |          |                  | 30                | -1     |         | 23 km/h |           | 7          |
-            | primary | 20       | 30               |                   | -1     |         | 16 km/h |           | 4.4        |
+            | primary | 20       | 30               |                   | -1     |         | 15 km/h |           | 4          |
-            | primary | 20       |                  | 30                | -1     |         | 24 km/h |           | 6.7        |
+            | primary | 20       |                  | 30                | -1     |         | 23 km/h |           | 7          |
    Scenario: Car - Respect source:maxspeed
        Given the node map
            """
            a b c d e f g
            """
        And the ways
            | nodes | highway | source:maxspeed    | maxspeed |
            | ab    | trunk   |                    |          |
            | bc    | trunk   |                    | 60       |
            | cd    | trunk   | FR:urban           |          |
            | de    | trunk   | CH:rural           |          |
            | ef    | trunk   | CH:trunk           |          |
            | fg    | trunk   | CH:motorway        |          |
        When I route I should get
            | from | to | route | speed   |
            | a    | b  | ab,ab | 85 km/h |
            | b    | c  | bc,bc | 48 km/h |
            | c    | d  | cd,cd | 40 km/h |
            | d    | e  | de,de | 64 km/h |
            | e    | f  | ef,ef | 80 km/h |
            | f    | g  | fg,fg | 96 km/h |
--- a/features/car/mode.feature
+++ b/features/car/mode.feature
@ -0,0 +1,44 @@
@routing @car @mode
 Feature: Car - Mode flag
    Background:
        Given the profile "car"
    Scenario: Car - Mode when using a ferry
        Given the node map
            """
            a b
              c d
            """
        And the ways
            | nodes | highway | route | duration |
            | ab    | primary |       |          |
            | bc    |         | ferry | 0:01     |
            | cd    | primary |       |          |
        When I route I should get
            | from | to | route       | modes                         |
            | a    | d  | ab,bc,cd,cd | driving,ferry,driving,driving |
            | d    | a  | cd,bc,ab,ab | driving,ferry,driving,driving |
            | c    | a  | bc,ab,ab    | ferry,driving,driving         |
            | d    | b  | cd,bc,bc    | driving,ferry,ferry           |
            | a    | c  | ab,bc,bc    | driving,ferry,ferry           |
            | b    | d  | bc,cd,cd    | ferry,driving,driving         |
    Scenario: Car - Snapping when using a ferry
        Given the node map
            """
            a b   c d   e f
            """
        And the ways
            | nodes | highway | route | duration |
            | ab    | primary |       |          |
            | bcde  |         | ferry | 0:10     |
            | ef    | primary |       |          |
        When I route I should get
            | from | to | route     | modes       | time  |
            | c    | d  | bcde,bcde | ferry,ferry | 600s  |
--- a/features/car/multi_via_restrictions.feature
+++ b/features/car/multi_via_restrictions.feature
--- a/features/car/names.feature
+++ b/features/car/names.feature
@ -5,6 +5,22 @@ Feature: Car - Street names in instructions
        Given the profile "car"
        Given a grid size of 5 meters
    Scenario: Car - A named street
        Given the node map
            """
            a b
              c
            """
        And the ways
            | nodes | name     | ref |
            | ab    | My Way   |     |
            | bc    | Your Way | A1  |
        When I route I should get
            | from | to | route                              | ref  |
            | a    | c  | My Way,Your Way,Your Way           | ,A1,A1|
    Scenario: Car - A named street with pronunciation
        Given the node map
            """
@ -20,9 +36,9 @@ Feature: Car - Street names in instructions
            | cd    | Your Way | yourewaye          |     |
        When I route I should get
-            | from | to | route             | pronunciations      | ref |
+            | from | to | route                | pronunciations      | ref    |
-            | a    | d  | My Way,My Way     | ,meyeway            | ,A1 |
+            | a    | d  | My Way,My Way,My Way | ,meyeway,meyeway    | ,A1,A1 |
-            | 1    | c  | Your Way,Your Way | yourewaye,yourewaye | ,   |
+            | 1    | c  | Your Way,Your Way    | yourewaye,yourewaye | ,      |
    # See #2860
    Scenario: Car - same street name but different pronunciation
--- a/Show More
+++ b/Show More
		`@ -1,2 +0,0 @@`
			`features/support/flatbuffers.js`
			`features/support/fbresult_generated.js`
		`@ -1,3 +0,0 @@`
			`# Code of conduct`

			`Everyone is invited to participate in Project OSRM’s open source projects and public discussions: we want to create a welcoming and friendly environment. Harassment of participants or other unethical and unprofessional behavior will not be tolerated in our spaces. The [Contributor Covenant](http://contributor-covenant.org) applies to all projects under the Project-OSRM organization and we ask that you please read [the full text](http://contributor-covenant.org/version/1/2/0/).`