[skip ci] Add breaking notice to changelog

.babelrc

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

.clang-format

@@ -46,7 +46,7 @@ DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories:
+IncludeCategories: 
   - Regex:           '^<'
     Priority:        3
   - Regex:           '^"(osrm|util|engine|extract|contract)/'

.clang-tidy

@@ -1,101 +1,4 @@
 ---
-Checks: >
-    bugprone-*,
-    -bugprone-narrowing-conversions,
-    -bugprone-easily-swappable-parameters,
-    -bugprone-branch-clone,
-    -bugprone-misplaced-widening-cast,
-    -bugprone-exception-escape,
-    -bugprone-implicit-widening-of-multiplication-result,
-    -bugprone-integer-division,
-    -bugprone-reserved-identifier,
-    -bugprone-unhandled-self-assignment,
-    -bugprone-forward-declaration-namespace,
-    -bugprone-sizeof-expression,
-    -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: '.*'
-
+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'
+...
 

.dockerignore

@@ -1,2 +0,0 @@
-test
-build

.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

.eslintignore

@@ -1,2 +0,0 @@
-features/support/flatbuffers.js
-features/support/fbresult_generated.js

.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

.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 }}

.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

.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.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,19 +0,0 @@
-# Issue
-
-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
-
- - [ ] 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))
- - [ ] review
- - [ ] adjust for comments
- - [ ] cherry pick to release branch
-
-## Requirements / Relations
-
- Link any requirements here. Other pull requests this PR is based on?

.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 }}

.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"
-

.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'
-
-  
-

.gitignore

@@ -2,8 +2,6 @@
 #############################
 osrm-deps
 
-.ycm_extra_conf.py
-
 # Compiled source #
 ###################
 *.com
@@ -41,12 +39,9 @@ Thumbs.db
 
 # build related files #
 #######################
-/_build*
 /build/
 /example/build/
-/test/data/monaco.osrm*
-/test/data/ch
-/test/data/mld
+/test/data/monaco*
 /cmake/postinst
 
 # Eclipse related files #
@@ -56,16 +51,11 @@ Thumbs.db
 .cproject
 .project
 
-# Visual Studio (Code) related files #
-######################################
-/.vs*
-/*.local.bat
-/CMakeSettings.json
-/.cache
-
-# Jetbrains related files #
-###########################
-.idea/
+# stxxl related files #
+#######################
+.stxxl
+stxxl.log
+stxxl.errlog
 
 # Compiled Binary Files #
 ####################################
@@ -91,6 +81,7 @@ Thumbs.db
 /test/cache
 /test/speeds.csv
 /test/penalties.csv
+/test/data/monaco.*
 node_modules
 
 # Deprecated config file #
@@ -98,10 +89,3 @@ node_modules
 /server.ini
 
 *.swp
-
-# local lua debugging file
-debug.lua
-
-# node-osrm artifacts
-lib/binding
-

.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

.travis.yml

@@ -0,0 +1,187 @@
+language: cpp
+
+git:
+  depth: 10
+
+# sudo:required is needed for trusty images
+sudo: required
+dist: trusty
+
+notifications:
+  email: false
+
+branches:
+  only:
+    - master
+    - "5.2"
+
+cache:
+  ccache: true
+  apt: true
+  directories:
+    - test/cache
+
+env:
+  global:
+   - CCACHE_TEMPDIR=/tmp/.ccache-temp
+   - CCACHE_COMPRESS=1
+   - JOBS=4
+
+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-5-debug"
+      addons: &gcc5
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-5', '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-5' CXXCOMPILER='g++-5' BUILD_TYPE='Debug' COVERAGE=ON
+
+    - os: linux
+      compiler: "gcc-4.8-debug"
+      addons: &gcc48
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-4.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', 'ccache']
+      env: CCOMPILER='gcc-4.8' CXXCOMPILER='g++-4.8' BUILD_TYPE='Debug'
+
+    - os: linux
+      compiler: "clang-3.8-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', 'ccache']
+      env: CLANG_VERSION='3.8.0' BUILD_TYPE='Debug' RUN_CLANG_FORMAT=ON
+
+    - os: osx
+      osx_image: xcode7.3
+      compiler: clang
+      env: CCOMPILER='clang' CXXCOMPILER='clang++' BUILD_TYPE='Debug' JOBS=1 CUCUMBER_TIMEOUT=60000
+
+    # Release Builds
+    - os: linux
+      compiler: "gcc-5-release"
+      addons: &gcc5
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-5', '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-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release'
+
+      # Disabled because of CI slowness
+      #- os: linux
+      #- compiler: gcc
+      #- addons: &gcc48
+      #-   apt:
+      #-     sources: ['ubuntu-toolchain-r-test']
+      #-     packages: ['g++-4.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='gcc-4.8' CXXCOMPILER='g++-4.8' 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'
+
+      # Disabled because of CI slowness
+      #- os: osx
+      #- osx_image: xcode7.3
+      #- compiler: clang
+      #- env: CCOMPILER='clang' CXXCOMPILER='clang++' BUILD_TYPE='Release'
+
+    # Shared Library
+    - os: linux
+      compiler: "gcc-5-release-shared"
+      addons: &gcc5
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-5', '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-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release' BUILD_SHARED_LIBS=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 [[ $(uname -s) == 'Darwin' ]]; then sudo mdutil -i off /; fi;
+  - source ./scripts/install_node.sh 4
+  - npm install
+  - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
+  - export PATH=${DEPS_DIR}/bin:${PATH} && mkdir -p ${DEPS_DIR}
+  - CMAKE_URL="https://mason-binaries.s3.amazonaws.com/${TRAVIS_OS_NAME}-x86_64/cmake/3.5.2.tar.gz"
+  - travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${DEPS_DIR}
+  - |
+    if [[ ${CLANG_VERSION:-false} != false ]]; then
+      export CCOMPILER='clang'
+      export CXXCOMPILER='clang++'
+      CLANG_URL="https://mason-binaries.s3.amazonaws.com/${TRAVIS_OS_NAME}-x86_64/clang/${CLANG_VERSION}.tar.gz"
+      travis_retry wget --quiet -O - ${CLANG_URL} | tar --strip-components=1 -xz -C ${DEPS_DIR}
+    fi
+  - |
+    if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
+      # implicit deps, but seem to be installed by default with recent images: libxml2 GDAL boost
+      brew install libzip libstxxl lua51 luabind tbb md5sha1sum ccache
+    fi
+
+install:
+  - |
+    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
+      ./scripts/check_taginfo.py taginfo.json profiles/car.lua
+    fi
+  - mkdir build && pushd build
+  - export CC=${CCOMPILER} CXX=${CXXCOMPILER}
+  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DCOVERAGE=${COVERAGE:-OFF} -DBUILD_TOOLS=1 -DENABLE_CCACHE=ON
+  - echo "travis_fold:start:MAKE"
+  - make osrm-extract --jobs=3
+  - 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
+  - popd
+  - mkdir example/build && pushd example/build
+  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
+  - make
+  - popd
+
+script:
+  - 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 build
+  - ./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 "${RUN_CLANG_FORMAT}" ]; then
+      ./scripts/format.sh # we don't want to fail just yet
+    fi
+  - |
+    if [ -n "${COVERAGE}" ]; then
+      bash <(curl -s https://codecov.io/bash)
+    fi

CHANGELOG.md

@@ -1,878 +1,11 @@
-# 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
-      - Fix #3475 removed an invalid `exit` field from the `arrive` maneuver
-      - Fix #3515 adjusted number of `nodes` in `annotation`
-      - Fix #3605 Fixed a bug that could lead to turns at the end of the road to be suppressed
-      - Fix #2844 handle up to 16777215 code units in OSM names
-    - Infrastructure
-      - Support building rpm packages.
-    - Guidance
-      - No longer emitting turns on ferries, if a ferry should use multiple docking locations
-    - Profiles
-      - Removed the `./profile.lua -> ./profiles/car.lua` symlink. Use specific profiles from the `profiles` directory.
-      - `properties` object has a new `weight_name` field, default value is "duration"
-      - `properties` object has a new `weight_precision` field that specifies a decimal precision of edge weights, default value 1
-      - In `way_function` the filed `forward_rate` and `backward_rate` of `ExtractionWay` can now be set.
-        They have the same interpretation for the way weight as `forward_speed` and `backward_speed` for the edge duration.
-        The unit of rate is meters per weight unit, so higher values will be prefered during routing.
-      - `turn_function` now does not return an integer but takes in a `ExtractionTurn` object and can modify the `weight` and `duration` fields
-      - `segment_function` now takes in a `ExtractionSegment` object and can modify `weight` and `duration` fields
-      - `properties.uturn_penalty` is deprecated. Set it in the `turn_function`. The turn type is exposed as `ExtractionTurn::direction_modifier`.
-      - `properties.traffic_light_penalty` is deprecated. Traffic light penalties now need to be set over in the turn function.
-         Each turn with a traffic light is marked with `ExtractionTurn::has_traffic_light = true`.
-      - Renamed the helper file `profiles/lib/directional.lua` to `profiles/lib/tags.lua` since it now provides more general tags parsing utility functions.
-      - The car and foot profiles now depend on the helper file `profiles/lib/handlers.lua`.
-    - Infrastructure
-      - Disabled link-time optimized (LTO) builds by default. Enable by passing `-DENABLE_LTO=ON` to `cmake` if you need the performance and know what you are doing.
-      - Datafile versioning is now based on OSRM semver values, rather than source code checksums.
-        Datafiles are compatible between patch levels, but incompatible between minor version or higher bumps.
-      - libOSRM now creates an own watcher thread then used in shared memory mode to listen for data updates
-    - Tools:
-      - Added osrm-extract-conditionals tool for checking conditional values in OSM data
-    - Trip Plugin
-      - Added a new feature that finds the optimal route given a list of waypoints, a source and a destination. This does not return a roundtrip and instead returns a one way optimal route from the fixed source to the destination points.
-
-# 5.5.1
-  - Changes from 5.5.0
-    - API:
-      - Adds `generate_hints=true` (`true` by default) which lets user disable `Hint` generating in the response. Use if you don't need `Hint`s!
-    - Bugfixes
-      - Fix #3418 and ensure we only return bearings in the range 0-359 in API responses
-      - Fixed a bug that could lead to emitting false instructions for staying on a roundabout
-
-# 5.5.0
-  - Changes from 5.4.0
-    - API:
-      - `osrm-datastore` now accepts the parameter `--max-wait` that specifies how long it waits before aquiring a shared memory lock by force
-      - Shared memory now allows for multiple clients (multiple instances of libosrm on the same segment)
-      - Polyline geometries can now be requested with precision 5 as well as with precision 6
-    - Profiles
-      - the car profile has been refactored into smaller functions
-      - get_value_by_key() is now guaranteed never to return empty strings, nil is returned instead.
-      - debug.lua was added to make it easier to test/develop profile code.
-      - `car.lua` now depends on lib/set.lua and lib/sequence.lua
-      - `restrictions` is now used for namespaced restrictions and restriction exceptions (e.g. `restriction:motorcar=` as well as `except=motorcar`)
-      - replaced lhs/rhs profiles by using test defined profiles
-      - Handle `oneway=alternating` (routed over with penalty) separately from `oneway=reversible` (not routed over due to time dependence)
-      - Handle `destination:forward`, `destination:backward`, `destination:ref:forward`, `destination:ref:backward` tags
-      - Properly handle destinations on `oneway=-1` roads
-    - Guidance
-      - Notifications are now exposed more prominently, announcing turns onto a ferry/pushing your bike more prominently
-      - Improved turn angle calculation, detecting offsets due to lanes / minor variations due to inaccuracies
-      - Corrected the bearings returned for intermediate steps - requires reprocessing
-      - Improved turn locations for collapsed turns
-      - Sliproad classification refinements: the situations we detect as Sliproads now resemble more closely the reality
-    - Trip Plugin
-      - changed internal behaviour to prefer the smallest lexicographic result over the largest one
-    - Bugfixes
-      - fixed a bug where polyline decoding on a defective polyline could end up in out-of-bound access on a vector
-      - fixed compile errors in tile unit-test framework
-      - fixed a bug that could result in inconsistent behaviour when collapsing instructions
-      - fixed a bug that could result in crashes when leaving a ferry directly onto a motorway ramp
-      - fixed a bug in the tile plugin that resulted in discovering invalid edges for connections
-      - improved error messages when missing files during traffic updates (#3114)
-      - For single coordinate geometries the GeoJSON `Point` encoding was broken. We now always emit `LineString`s even in the one-coordinate-case (backwards compatible) (#3425)
-    - Debug Tiles
-      - Added support for turn penalties
-    - Internals
-      - Internal/Shared memory datafacades now share common memory layout and data loading code
-      - File reading now has much better error handling
-    - Misc
-      - Progress indicators now print newlines when stdout is not a TTY
-      - Prettier API documentation now generated via `npm run build-api-docs` output `build/docs`
-
-# 5.4.3
-  - Changes from 5.4.2
-    - Bugfixes
-      - #3254 Fixed a bug that could end up hiding roundabout instructions
-      - #3260 fixed a bug that provided the wrong location in the arrival instruction
-
-# 5.4.2
-  - Changes from 5.4.1
-    - Bugfixes
-      - #3032 Fixed a bug that could result in emitting `invalid` as an instruction type on sliproads with mode changes
-      - #3085 Fixed an outdated assertion that could throw without a cause for concern
-      - #3179 Fixed a bug that could trigger an assertion in TurnInstruciton generation
-
-# 5.4.1
-  - Changes from 5.4.0
-    - Bugfixes
-      - #3016: Fixes shared memory updates while queries are running
-
-# 5.4.0
-  - Changes from 5.3.0
-    - Profiles
-      - includes library guidance.lua that offers preliminary configuration on guidance.
-      - added left_hand_driving flag in global profile properties
-      - modified turn penalty function for car profile - better fit to real data
-      - return `ref` and `name` as separate fields. Do no use ref or destination as fallback for name value
-      - the default profile for car now ignores HOV only roads
-    - Guidance
-      - Handle Access tags for lanes, only considering valid lanes in lane-guidance (think car | car | bike | car)
-      - Improved the detection of non-noticeable name-changes
-      - Summaries have been improved to consider references as well
-    - API:
-      - `annotations=true` now returns the data source id for each segment as `datasources`
-      - Reduced semantic of merge to refer only to merges from a lane onto a motorway-like road
-      - new `ref` field in the `RouteStep` object. It contains the reference code or name of a way. Previously merged into the `name` property like `name (ref)` and are now separate fields.
-    - Bugfixes
-      - Fixed an issue that would result in segfaults for viaroutes with an invalid intermediate segment when u-turns were allowed at the via-location
-      - Invalid only_* restrictions could result in loss of connectivity. As a fallback, we assume all turns allowed when the restriction is not valid
-      - Fixed a bug that could result in an infinite loop when finding information about an upcoming intersection
-      - Fixed a bug that led to not discovering if a road simply looses a considered prefix
-      - BREAKING: Fixed a bug that could crash postprocessing of instructions on invalid roundabout taggings. This change requires reprocessing datasets with osrm-extract and osrm-contract
-      - Fixed an issue that could emit `invalid` as instruction when ending on a sliproad after a traffic-light
-      - Fixed an issue that would detect turning circles as sliproads
-      - Fixed a bug where post-processing instructions (e.g. left + left -> uturn) could result in false pronunciations
-      - Fixes a bug where a bearing range of zero would cause exhaustive graph traversals
-      - Fixes a bug where certain looped geometries could cause an infinite loop during extraction
-      - Fixed a bug where some roads could be falsly identified as sliproads
-      - Fixed a bug where roundabout intersections could result in breaking assertions when immediately exited
-    - Infrastructure:
-      - Adds a feature to limit results in nearest service with a default of 100 in `osrm-routed`
-
-# 5.3.0
-  - Changes from 5.3.0-rc.3
-    - Guidance
-      - Only announce `use lane` on required turns (not using all lanes to go straight)
-      - Moved `lanes` to the intersection objects. This is BREAKING in relation to other Release Candidates but not with respect to other releases.
-    - Bugfixes
-      - Fix BREAKING: bug that could result in failure to load 'osrm.icd' files. This breaks the dataformat
-      - Fix: bug that results in segfaults when `use lane` instructions are suppressed
-
-  - Changes form 5.2.7
-    - API
-      - Introduces new `TurnType` in the form of `use lane`. The type indicates that you have to stick to a lane without turning
-      - Introduces `lanes` to the `Intersection` object. The lane data contains both the markings at the intersection and a flag indicating if they can be chosen for the next turn
-      - Removed unused `-s` from `osrm-datastore`
-    - Guidance
-      - Only announce `use lane` on required turns (not using all lanes to go straight)
-      - Improved detection of obvious turns
-      - Improved turn lane detection
-      - Reduce the number of end-of-road instructions in obvious cases
-    - Profile:
-      - bicycle.lua: Surface speeds never increase the actual speed
-    - Infrastructure
-      - Add 32bit support
-      - Add ARM NEON/VFP support
-      - Fix Windows builds
-      - Optimize speed file updates using mmap
-      - Add option to disable LTO for older compilers
-      - BREAKING: The new turn type changes the turn-type order. This breaks the **data format**.
-      - BREAKING: Turn lane data introduces two new files (osrm.tld,osrm.tls). This breaks the fileformat for older versions.
-    - Bugfixes:
-      - Fix devide by zero on updating speed data using osrm-contract
-
-# 5.3.0 RC3
-  - Changes from 5.3.0-rc.2
-    - Guidance
-      - Improved detection of obvious turns
-      - Improved turn lane detection
-    - Bugfixes
-      - Fix bug that didn't chose minimal weights on overlapping edges
-
-# 5.3.0 RC2
-  - Changes from 5.3.0-rc.1
-    - Bugfixes
-      - Fixes invalid checks in the lane-extraction part of the car profile
-
-# 5.3.0 RC1
-    - API
-     - Introduces new `TurnType` in the form of `use lane`. The type indicates that you have to stick to a lane without turning
-     - Introduces lanes to the route response. The lane data contains both the markings at the intersection and a flag indicating their involvement in the turn
-
-    - Infrastructure
-     - BREAKING: The new turn type changes the turn-type order. This breaks the **data format**.
-     - BREAKING: Turn lane data introduces two new files (osrm.tld,osrm.tls). This breaks the fileformat for older versions.
-
-# 5.2.5
-  - Bugfixes
-    - Fixes a segfault caused by incorrect trimming logic for very short steps.
-
 # 5.2.4
+  Changes from 5.2.3:
   - Bugfixes:
-    - Fixed in issue that arised on roundabouts in combination with intermediate intersections and sliproads
+    - Fixed a crash that arised on roundabouts in combination with intermediate intersections and sliproads
+    - Fixed #2518: Invalid bilinear interpolation when using raster data
+    - Fixed #2546: The geometry returned by the match service was missing the last coordinate.
+
+  BREAKING: The data format changed between 5.2.3 and 5.2.4, you need to reprocess.
 
 # 5.2.3
   - Bugfixes:
@@ -1100,3 +233,5 @@
         - `properties.use_turn_restrictions`
         - `properties.u_turn_penalty`
         - `properties.allow_u_turn_at_via`
+
+

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/).

CONTRIBUTING.md

@@ -1,81 +0,0 @@
-# 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.
-
-# Developer
-
-We use `clang-format` version `15` 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`
-```
-#!/bin/sh
-
-remote="$1"
-if [ x"$remote" = xorigin  ] ; then
-    if [ $(git rev-parse --abbrev-ref HEAD) = master ] ; then
-        echo "Rejected push to $remote/master" ; exit 1
-    fi
-
-    ./scripts/format.sh && ./scripts/error_on_dirty.sh
-    if [ $? -ne 0 ] ; then
-        echo "Unstaged format changes" ; exit 1
-    fi
-fi
-```
-could check code format, modify a local repository and reject push due to unstaged formatting changes.
-Also `pre-push` hook  rejects direct pushes to `origin/master`.
-
-⚠️ `scripts/format.sh` checks all local files that match `*.cpp` or `*.hpp` patterns.
-
-
-In general changes that affect the API and/or increase the memory consumption need to be discussed first.
-Often we don't include changes that would increase the memory consumption a lot if they are not generally usable (e.g. elevation data is a good example).
-
-## Pull Request
-
-Every pull-request that changes the API needs to update the docs in `docs/http.md` and add an entry to `CHANGELOG.md`.
-Breaking changes need to have a BREAKING prefix. See the [releasing documentation](docs/releasing.md) on how this affects the version.
-
-Early feedback is also important.
-You will see that a lot of the PR have tags like `[not ready]` or `[wip]`.
-We like to open PRs as soon as we are starting to work on something to make it visible to the rest of the team.
-If your work is going in entirely the wrong direction, there is a good chance someone will pick up on this before it is too late.
-Everyone is encouraged to read PRs of other people and give feedback.
-
-For every significant code change we require a pull request review before it is merged.
-If your pull request modifies the API this need to be signed of by a team discussion.
-This means you will need to find another member of the team with commit access and request a review of your pull request.
-
-Once your pull request is reviewed you can merge it! If you don't have commit access, ping someone that has commit access.
-If you do have commit access there are in general two accepted styles to merging:
-
-1. Make sure the branch is up to date with `master`. Run `git rebase master` to find out.
-2. Once that is ensured you can either:
-  - Click the nice green merge button (for a non-fast-forward merge)
-  - Merge by hand using a fast-forward merge
-
-Which merge you prefer is up to personal preference. In general it is recommended to use fast-forward merges because it creates a history that is sequential and easier to understand.
-
-# Maintainer
-
-## Doing a release
-
-There is an in-depth guide around how to push out a release once it is ready [here](docs/releasing.md).
-
-## The API
-
-Changes to the API need to be discussed and signed off by the team. Breaking changes even more so than additive changes.
-
-## Milestones
-
-If a pull request or an issue is applicable for the current or next milestone, depends on the target version number.
-Since we use semantic versioning we restrict breaking changes to major releases.
-After a Release Candidate is released we usually don't change the API anymore if it is not critical.
-Bigger code changes after a RC was released should also be avoided.
-

LICENCE.TXT

@@ -1,4 +1,4 @@
-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2016, Project OSRM contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README.md

@@ -1,172 +1,64 @@
-## Open Source Routing Machine
+## About
 
+The Open Source Routing Machine is a high performance routing engine written in C++11 designed to run on OpenStreetMap data.
 
-[![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)
+## Current build status
 
-High performance routing engine written in C++ designed to run on OpenStreetMap data.
+| build config | status |
+|:-------------|:-------|
+| Linux        | [![Build Status](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=master)](https://travis-ci.org/Project-OSRM/osrm-backend) |
+| Windows      | [![Build status](https://ci.appveyor.com/api/projects/status/4iuo3s9gxprmcjjh)](https://ci.appveyor.com/project/DennisOSRM/osrm-backend) |
+| Coverage     | [![codecov](https://codecov.io/gh/Project-OSRM/osrm-backend/branch/master/graph/badge.svg)](https://codecov.io/gh/Project-OSRM/osrm-backend) |
 
-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
-- 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
+## Building
 
-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 instructions on how to [build](https://github.com/Project-OSRM/osrm-backend/wiki/Building-OSRM) and [run OSRM](https://github.com/Project-OSRM/osrm-backend/wiki/Running-OSRM), please consult [the Wiki](https://github.com/Project-OSRM/osrm-backend/wiki).
 
-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:
-- [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
+To quickly try OSRM use our [free and daily updated online service](http://map.project-osrm.org)
 
 ## Documentation
 
 ### Full documentation
 
-- [Hosted documentation](http://project-osrm.org)
 - [osrm-routed HTTP API documentation](docs/http.md)
 - [libosrm API documentation](docs/libosrm.md)
 
-## Contact
+### Quick start
 
-- 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`
+Building OSRM assuming all dependencies are installed:
 
-## Quick Start
-
-The easiest and quickest way to setup your own routing engine is to use Docker images we provide.
-
-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
-
-```bash
-sudo apt install build-essential git cmake pkg-config \
-libbz2-dev libxml2-dev libzip-dev libboost-all-dev \
-lua5.2 liblua5.2-dev libtbb-dev
 ```
-
-Compile and install OSRM binaries
-
-```bash
 mkdir -p build
 cd build
-cmake ..
+cmake .. -DCMAKE_BUILD_TYPE=Release
 cmake --build .
 sudo cmake --build . --target install
 ```
 
-### Request Against the Demo Server
-
-Read the [API usage policy](https://github.com/Project-OSRM/osrm-backend/wiki/Demo-server).
-
-Simple query with instructions and alternatives on Berlin:
+Loading preparing a dataset and starting the server:
 
 ```
-curl "https://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true&alternatives=true"
+osrm-extract data.osm.pbf -p profiles/car.lua
+osrm-contract data.osrm
+osrm-routed data.osrm
 ```
 
-### 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:
+Running a query on your local server:
 
 ```
-sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-sudo apt-get update -y
-sudo apt-get install -y libstdc++-9-dev
+curl http://127.0.0.1:5000/13.388860,52.517037;13.385983,52.496891?steps=true&alternatives=true
 ```
 
-You can install the Node.js bindings via `npm install @project-osrm/osrm` or from this repository either via
+### Running a request against the Demo Server
 
-    npm install
+First read the [API usage policy](https://github.com/Project-OSRM/osrm-backend/wiki/Api-usage-policy).
 
-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:
+Then run simple query with instructions and alternatives on Berlin:
 
 ```
-npm uninstall osrm --save
-npm install @project-osrm/osrm --save
+curl https://router.project-osrm.org/13.388860,52.517037;13.385983,52.496891?steps=true&alternatives=true
 ```
 
-#### 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
@@ -189,3 +81,4 @@ When using the code in a (scientific) publication, please cite
  address = {New York, NY, USA},
 }
 ```
+

appveyor-build.bat

@@ -0,0 +1,163 @@
+@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 ERROR
+
+FOR /F %%G IN ("--version") DO cmake %%G 2>&1 | findstr /C:"3.5.0" > nul && goto CMAKE_NOT_OK
+GOTO CMAKE_OK
+
+:CMAKE_NOT_OK
+ECHO CMAKE NOT OK - downloading new CMake
+IF NOT EXIST cm.zip powershell Invoke-WebRequest https://cmake.org/files/v3.5/cmake-3.5.1-win32-x86.zip -OutFile $env:PROJECT_DIR\cm.zip
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+IF NOT EXIST cmake-3.5.1-win32-x86 7z -y x cm.zip | %windir%\system32\FIND "ing archive"
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+SET PATH=%PROJECT_DIR%\cmake-3.5.1-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
+
+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%

appveyor.yml

@@ -0,0 +1,42 @@
+environment:
+  matrix:
+  - configuration: Release
+#  - configuration: Debug
+
+# 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
+
+test: off
+
+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

build-local.bat

@@ -0,0 +1,34 @@
+@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.5.0-win32-x86\bin;%PATH%
+SET PATH=C:\mb\windows-builds-64\tmp-bin\cmake-3.5.1-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%

cmake/CPackConfig.cmake

@@ -1,44 +0,0 @@
-IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    MESSAGE(FATAL_ERROR "Cannot configure CPack to generate Debian/RPM packages on non-linux systems.")
-ENDIF()
-string(TOLOWER "${CMAKE_PROJECT_NAME}" CPACK_PACKAGE_NAME)
-SET(CPACK_PACKAGE_VERSION_MAJOR ${OSRM_VERSION_MAJOR})
-SET(CPACK_PACKAGE_VERSION_MINOR ${OSRM_VERSION_MINOR})
-SET(CPACK_PACKAGE_VERSION_PATCH ${OSRM_VERSION_PATCH})
-SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-
-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_STRIP_FILES "TRUE")
-file(GLOB_RECURSE ProfileGlob ${CMAKE_SOURCE_DIR}/profiles/*)
-install(FILES ${ProfileGlob} DESTINATION "share/doc/${CPACK_PACKAGE_NAME}/profiles")
-
-find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
-if(DPKG_PROGRAM)
-  SET(CPACK_GENERATOR "DEB")
-  execute_process(
-    COMMAND ${DPKG_PROGRAM} --print-architecture
-    OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-  SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS "ON")
-else(DPKG_PROGRAM)
-    find_program(RPM_PROGRAM rpm DOC "rpm RPM-based systems")
-    find_program(RPMBUILD_PROGRAM rpm DOC "rpm RPM-based systems")
-    if(RPMBUILD_PROGRAM)
-        SET(CPACK_GENERATOR "RPM")
-        execute_process(
-            COMMAND ${RPM_PROGRAM} --eval %{_arch}
-            OUTPUT_VARIABLE CPACK_RPM_PACKAGE_ARCHITECTURE
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-            )
-        SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}.${CPACK_RPM_PACKAGE_ARCHITECTURE}")
-        # Exclude /usr/lib64/pkgconfig directory given that it is already owned by the pkg-config rpm package.
-        SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-    endif(RPMBUILD_PROGRAM)
-endif(DPKG_PROGRAM)

cmake/CPackDebianConfig.cmake

@@ -0,0 +1,41 @@
+IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  MESSAGE(FATAL_ERROR "Cannot configure CPack to generate Debian packages on non-linux systems.")
+ENDIF()
+
+INCLUDE(FindDebArch)
+
+SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
+SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENCE.TXT")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CPACK_RESOURCE_FILE_README}")
+SET(CPACK_PACKAGE_UPSTREAM_VERSION "${OSRM_VERSION_MAJOR}.${OSRM_VERSION_MINOR}.${OSRM_VERSION_PATCH}")
+SET(CPACK_PACKAGE_DEBIAN_REVISION "1")
+SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_UPSTREAM_VERSION}-${CPACK_PACKAGE_DEBIAN_REVISION}")
+
+string(TOLOWER "${CMAKE_PROJECT_NAME}" LOWER_PROJECT_NAME)
+SET(CPACK_PACKAGE_FILE_NAME "${LOWER_PROJECT_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${LOWER_PROJECT_NAME}_${CPACK_PACKAGE_UPSTREAM_VERSION}_orig")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Open Source Routing Machine (OSRM).")
+SET(CPACK_PACKAGE_DESCRIPTION "Open Source Routing Machine (OSRM) is a routing engine.")
+
+# To create a proper Debian/Ubuntu package, the following CMake
+# options should be used:
+
+SET(CPACK_STRIP_FILES "TRUE")
+SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY "FALSE")
+SET(CPACK_GENERATOR "DEB")
+
+SET(CPACK_DEBIAN_PACKAGE_NAME        "${CPACK_PACKAGE_NAME}${VERSION_SUFFIX}")
+SET(CPACK_DEBIAN_PACKAGE_VERSION     "${CPACK_PACKAGE_VERSION}")
+SET(CPACK_DEBIAN_PACKAGE_MAINTAINER  "Dennis Luxen <info@project-osrm.org>")
+SET(CPACK_DEBIAN_PACKAGE_PRIORITY    "optional")
+SET(CPACK_DEBIAN_PACKAGE_SECTION     "devel")
+SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "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_DEBIAN_PACKAGE_DEPENDS     "libc6-dev, libbz2-1.0, libstxxl1, libxml2, libzip2, liblua5.1-0, libtbb2, libboost-all-dev")
+
+file(GLOB_RECURSE ProfileGlob ${CMAKE_SOURCE_DIR}/profiles/*)
+install(FILES ${ProfileGlob} DESTINATION "share/doc/${LOWER_PROJECT_NAME}/profiles")
+set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_BINARY_DIR}/copyright;")
+
+MESSAGE(STATUS "Debian Package: ${CPACK_DEBIAN_PACKAGE_NAME} (${CPACK_DEBIAN_PACKAGE_VERSION}) [${CPACK_PACKAGE_FILE_NAME}.deb]")

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)

cmake/FindLua.cmake

@@ -1,205 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#.rst:
-# FindLua
-# -------
-#
-#
-#
-# Locate Lua library This module defines
-#
-# ::
-#
-#   LUA_FOUND          - if false, do not try to link to Lua
-#   LUA_LIBRARIES      - both lua and lualib
-#   LUA_INCLUDE_DIR    - where to find lua.h
-#   LUA_VERSION_STRING - the version of Lua found
-#   LUA_VERSION_MAJOR  - the major version of Lua
-#   LUA_VERSION_MINOR  - the minor version of Lua
-#   LUA_VERSION_PATCH  - the patch version of Lua
-#
-#
-#
-# Note that the expected include convention is
-#
-# ::
-#
-#   #include "lua.h"
-#
-# and not
-#
-# ::
-#
-#   #include <lua/lua.h>
-#
-# 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)
-
-    if (Lua_FIND_VERSION_EXACT)
-        if (Lua_FIND_VERSION_COUNT GREATER 1)
-            set(_lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR})
-        endif ()
-    elseif (Lua_FIND_VERSION)
-        # once there is a different major version supported this should become a loop
-        if (NOT Lua_FIND_VERSION_MAJOR GREATER 5)
-            if (Lua_FIND_VERSION_COUNT EQUAL 1)
-                set(_lua_append_versions ${LUA_VERSIONS5})
-            else ()
-                foreach (subver IN LISTS LUA_VERSIONS5)
-                    if (NOT subver VERSION_LESS ${Lua_FIND_VERSION})
-                        list(APPEND _lua_append_versions ${subver})
-                    endif ()
-                endforeach ()
-            endif ()
-        endif ()
-    else ()
-        # once there is a different major version supported this should become a loop
-        set(_lua_append_versions ${LUA_VERSIONS5})
-    endif ()
-
-    list(APPEND _lua_include_subdirs "include/lua" "include")
-
-    foreach (ver IN LISTS _lua_append_versions)
-        string(REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}")
-        list(APPEND _lua_include_subdirs
-             include/lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
-             include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-             include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-        )
-        list(APPEND _lua_library_names
-             lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
-             lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
-             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)
-    # At least 5.[012] have different ways to express the version
-    # so all of them need to be tested. Lua 5.2 defines LUA_VERSION
-    # and LUA_RELEASE as joined by the C preprocessor, so avoid those.
-    file(STRINGS "${_hdr_file}" lua_version_strings
-         REGEX "^#define[ \t]+LUA_(RELEASE[ \t]+\"Lua [0-9]|VERSION([ \t]+\"Lua [0-9]|_[MR])).*")
-
-    string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MAJOR ";${lua_version_strings};")
-    if (LUA_VERSION_MAJOR MATCHES "^[0-9]+$")
-        string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MINOR ";${lua_version_strings};")
-        string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_PATCH ";${lua_version_strings};")
-        set(LUA_VERSION_STRING "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}")
-    else ()
-        string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
-        if (NOT LUA_VERSION_STRING MATCHES "^[0-9.]+$")
-            string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
-        endif ()
-        string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" LUA_VERSION_MAJOR "${LUA_VERSION_STRING}")
-        string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" LUA_VERSION_MINOR "${LUA_VERSION_STRING}")
-        string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" LUA_VERSION_PATCH "${LUA_VERSION_STRING}")
-    endif ()
-    foreach (ver IN LISTS _lua_append_versions)
-        if (ver STREQUAL "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}")
-            set(LUA_VERSION_MAJOR ${LUA_VERSION_MAJOR} PARENT_SCOPE)
-            set(LUA_VERSION_MINOR ${LUA_VERSION_MINOR} PARENT_SCOPE)
-            set(LUA_VERSION_PATCH ${LUA_VERSION_PATCH} PARENT_SCOPE)
-            set(LUA_VERSION_STRING ${LUA_VERSION_STRING} PARENT_SCOPE)
-            return()
-        endif ()
-    endforeach ()
-endfunction(_lua_check_header_version)
-
-_lua_set_version_vars()
-
-if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
-    _lua_check_header_version("${LUA_INCLUDE_DIR}/lua.h")
-endif ()
-
-if (NOT LUA_VERSION_STRING)
-    foreach (subdir IN LISTS _lua_include_subdirs)
-        unset(LUA_INCLUDE_PREFIX CACHE)
-        find_path(LUA_INCLUDE_PREFIX ${subdir}/lua.h
-          HINTS
-            ENV LUA_DIR
-          PATHS
-          ~/Library/Frameworks
-          /Library/Frameworks
-          /sw # Fink
-          /opt/local # DarwinPorts
-          /opt/csw # Blastwave
-          /opt
-        )
-        if (LUA_INCLUDE_PREFIX)
-            _lua_check_header_version("${LUA_INCLUDE_PREFIX}/${subdir}/lua.h")
-            if (LUA_VERSION_STRING)
-                set(LUA_INCLUDE_DIR "${LUA_INCLUDE_PREFIX}/${subdir}")
-                break()
-            endif ()
-        endif ()
-    endforeach ()
-endif ()
-unset(_lua_include_subdirs)
-unset(_lua_append_versions)
-
-find_library(LUA_LIBRARY
-  NAMES ${_lua_library_names} lua
-  HINTS
-    ENV LUA_DIR
-  PATH_SUFFIXES lib
-  PATHS
-  ${_lua_library_dirs}
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-)
-unset(_lua_library_names)
-
-if (LUA_LIBRARY)
-    # include the math library for Unix
-    if (UNIX AND NOT APPLE AND NOT BEOS)
-        find_library(LUA_MATH_LIBRARY m)
-        set(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
-
-        # include dl library for statically-linked Lua library
-        get_filename_component(LUA_LIB_EXT ${LUA_LIBRARY} EXT)
-        if(LUA_LIB_EXT STREQUAL CMAKE_STATIC_LIBRARY_SUFFIX)
-          list(APPEND LUA_LIBRARIES ${CMAKE_DL_LIBS})
-        endif()
-
-    # For Windows and Mac, don't need to explicitly include the math library
-    else ()
-        set(LUA_LIBRARIES "${LUA_LIBRARY}")
-    endif ()
-endif ()
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
-# all listed variables are TRUE
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua
-                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
-                                  VERSION_VAR LUA_VERSION_STRING)
-
-mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARY LUA_MATH_LIBRARY)

cmake/FindLua52.cmake

@@ -0,0 +1,82 @@
+# Locate Lua library
+# This module defines
+#  LUA52_FOUND, if false, do not try to link to Lua
+#  LUA_LIBRARIES
+#  LUA_INCLUDE_DIR, where to find lua.h
+#  LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8)
+#
+# Note that the expected include convention is
+#  #include "lua.h"
+# and not
+#  #include <lua/lua.h>
+# This is because, the lua location is not standardized and may exist
+# in locations other than lua/
+
+#=============================================================================
+# Copyright 2007-2009 Kitware, Inc.
+# Copyright 2016 for Project-OSRM, Lua5.1 => Lua5.2
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+find_path(LUA_INCLUDE_DIR lua.h
+  HINTS
+    ENV LUA_DIR
+  PATH_SUFFIXES include/lua52 include/lua5.2 include/lua-5.2 include/lua include
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+)
+
+find_library(LUA_LIBRARY
+  NAMES lua52 lua5.2 lua-5.2 lua
+  HINTS
+    ENV LUA_DIR
+  PATH_SUFFIXES lib
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+if(LUA_LIBRARY)
+  # include the math library for Unix
+  if(UNIX AND NOT APPLE AND NOT BEOS)
+    find_library(LUA_MATH_LIBRARY m)
+    set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
+  # For Windows and Mac, don't need to explicitly include the math library
+  else()
+    set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
+  endif()
+endif()
+
+if(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
+  file(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua .+\"")
+
+  string(REGEX REPLACE "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([^\"]+)\".*" "\\1" LUA_VERSION_STRING "${lua_version_str}")
+  unset(lua_version_str)
+endif()
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
+# all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua52
+                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
+                                  VERSION_VAR LUA_VERSION_STRING)
+
+mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)
+

cmake/FindLuaJIT.cmake

@@ -0,0 +1,93 @@
+# Locate Lua library
+# This module defines
+#  LUAJIT_FOUND, if false, do not try to link to Lua
+#  LUAJIT_LIBRARIES
+#  LUAJIT_INCLUDE_DIR, where to find lua.h
+#
+# Note that the expected include convention is
+#  #include "lua.h"
+# and not
+#  #include <lua/lua.h>
+# This is because, the lua location is not standardized and may exist
+# in locations other than lua/
+
+#=============================================================================
+# Copyright 2007-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distributed this file outside of CMake, substitute the full
+#  License text for the above reference.)
+#
+# ################
+# 2010 - modified for cronkite to find luajit instead of lua, as it was before.
+#
+
+if ( NOT LuaJIT_FIND_VERSION )
+  MESSAGE(FATAL_ERROR "You need to specify a version of libluajit to use")
+ENDIF()
+
+IF( NOT LUAJIT_FIND_QUIETLY )
+  MESSAGE(STATUS "Looking for LuaJIT ${LuaJIT_FIND_VERSION}")
+ENDIF()
+
+FIND_PATH(LUAJIT_INCLUDE_DIR lua.h
+  HINTS
+  $ENV{LUAJIT_DIR}
+  PATH_SUFFIXES include/luajit-2.0 include/luajit2.0 include/luajit include
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local
+  /usr
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+)
+
+FIND_LIBRARY(LUAJIT_LIBRARY
+  NAMES luajit-${LuaJIT_FIND_VERSION_MAJOR}${LuaJIT_FIND_VERSION_MINOR} luajit-${LuaJIT_FIND_VERSION}
+  HINTS
+  $ENV{LUAJIT_DIR}
+  PATH_SUFFIXES lib64 lib
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local
+  /usr
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+IF(LUAJIT_LIBRARY)
+  # include the math library for Unix
+  IF(UNIX AND NOT APPLE)
+    FIND_LIBRARY(LUAJIT_MATH_LIBRARY m)
+    SET( LUAJIT_LIBRARIES "${LUAJIT_LIBRARY};${LUAJIT_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
+  # For Windows and Mac, don't need to explicitly include the math library
+  ELSE(UNIX AND NOT APPLE)
+    SET( LUAJIT_LIBRARIES "${LUAJIT_LIBRARY}" CACHE STRING "Lua Libraries")
+  ENDIF(UNIX AND NOT APPLE)
+ENDIF(LUAJIT_LIBRARY)
+
+INCLUDE(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if
+# all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LUAJIT  DEFAULT_MSG  LUAJIT_LIBRARIES LUAJIT_INCLUDE_DIR)
+
+IF( NOT LUAJIT_FIND_QUIETLY )
+  IF( LUAJIT_FOUND AND LUAJIT_LIBRARIES)
+    MESSAGE(STATUS "Found LuaJIT: ${LUAJIT_LIBRARY}" )
+    MARK_AS_ADVANCED(LUAJIT_INCLUDE_DIR LUAJIT_LIBRARIES LUAJIT_LIBRARY LUAJIT_MATH_LIBRARY)
+  ELSE()
+    SET ( LUAJIT_FOUND FALSE )
+  ENDIF()
+ENDIF()

cmake/FindLuabind.cmake

@@ -0,0 +1,75 @@
+# Locate Luabind library
+# This module defines
+#  LUABIND_FOUND, if false, do not try to link to Luabind
+#  LUABIND_LIBRARIES
+#  LUABIND_INCLUDE_DIR, where to find luabind.hpp
+#
+# Note that the expected include convention is
+#  #include <luabind/luabind.hpp>
+# and not
+#  #include <luabind.hpp>
+
+IF( NOT LUABIND_FIND_QUIETLY )
+    MESSAGE(STATUS "Looking for Luabind...")
+ENDIF()
+
+FIND_PATH(LUABIND_INCLUDE_DIR luabind.hpp
+  HINTS
+  $ENV{LUABIND_DIR}
+  PATH_SUFFIXES luabind include/luabind include
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local
+  /usr
+  /opt/local # DarwinPorts
+  /opt
+)
+
+FIND_LIBRARY(LUABIND_LIBRARY
+  NAMES luabind luabind09
+  HINTS
+  $ENV{LUABIND_DIR}
+  PATH_SUFFIXES lib64 lib
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local
+  /usr
+  /opt/local
+  /opt
+)
+
+FIND_LIBRARY(LUABIND_LIBRARY_DBG
+  NAMES luabindd
+  HINTS
+  $ENV{LUABIND_DIR}
+  PATH_SUFFIXES lib64 lib
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /usr/local
+  /usr
+  /opt/local
+  /opt
+)
+
+IF(LUABIND_LIBRARY)
+    SET( LUABIND_LIBRARIES "${LUABIND_LIBRARY}" CACHE STRING "Luabind Libraries")
+ENDIF(LUABIND_LIBRARY)
+
+INCLUDE(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set LUABIND_FOUND to TRUE if
+# all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Luabind  DEFAULT_MSG  LUABIND_LIBRARIES LUABIND_INCLUDE_DIR)
+
+IF( NOT LUABIND_FIND_QUIETLY )
+    IF( LUABIND_FOUND )
+        MESSAGE(STATUS "Found Luabind: ${LUABIND_LIBRARY}" )
+    ENDIF()
+    IF( LUABIND_LIBRARY_DBG )
+        MESSAGE(STATUS "Luabind debug library availible: ${LUABIND_LIBRARY_DBG}")
+    ENDIF()
+ENDIF()
+
+MARK_AS_ADVANCED(LUABIND_INCLUDE_DIR LUABIND_LIBRARIES LUABIND_LIBRARY LUABIND_LIBRARY_DBG)

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)

cmake/FindTBB.cmake

@@ -1,456 +1,284 @@
-# - Find ThreadingBuildingBlocks include dirs and libraries
-# Use this module by invoking find_package with the form:
-#  find_package(TBB
-#    [REQUIRED]             # Fail with error if TBB is not found
-#    )                      #
-# Once done, this will define
-#
-#  TBB_FOUND - system has TBB
-#  TBB_INCLUDE_DIRS - the TBB include directories
-#  TBB_LIBRARIES - TBB libraries to be lined, doesn't include malloc or
-#                  malloc proxy
-#  TBB::tbb - imported target for the TBB library
-#
-#  TBB_VERSION_MAJOR - Major Product Version Number
-#  TBB_VERSION_MINOR - Minor Product Version Number
-#  TBB_INTERFACE_VERSION - Engineering Focused Version Number
-#  TBB_COMPATIBLE_INTERFACE_VERSION - The oldest major interface version
-#                                     still supported. This uses the engineering
-#                                     focused interface version numbers.
-#
-#  TBB_MALLOC_FOUND - system has TBB malloc library
-#  TBB_MALLOC_INCLUDE_DIRS - the TBB malloc include directories
-#  TBB_MALLOC_LIBRARIES - The TBB malloc libraries to be lined
-#  TBB::malloc - imported target for the TBB malloc library
-#
-#  TBB_MALLOC_PROXY_FOUND - system has TBB malloc proxy library
-#  TBB_MALLOC_PROXY_INCLUDE_DIRS = the TBB malloc proxy include directories
-#  TBB_MALLOC_PROXY_LIBRARIES - The TBB malloc proxy libraries to be lined
-#  TBB::malloc_proxy - imported target for the TBB malloc proxy library
-#
-#
-# This module reads hints about search locations from variables:
-#  ENV TBB_ARCH_PLATFORM - for eg. set it to "mic" for Xeon Phi builds
-#  ENV TBB_ROOT or just TBB_ROOT - root directory of tbb installation
-#  ENV TBB_BUILD_PREFIX - specifies the build prefix for user built tbb
-#                         libraries. Should be specified with ENV TBB_ROOT
-#                         and optionally...
-#  ENV TBB_BUILD_DIR - if build directory is different than ${TBB_ROOT}/build
-#
-#
-# Modified by Robert Maynard from the original OGRE source
-#
-#-------------------------------------------------------------------
-# This file is part of the CMake build system for OGRE
-#     (Object-oriented Graphics Rendering Engine)
-# For the latest info, see http://www.ogre3d.org/
-#
-# The contents of this file are placed in the public domain. Feel
-# free to make use of it in any way you like.
-#-------------------------------------------------------------------
-#
-#=============================================================================
-# Copyright 2010-2012 Kitware, Inc.
-# Copyright 2012      Rolf Eike Beer <eike@sf-mail.de>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-
-#=============================================================================
-#  FindTBB helper functions and macros
-#
-
-# Use TBBConfig.cmake if possible.
-
-set(_tbb_find_quiet)
-if (TBB_FIND_QUIETLY)
-  set(_tbb_find_quiet QUIET)
-endif ()
-set(_tbb_find_components)
-set(_tbb_find_optional_components)
-foreach (_tbb_find_component IN LISTS TBB_FIND_COMPONENTS)
-  if (TBB_FIND_REQUIRED_${_tbb_find_component})
-    list(APPEND _tbb_find_components "${_tbb_find_component}")
-  else ()
-    list(APPEND _tbb_find_optional_components "${_tbb_find_component}")
-  endif ()
-endforeach ()
-unset(_tbb_find_component)
-find_package(TBB CONFIG ${_tbb_find_quiet}
-  COMPONENTS ${_tbb_find_components}
-  OPTIONAL_COMPONENTS ${_tbb_find_optional_components})
-unset(_tbb_find_quiet)
-unset(_tbb_find_components)
-unset(_tbb_find_optional_components)
-if (TBB_FOUND)
-  return ()
-endif ()
-
-#====================================================
-# Fix the library path in case it is a linker script
-#====================================================
-function(tbb_extract_real_library library real_library)
-  if(NOT UNIX OR NOT EXISTS ${library})
-    set(${real_library} "${library}" PARENT_SCOPE)
-    return()
-  endif()
-
-  #Read in the first 4 bytes and see if they are the ELF magic number
-  set(_elf_magic "7f454c46")
-  file(READ ${library} _hex_data OFFSET 0 LIMIT 4 HEX)
-  if(_hex_data STREQUAL _elf_magic)
-    #we have opened a elf binary so this is what
-    #we should link to
-    set(${real_library} "${library}" PARENT_SCOPE)
-    return()
-  endif()
-
-  file(READ ${library} _data OFFSET 0 LIMIT 1024)
-  if("${_data}" MATCHES "INPUT \\(([^(]+)\\)")
-    #extract out the .so name from REGEX MATCH command
-    set(_proper_so_name "${CMAKE_MATCH_1}")
-
-    #construct path to the real .so which is presumed to be in the same directory
-    #as the input file
-    get_filename_component(_so_dir "${library}" DIRECTORY)
-    set(${real_library} "${_so_dir}/${_proper_so_name}" PARENT_SCOPE)
-  else()
-    #unable to determine what this library is so just hope everything works
-    #and pass it unmodified.
-    set(${real_library} "${library}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-#===============================================
-# Do the final processing for the package find.
-#===============================================
-macro(findpkg_finish PREFIX TARGET_NAME)
-  if (${PREFIX}_INCLUDE_DIR AND ${PREFIX}_LIBRARY)
-    set(${PREFIX}_FOUND TRUE)
-    set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIR})
-    set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARY})
-  else ()
-    if (${PREFIX}_FIND_REQUIRED AND NOT ${PREFIX}_FIND_QUIETLY)
-      message(FATAL_ERROR "Required library ${PREFIX} not found.")
-    endif ()
-  endif ()
-
-  if (NOT TARGET "TBB::${TARGET_NAME}")
-    if (${PREFIX}_LIBRARY_RELEASE)
-      tbb_extract_real_library(${${PREFIX}_LIBRARY_RELEASE} real_release)
-    endif ()
-    if (${PREFIX}_LIBRARY_DEBUG)
-      tbb_extract_real_library(${${PREFIX}_LIBRARY_DEBUG} real_debug)
-    endif ()
-    add_library(TBB::${TARGET_NAME} UNKNOWN IMPORTED)
-    set_target_properties(TBB::${TARGET_NAME} PROPERTIES
-      INTERFACE_INCLUDE_DIRECTORIES "${${PREFIX}_INCLUDE_DIR}")
-    if (${PREFIX}_LIBRARY_DEBUG AND ${PREFIX}_LIBRARY_RELEASE)
-      set_target_properties(TBB::${TARGET_NAME} PROPERTIES
-        IMPORTED_LOCATION "${real_release}"
-        IMPORTED_LOCATION_DEBUG "${real_debug}"
-        IMPORTED_LOCATION_RELEASE "${real_release}")
-    elseif (${PREFIX}_LIBRARY_RELEASE)
-      set_target_properties(TBB::${TARGET_NAME} PROPERTIES
-        IMPORTED_LOCATION "${real_release}")
-    elseif (${PREFIX}_LIBRARY_DEBUG)
-      set_target_properties(TBB::${TARGET_NAME} PROPERTIES
-        IMPORTED_LOCATION "${real_debug}")
-    endif ()
-  endif ()
-
-  #mark the following variables as internal variables
-  mark_as_advanced(${PREFIX}_INCLUDE_DIR
-                   ${PREFIX}_LIBRARY
-                   ${PREFIX}_LIBRARY_DEBUG
-                   ${PREFIX}_LIBRARY_RELEASE)
-endmacro()
-
-#===============================================
-# Generate debug names from given release names
-#===============================================
-macro(get_debug_names PREFIX)
-  foreach(i ${${PREFIX}})
-    set(${PREFIX}_DEBUG ${${PREFIX}_DEBUG} ${i}d ${i}D ${i}_d ${i}_D ${i}_debug ${i})
-  endforeach()
-endmacro()
-
-#===============================================
-# See if we have env vars to help us find tbb
-#===============================================
-macro(getenv_path VAR)
-   set(ENV_${VAR} $ENV{${VAR}})
-   # replace won't work if var is blank
-   if (ENV_${VAR})
-     string( REGEX REPLACE "\\\\" "/" ENV_${VAR} ${ENV_${VAR}} )
-   endif ()
-endmacro()
-
-#===============================================
-# Couple a set of release AND debug libraries
-#===============================================
-macro(make_library_set PREFIX)
-  if (${PREFIX}_RELEASE AND ${PREFIX}_DEBUG)
-    set(${PREFIX} optimized ${${PREFIX}_RELEASE} debug ${${PREFIX}_DEBUG})
-  elseif (${PREFIX}_RELEASE)
-    set(${PREFIX} ${${PREFIX}_RELEASE})
-  elseif (${PREFIX}_DEBUG)
-    set(${PREFIX} ${${PREFIX}_DEBUG})
-  endif ()
-endmacro()
-
-
-#=============================================================================
-#  Now to actually find TBB
-#
-
-# Get path, convert backslashes as ${ENV_${var}}
-getenv_path(TBB_ROOT)
-
-# initialize search paths
-set(TBB_PREFIX_PATH ${TBB_ROOT} ${ENV_TBB_ROOT})
-set(TBB_INC_SEARCH_PATH "")
-set(TBB_LIB_SEARCH_PATH "")
-
-
-# If user built from sources
-set(TBB_BUILD_PREFIX $ENV{TBB_BUILD_PREFIX})
-if (TBB_BUILD_PREFIX AND ENV_TBB_ROOT)
-  getenv_path(TBB_BUILD_DIR)
-  if (NOT ENV_TBB_BUILD_DIR)
-    set(ENV_TBB_BUILD_DIR ${ENV_TBB_ROOT}/build)
-  endif ()
-
-  # include directory under ${ENV_TBB_ROOT}/include
-  list(APPEND TBB_LIB_SEARCH_PATH
-    ${ENV_TBB_BUILD_DIR}/${TBB_BUILD_PREFIX}_release
-    ${ENV_TBB_BUILD_DIR}/${TBB_BUILD_PREFIX}_debug)
-endif ()
-
-
-# For Windows, let's assume that the user might be using the precompiled
-# TBB packages from the main website. These use a rather awkward directory
-# structure (at least for automatically finding the right files) depending
-# on platform and compiler, but we'll do our best to accommodate it.
-# Not adding the same effort for the precompiled linux builds, though. Those
-# have different versions for CC compiler versions and linux kernels which
-# will never adequately match the user's setup, so there is no feasible way
-# to detect the "best" version to use. The user will have to manually
-# select the right files. (Chances are the distributions are shipping their
-# custom version of tbb, anyway, so the problem is probably nonexistent.)
-if (WIN32 AND MSVC)
-  set(COMPILER_PREFIX "vc7.1")
-  if (MSVC_VERSION EQUAL 1400)
-    set(COMPILER_PREFIX "vc8")
-  elseif(MSVC_VERSION EQUAL 1500)
-    set(COMPILER_PREFIX "vc9")
-  elseif(MSVC_VERSION EQUAL 1600)
-    set(COMPILER_PREFIX "vc10")
-  elseif(MSVC_VERSION EQUAL 1700)
-    set(COMPILER_PREFIX "vc11")
-  elseif(MSVC_VERSION EQUAL 1800)
-    set(COMPILER_PREFIX "vc12")
-  elseif(MSVC_VERSION GREATER_EQUAL 1900)
-    set(COMPILER_PREFIX "vc14")
-  endif ()
-
-  # for each prefix path, add ia32/64\${COMPILER_PREFIX}\lib to the lib search path
-  foreach (dir IN LISTS TBB_PREFIX_PATH)
-    if (CMAKE_CL_64)
-      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/ia64/${COMPILER_PREFIX}/lib)
-      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/ia64/${COMPILER_PREFIX})
-      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/intel64/${COMPILER_PREFIX}/lib)
-      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/intel64/${COMPILER_PREFIX})
-    else ()
-      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/ia32/${COMPILER_PREFIX}/lib)
-      list(APPEND TBB_LIB_SEARCH_PATH ${dir}/lib/ia32/${COMPILER_PREFIX})
-    endif ()
-  endforeach ()
-endif ()
-
-# For OS X binary distribution, choose libc++ based libraries for Mavericks (10.9)
-# and above and AppleClang
-if (CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND
-    NOT CMAKE_SYSTEM_VERSION VERSION_LESS 13.0)
-  set (USE_LIBCXX OFF)
-  cmake_policy(GET CMP0025 POLICY_VAR)
-
-  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()
+# 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}")
+        message(STATUS "TBB interface version: ${TBB_INTERFACE_VERSION}")
+endif (TBB_FOUND)

cmake/FingerPrint-Config.cmake

@@ -0,0 +1,24 @@
+set(OLDFILE ${OUTPUT_DIR}/include/util/fingerprint_impl.hpp)
+set(NEWFILE ${OLDFILE}.tmp)
+set(INFILE ${SOURCE_DIR}/include/util/fingerprint_impl.hpp.in)
+file(MD5 ${SOURCE_DIR}/src/tools/contract.cpp MD5PREPARE)
+file(MD5 ${SOURCE_DIR}/include/util/static_rtree.hpp MD5RTREE)
+file(MD5 ${SOURCE_DIR}/include/util/graph_loader.hpp MD5GRAPH)
+file(MD5 ${SOURCE_DIR}/include/engine/datafacade/internal_datafacade.hpp MD5OBJECTS)
+
+CONFIGURE_FILE(${INFILE} ${NEWFILE})
+
+file(MD5 ${NEWFILE} MD5NEW)
+
+if (EXISTS ${OLDFILE})
+    file(MD5 ${OLDFILE} MD5OLD)
+    if(NOT ${MD5NEW} STREQUAL ${MD5OLD})
+        file(REMOVE_RECURSE ${OLDFILE})
+        file(RENAME ${NEWFILE} ${OLDFILE})
+    else()
+        file(REMOVE_RECURSE ${NEWFILE})
+        message(STATUS "Fingerprint unchanged, not regenerating")
+    endif()
+else()
+    file(RENAME ${NEWFILE} ${OLDFILE})
+endif()

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()

cmake/check_luabind.cmake

@@ -0,0 +1,40 @@
+INCLUDE (CheckCXXSourceCompiles)
+unset(LUABIND_WORKS CACHE)
+unset(LUABIND51_WORKS CACHE)
+set (LUABIND_CHECK_SRC "extern \"C\" {\n#include \"lua.h\"\n#include \"lauxlib.h\"\n}\n#include <luabind/open.hpp>\nint main() { lua_State *x = luaL_newstate(); luabind::open(x); }")
+set (CMAKE_TRY_COMPILE_CONFIGURATION ${CMAKE_BUILD_TYPE})
+set (CMAKE_REQUIRED_INCLUDES "${Boost_INCLUDE_DIR};${LUABIND_INCLUDE_DIR};${LUA_INCLUDE_DIR}")
+set (CMAKE_REQUIRED_LIBRARIES "${LUABIND_LIBRARY};${LUA_LIBRARY}")
+
+find_package(Lua52)
+if(NOT APPLE)
+  find_package(LuaJIT 5.2)
+endif()
+if(LUA52_FOUND)
+  set (CMAKE_REQUIRED_INCLUDES "${Boost_INCLUDE_DIR};${LUABIND_INCLUDE_DIR};${LUA_INCLUDE_DIR}")
+  set (CMAKE_REQUIRED_LIBRARIES "${LUABIND_LIBRARY};${LUA_LIBRARY}")
+  CHECK_CXX_SOURCE_COMPILES("${LUABIND_CHECK_SRC}" LUABIND_WORKS)
+endif()
+
+if(LUABIND_WORKS)
+  message(STATUS "Luabind/Lua5.2 combination working with ${LUA_LIBRARY}")
+else()
+  message(STATUS "Luabind/Lua5.2 not feasible, falling back to Lua 5.1.")
+  unset(LUA_FOUND CACHE)
+  unset(LUA_INCLUDE_DIR CACHE)
+  unset(LUA_LIBRARY CACHE)
+  find_package(Lua51 REQUIRED)
+  if(NOT APPLE)
+    find_package(LuaJIT 5.1)
+  endif()
+  set (CMAKE_REQUIRED_INCLUDES "${Boost_INCLUDE_DIR};${LUABIND_INCLUDE_DIR};${LUA_INCLUDE_DIR}")
+  set (CMAKE_REQUIRED_LIBRARIES "${LUABIND_LIBRARY};${LUA_LIBRARY}")
+
+  CHECK_CXX_SOURCE_COMPILES("${LUABIND_CHECK_SRC}" LUABIND51_WORKS)
+
+  if(LUABIND51_WORKS)
+    message(STATUS "Luabind works with Lua 5.1 at ${LUA_LIBRARY}")
+  else()
+    message(FATAL_ERROR	"Luabind does not work with Lua 5.1 at ${LUA_LIBRARY}, no working Luabind found")
+  endif()
+endif()

cmake/pkgconfig.in

@@ -1,11 +1,11 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-includedir=@PKGCONFIG_INCLUDE_DIR@
-libdir=@PKGCONFIG_LIBRARY_DIR@
+includedir=${prefix}/include
+libdir=${prefix}/lib
 
 Name: libOSRM
 Description: Project OSRM library
-Version: @OSRM_VERSION@
+Version: v@OSRM_VERSION_MAJOR@.@OSRM_VERSION_MINOR@.@OSRM_VERSION_PATCH@
 Requires:
-Libs: -L${libdir} -losrm @PKGCONFIG_OSRM_LDFLAGS@
-Libs.private: @PKGCONFIG_OSRM_DEPENDENT_LIBRARIES@
-Cflags: @PKGCONFIG_OSRM_INCLUDE_FLAGS@ @PKGCONFIG_OSRM_CXXFLAGS@
+Libs: -L${libdir} -losrm
+Libs.private: @ENGINE_LIBRARY_LISTING@
+Cflags: -I${includedir} -I${includedir}/osrm @OSRM_INCLUDE_PATHS_STRING@ @OSRM_DEFINES_STRING@ @CMAKE_CXX_FLAGS@

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()

codecov.yml

@@ -1,6 +1,7 @@
 coverage:
 
   ignore:
+    - unit_tests/.*
     - third_party/.*
 
 comment: off

cucumber.js

@@ -1,7 +1,11 @@
 module.exports = {
-    default: '--strict --tags ~@stress --tags ~@todo --tags ~@mld --require features/support --require features/step_definitions',
-    ch: '--strict --tags ~@stress --tags ~@todo --tags ~@mld -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',
-    mld: '--strict --tags ~@stress --tags ~@todo --tags ~@ch --require features/support --require features/step_definitions -f progress'
-};
+    default: '--require features --tags ~@stress --tags ~@todo',
+    verify: '--require features --tags ~@todo --tags ~@bug --tags ~@stress -f progress',
+    jenkins: '--require features --tags ~@todo --tags ~@bug --tags ~@stress --tags ~@options -f progress',
+    bugs: '--require features --tags @bug',
+    todo: '--require features --tags @todo',
+    all: '--require features'
+}
+
+
+

docker/Dockerfile

@@ -1 +0,0 @@
-Dockerfile-debian

docker/Dockerfile

@@ -0,0 +1,27 @@
+FROM ubuntu:14.04
+
+RUN apt-get update -y
+RUN apt-get install -y build-essential git-core python-pip python-software-properties software-properties-common
+
+RUN apt-get -y install gcc-4.8 g++-4.8 libboost1.55-all-dev llvm-3.4
+RUN apt-get -y install libbz2-dev libstxxl-dev libstxxl1 libxml2-dev
+RUN apt-get -y install libzip-dev lua5.1 liblua5.1-0-dev libtbb-dev libgdal-dev
+RUN apt-get -y install curl cmake cmake-curses-gui
+
+RUN pip install awscli
+
+
+# luabind
+RUN curl https://gist.githubusercontent.com/DennisOSRM/f2eb7b948e6fe1ae319e/raw/install-luabind.sh | sudo bash
+
+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

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
-

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
-

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.

docker/build-image.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+docker build \
+    -t mapbox/osrm:linux \
+    docker/
+

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 ..

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"

docker/run-gcc.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+docker run \
+    -i \
+    -e "CXX=g++" \
+    -v `pwd`:/home/mapbox/osrm-backend \
+    -t mapbox/osrm:linux \
+    /bin/bash -lc "osrm-backend/docker/test.sh"

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

docs/developing.md

@@ -1,62 +0,0 @@
-# Developing / Debugging guidance code
-
-When changing guidance code, it is easy to introduce problems somewhere in the network.
-To get a better feeling of how your changes impact the OSRM experience, we offer ways of generating geojson output to inspect (e.g. with Mapbox Studio).
-When you do changes, make sure to inspect a few areas for the impact of the changes.
-
-## How to use GeoJson-Debugging
-
-This is a short guide to describe usage of our GeoJson debug logging mechanism. It is synchronized to guarantee thread-safe logging.
-
-## Outputting into a single file
-To use it, the inclusion of `geojson_debug_logger.hpp`    `geojson_debug_policies.hpp` from the `util` directory is required.
-
-Geojson debugging requires a few simple steps to output data into a feature collection.
-
-- Create a Scoped Guard that lives through the process and provide it with all required datastructures (it needs to span the lifetime of all your logging efforts)
-- At the location of the output, simply call Write with your own parameters.
-
-A guard (ScopedGeojsonLoggerGuard) requires a logging policy. Per default we provide a way of printing out node-ids as coordinates.
-
-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.
-
-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`).
-
-The policy itself offers a `operator()` accepting a `vector` of `NodeID`.
-
-For outputting data into our file (debug.geojson), we simply need to call the matching logging routine of the guard: `util::ScioedGeojsonLoggerGuard<util::NodeIdVectorToLineString>::Write(list_of_node_ids);`
-(or `guard.Write(list_of_node_ids)` if you created an instance).
-
-### 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`.
-
-This location would enable calls 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
-GeoJson debugging requires a single GeoJsonGuard (ScopedGeojsonLoggerGuard) for each desired output file.
-For each set of template parameters, only the most recent guard will actually produce output.
-
-`util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString> geojson_guard( "debug.geojson", data-for-conversion);`
-
-`util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString> geojson_guard( "debug-2.geojson", data-for-conversion);`
-
-Will not provide a way to write into two files, but only `debug-2` will actually contain features.
-
-We cannot nest-these calls.
-
-If we want to use the same policy for multiple files, we need to use different template parameters both for the logger and the guard.
-
-`util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString,0> geojson_guard( "debug.geojson", data-for-conversion);`
-
-`util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString,1> geojson_guard( "debug-2.geojson", data-for-conversion);`
-
-as well as,
- 
-`util::ScopedGeojsonLoggerGuardr<util::NodeIdVectorToLineString,0>::Write(list_of_node_ids);`
-
-`util::ScopedGeojsonLoggerGuardr<util::NodeIdVectorToLineString,1>::Write(list_of_node_ids);`

docs/libosrm.md

@@ -1,11 +1,7 @@
-## Introduction
-
 OSRM can be used as a library (libosrm) via C++ instead of using it through the HTTP interface and `osrm-routed`. This allows for fine-tuning OSRM and has much less overhead. Here is a quick introduction into how to use `libosrm` in the upcoming v5 release.
 
 Take a look at the example code that lives in the [example directory](https://github.com/Project-OSRM/osrm-backend/tree/master/example). Here is all you ever wanted to know about `libosrm`, that is a short description of what the types do and where to find documentation on it:
 
-## Important interface objects
-
 - [`EngineConfig`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/engine_config.hpp) - for initializing an OSRM instance we can configure certain properties and constraints. E.g. the storage config is the base path such as `france.osm.osrm` from which we derive and load `france.osm.osrm.*` auxiliary files. This also lets you set constraints such as the maximum number of locations allowed for specific services.
 
 - [`OSRM`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/osrm/osrm.hpp) - this is the main Routing Machine type with functions such as `Route` and `Table`. You initialize it with a `EngineConfig`. It does all the heavy lifting for you. Each function takes its own parameters, e.g. the `Route` function takes `RouteParameters`, and a out-reference to a JSON result that gets filled. The return value is a `Status`, indicating error or success.
@@ -20,14 +16,11 @@ Take a look at the example code that lives in the [example directory](https://gi
 
 - [Parameters for other services](https://github.com/Project-OSRM/osrm-backend/tree/master/include/engine/api) - here are all other `*Parameters` you need for other Routing Machine services.
 
-- [JSON](https://github.com/Project-OSRM/osrm-backend/blob/master/include/util/json_container.hpp) - this is a sum type resembling JSON. The Routing Machine service functions take a out-ref to a JSON result and fill it accordingly. It is currently implemented using [mapbox/variant](https://github.com/mapbox/variant) which is similar to [Boost.Variant](http://www.boost.org/doc/libs/1_55_0/doc/html/variant.html). There are two ways to work with this sum type: either provide a visitor that acts on each type on visitation or use the `get` function in case you're sure about the structure. The JSON structure is written down in the [HTTP API](#http-api).
+- [JSON](https://github.com/Project-OSRM/osrm-backend/blob/master/include/util/json_container.hpp) - this is a sum type resembling JSON. The Routing Machine service functions take a out-ref to a JSON result and fill it accordingly. It is currently implemented using [mapbox/variant](https://github.com/mapbox/variant) which is similar to [Boost.Variant](http://www.boost.org/doc/libs/1_55_0/doc/html/variant.html) (Boost documentation is great). There are two ways to work with this sum type: either provide a visitor that acts on each type on visitation or use the `get` function in case you're sure about the structure. The JSON structure is written down in the [[v5 server API|Server-API-v5,-current]].
 
-## Example
+------------------------------------------------------------------------------------------------------------------
 
-See [the example folder](https://github.com/Project-OSRM/osrm-backend/tree/master/example) in the OSRM repository.
-
-## Workflow
-
- - Create an `OSRM` instance initialized with a `EngineConfig`
- - Call the service function on the `OSRM` object providing service specific `*Parameters`
- - Check the return code and use the JSON result
+To summarize:
+ - create an `OSRM` instance initialized with a `EngineConfig`
+ - call the service function on the `OSRM` object providing service specific `*Parameters`
+ - check the return code and use the JSON result

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)

docs/profiles.md

@@ -1,377 +1,34 @@
-# OSRM profiles
-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.
+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.
 
 ## 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
-It's important to understand that profiles are used when preprocessing the OSM data, NOT at query time when routes are computed.
+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))
 
-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 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.
+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.
 
-## Basic structure of profiles
-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.
+## Basic structure of a profile
 
-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)
-- Require library files (optional)
-- Define setup function (required)
-- Define process functions (some are required)
-- Return functions table (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.
 
-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.
-
-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.
-
-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 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`
+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.

docs/releasing.md

@@ -1,59 +1,50 @@
 # Releasing a new OSRM version
 
-We are using http://semver.org/ for versioning with major, minor and patch versions.
+Do decide if this is a major or minor version bump use: http://semver.org/
 
-## Guarantees
+What we guarantee on major version changes:
 
-We are giving the following guarantees between versions:
+- Breaking changes will be in the changelog
+- If we break an HTTP API we bump the version
 
-### Major version change
+What we guarantee on minor version changes:
 
-- There are no guarantees about compatiblity of APIs or datasets
-- Breaking changes will be noted as `BREAKING` in the changelog
+- HTTP API does not include breaking changes
+- C++ library API does not include breaking changes
+- node-osrm API does not include breaking changes
 
-### Minor version change
+What we DO NOT guarantee on minor version changes:
 
-We may introduce forward-compatible changes: query parameters and response properties may be added in responses, but existing properties may not be changed or removed. One exception to this is the addition of new turn types, which we see as forward-compatible changes.
+- file format comp ability. Breakage will be listed in the changelog.
+- new turn types and fields may be introduced. How to handle this see [the HTTP API docs](http.md).
 
-- Forward-compatible HTTP API
-- Forward-compatible C++ library API
-- Forward-compatible node-osrm API
-- No compatiblity between OSRM datasets (needs new processing)
+What we guarantee on patch version changes:
 
-### Patch version change
+- HTTP API does not include breaking changes
+- C++ library API does not include breaking changes
+- node-osrm API does not include breaking changes
+- full file format compatibility
 
-- No change of query parameters or response formats
-- Compatible HTTP API
-- Compatible C++ library API
-- Compatible node-osrm API
-- Compatible OSRM datasets
+## Major or Minor release x.y
 
-## Release and branch management
-
-- 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
-- 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
-- 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`
+1. Make sure all tests are passing (e.g. Travis CI gives you a :thumbs_up:)
 2. Make sure `CHANGELOG.md` is up to date.
-3. Make sure the `package.json` on branch `x.y` has been committed.
-4. Make sure all tests are passing (e.g. Github Actions CI gives you a :heavy_check_mark:)
-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.
-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
-7. Push tags and commits: `git push; git push --tags`
-8. On https://github.com/Project-OSRM/osrm-backend/releases press `Draft a new release`,
-   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.
+3. Make sure the OSRM version in `CMakeLists.txt` is up to date
+4. Use an annotated tag to mark the release: `git tag vx.y.0 -a` Body of the tag description should be the changelog entries.
+5. Push tags and commits: `git push; git push --tags`
+6. Branch of the `vx.y.0` tag to create a release branch `x.y`:
+   `git branch x.y. vx.y.0; git push -u x.y:origin/x.y`
+7. Modify `.travis.yml` to allow builds for the `x.y` branch.
+8. Write a mailing-list post to osrm-talk@openstreetmap.org to announce the release
+
+## Patch release x.y.z
+
+1. Check out the appropriate release branch x.y
+2. Make sure all fixes are listed in the changelog and included in the branch
+3. Make sure all tests are passing (e.g. Travis CI gives you a :thumbs_up:)
+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.
+6. Push tags and commits: `git push; git push --tags`
+7. Proceede with the `node-osrm` release as outlined in the repository.
+8. Write a mailing-list post to osrm-talk@openstreetmap.org to announce the release
+

docs/routed.md

@@ -1,14 +0,0 @@
-## Environment Variables
-
-### SIGNAL_PARENT_WHEN_READY
-
-If the SIGNAL_PARENT_WHEN_READY environment variable is set osrm-routed will
-send the USR1 signal to its parent when it will be running and waiting for
-requests. This could be used to upgrade osrm-routed to a new binary on the fly
-without any service downtime - no incoming requests will be lost.
-
-### DISABLE_ACCESS_LOGGING
-
-If the DISABLE_ACCESS_LOGGING environment variable is set osrm-routed will
-**not** log any http requests to standard output. This can be useful in high
-traffic setup.

docs/src/content.js

@@ -1,16 +0,0 @@
-var fs = require('fs');
-
-/**
- * This file exports the content of your website, as a bunch of concatenated
- * Markdown files. By doing this explicitly, you can control the order
- * of content without any level of abstraction.
- *
- * Using the brfs module, fs.readFileSync calls in this file are translated
- * into strings of those files' content before the file is delivered to a
- * browser: the content is read ahead-of-time and included in bundle.js.
- */
-module.exports =
-      '# HTTP API\n' +
-      fs.readFileSync('./content/http.md', 'utf8') + '\n'+
-      '# libosrm C++ API\n' +
-      fs.readFileSync('./content/libosrm.md', 'utf8') + '\n';

docs/src/index.html

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8' />
-    <meta http-equiv='X-UA-Compatible' content='IE=11' />
-    <title>OSRM API Documentation</title>
-    <meta name='viewport' content='initial-scale=1,maximum-scale=1,user-scalable=no' />
-    <link href='css/base.css' rel='stylesheet' />
-    <link href='css/style.css' rel='stylesheet' />
-    <link href='css/railscasts.css' rel='stylesheet' />
-  </head>
-  <body>
-    <!--START--><div id='app'></div><!--STOP-->
-    <script src='bundle.js'></script>
-  </body>
-</html>

docs/src/index.js

@@ -1,63 +0,0 @@
-'use strict';
-
-/**
- * Brand names, in order to decreasing length, for different
- * media queries.
- */
-module.exports.brandNames = {
-  desktop: 'OSRM API Documentation',
-  tablet: 'OSRM API Docs',
-  mobile: 'OSRM API'
-};
-
-/**
- * Classes that define the top-left brand box.
- */
-module.exports.brandClasses = 'fill-red';
-
-
-/**
- * Text for the link back to the linking website.
- */
-module.exports.backLink = 'Back to project-osrm.org';
-
-/**
- * Runs after highlighting code samples. You can use this
- * hook to, for instance, highlight a token and link it
- * to some canonical part of documentation.
- */
-module.exports.postHighlight = function(html) {
-  return html;
-};
-
-/**
- * Highlight tokens in endpoint URLs, optionally linking to documentation
- * or adding detail. This is the equivalent of postHighlight but it
- * operates on endpoint URLs only.
- */
-function highlightTokens(str) {
-  return str.replace(/{[\w_]+}/g,
-    (str) => '<span class="strong">' + str + '</span>');
-}
-
-/**
- * Transform endpoints given as strings in a highlighted block like
- *
- *     ```endpoint
- *     GET /foo/bar
- *     ```
- *
- * Into HTML nodes that format those endpoints in nice ways.
- */
-module.exports.transformURL = function(value) {
-  let parts = value.split(/\s+/);
-  return {
-    type: 'html',
-    value: `<div class='endpoint dark fill-dark round '>
-      <div class='round-left pad0y pad1x fill-lighten0 code small endpoint-method'>${parts[0]}</div>
-      <div class='pad0 code small endpoint-url'>${highlightTokens(parts[1])}</div>
-    </div>`
-  };
-};
-
-module.exports.remarkPlugins = [];

docs/testing.md

@@ -1,6 +1,6 @@
 # Testsuite
 
-OSRM comes with a testsuite containing both unit-tests using the Boost library and cucumber.js for scenario driven testing.
+OSRM comes with a testsuite containing both unit-tests using the Boost library and cucucmber.js for scenario driven testing.
 
 ## Unit Tests
 
@@ -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
 
@@ -72,9 +55,7 @@ Background:
 
 Scenario: Testbot - Straight Road
     Given the node map
-        """
-        a b c d
-        """
+        | a | b | c | d |
 
     And the ways
         | nodes | highway |
@@ -111,9 +92,7 @@ Background:
 
 Scenario: Testbot - Straight Road
     Given the node map
-        """
-        a b c d
-        """
+        | a | b | c | d |
 
     And the ways
         | nodes | highway | name |
@@ -138,10 +117,8 @@ Background:
 
 Scenario: Testbot - Straight Road
     Given the node map
-        """
-        a b
-        d c
-        """
+        | a | b |
+        | d | c |
 
     And the ways
         | nodes | highway | name |
@@ -163,10 +140,8 @@ Background:
 
 Scenario: Testbot - Straight Road
     Given the node map
-        """
-        a b e
-        d c
-        """
+        | a | b | e |
+        | d | c |   |
 
     And the ways
         | nodes | highway | name |
@@ -190,10 +165,8 @@ Scenario: Enter and Exit mini roundabout with sharp angle   # features/guidance/
     Given the profile "car"                                   # features/step_definitions/data.js:8
     Given a grid size of 10 meters                            # features/step_definitions/data.js:20
     Given the node map                                        # features/step_definitions/data.js:45
-        """
-        a b
-          c d
-        """
+        | a | b |   |
+        |   | c | d |
     And the ways                                              # features/step_definitions/data.js:128
         | nodes | highway         | name |
         | ab    | tertiary        | MySt |
@@ -222,11 +195,9 @@ OSRM converts the grid into a so called edge-based graph.
 ```
 Scenario: Testbot - Intersection
     Given the node map
-        """
-          e
-        b a d
-          c
-        """
+        |   | e |   |
+        | b | a | d |
+        |   | c |   |
 
     And the ways
         | nodes | highway | oneway |
@@ -242,13 +213,11 @@ To guarantee discovery, use:
 ```
 Scenario: Testbot - Intersection
     Given the node map
-        """
-            e
-            4
-        b 1 a 3 d
-            2
-            c
-        """
+        |   |   | e |   |   |
+        |   |   | 4 |   |   |
+        | b | 1 | a | 3 | d |
+        |   |   | 2 |   |   |
+        |   |   | c |   |   |
 
     And the ways
         | nodes | highway | oneway |
@@ -268,139 +237,3 @@ If you are testing for a duration metric, allow for a tiny offset to ensure a pa
 #### Don't Rely on Alternatives
 
 Alternative route discovery is a random feature in itself. The discovery of routes depends on the contraction order of roads and cannot be assumed successful, ever.
-
-### Understanding Turn Restrictions
-
-Adding turn restrictions requires the restriction to follow a very specific format.
-
-We specify them in a table with the header `| type | way:from | way:to | node:via | restriction |`.
-It is important that turn restrictions require micro segmentation.
-
-Consider the following scenario:
-```
-Given the node map:
-    """
-          e
-          |
-    a - - b - - c
-          |
-          d
-    """
-
-And the ways
-    | nodes | oneway |
-    | abc   | yes    |
-    | ebd   | yes    |
-
-And the relations
-    | type        | way:from | way:to | node:via | restriction   |
-    | restriction | abc      | ebd    | b        | no_right_turn |
-```
-
-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.
-E.g. the above scenario could correctly be expressed as:
-
-```
-Given the node map:
-    """
-          e
-          |
-    a - - b - - c
-          |
-          d
-    """
-
-And the ways
-    | nodes | oneway | name |
-    | ab    | yes    | abc  |
-    | bc    | yes    | abc  |
-    | eb    | yes    | ebd  |
-    | bd    | yes    | ebd  |
-
-And the relations
-    | type        | way:from | way:to | node:via | restriction   |
-    | restriction | ab       | bd     | b        | no_right_turn |
-```
-
-Unless this format is used, OSRM will omit the (then ambiguous) turn restrictions and ignore them.
-
-## My Guidance Tests are Failing - Understanding what you can change
-
-If you change some stuff in guidance, you will easily see tests change their result. E.g. if you change the angles for which we report `right`, then obviously some tests might not report a `direction modifier` named `right` anymore.
-
-This small section will try to guide you in making the correct decisions for changing the behaviour of tests.
-
-The difficulty in guidance tests is that not all items can be translated 1:1 from the ascii art into turn-angles.
-
-The turn-angle calculation tries to find turn angles that would represent perceived turn angles, not the exact angle at the connection.
-
-This is necessary, since connections in OSM are always bound by the paradigm that the way is supposed to be in the middle of the actual road.
-For broad streets, you will see stronger angles than the actual turns.
-
-### Don't change the test, change the expected behaviour
-
-If we have a test that looks like this:
-
-```
-Given a grid size of 5 m
-Given the node map
-"""
-a - b - - - - - - c
-     \  
-      d - - - - - e
-"""
-
-When I route I should get
- | waypoints | route       | turns                          |
- | a,e       | abc,bde,bde | depart,turn slight right,arrive|
-```
-
-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`.
-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.
-If you look at a failure, the other way around
-
-```
-Given a grid size of 5 m
-Given the node map
-"""
-a - b - - - - - - c
-     \  
-      d - - - - - e
-"""
-
-When I route I should get
- | waypoints | route       | turns                   |
- | a,e       | abc,bde,bde | depart,turn right,arrive|
-```
-
-where we see a `slight right`, over the expected `right`.
-We could be tempted to adjust the grid size (e.g. from `10 m` to `20` meters). 
-
-Such a change would fundamentally alter the tests, though.
-Since the part `b-d` is a short offset, when we are looking at a grid of size `5 m`, the angle calculation will try and compensate for this offset.
-
-In this case we would see a very slight turn angle. If your change now reports different turn angles, you can of course change the expected result. But you should not adjust the grid size. The test would be testing turn angles of `180` and `100` degrees, instead of `180` and `160`. 
-
-### 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).
-
-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.
-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.
-
-To study a test without post-processing impacts, you can create a copy of the case on a very large grid (like 2000 meters). In such a grid, `turn collapsing` would be essentially disable.
-
-Sadly, there is no general guideline.
-
-### Use Caution
-
-If in doubt, ask another person. Inspect as much of the data as possible (e.g. print un-collapsed steps, turn angles and so on) and use your best judgement, if the new result seems justified.

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
-```
-
-
-
-
-

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,16 +12,18 @@ 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")
+  message(WARNING "Building on a 32 bit system is unsupported")
+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})
@@ -31,4 +33,4 @@ find_package(LibOSRM REQUIRED)
 
 target_link_libraries(osrm-example ${LibOSRM_LIBRARIES} ${LibOSRM_DEPENDENT_LIBRARIES})
 include_directories(SYSTEM ${LibOSRM_INCLUDE_DIRS})
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LibOSRM_CXXFLAGS}")
+set(CMAKE_CXX_FLAGS ${LibOSRM_CXXFLAGS})

example/cmake/FindTBB.cmake

@@ -1 +0,0 @@
-../../cmake/FindTBB.cmake

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)

example/example.cpp

@@ -18,7 +18,7 @@
 
 #include <cstdlib>
 
-int main(int argc, const char *argv[])
+int main(int argc, const char *argv[]) try
 {
     if (argc < 2)
     {
@@ -30,45 +30,36 @@ 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};
+    OSRM osrm{config};
 
     // The following shows how to use the Route service; configure this service
     RouteParameters params;
 
     // Route in monaco
-    params.coordinates.push_back({util::FloatLongitude{7.419758}, util::FloatLatitude{43.731142}});
-    params.coordinates.push_back({util::FloatLongitude{7.419505}, util::FloatLatitude{43.736825}});
+    params.coordinates.push_back({util::FloatLongitude(7.419758), util::FloatLatitude(43.731142)});
+    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));
-        const auto distance = std::get<json::Number>(route.values["distance"]).value;
-        const auto duration = std::get<json::Number>(route.values["duration"]).value;
+        auto &route = routes.values.at(0).get<json::Object>();
+        const auto distance = route.values["distance"].get<json::Number>().value;
+        const auto duration = route.values["duration"].get<json::Number>().value;
 
-        // Warn users if extract does not contain the default coordinates from above
-        if (distance == 0 || duration == 0)
+        // Warn users if extract does not contain the default Berlin coordinates from above
+        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";
@@ -76,15 +67,19 @@ int main(int argc, const char *argv[])
 
         std::cout << "Distance: " << distance << " meter\n";
         std::cout << "Duration: " << duration << " seconds\n";
-        return EXIT_SUCCESS;
     }
     else if (status == Status::Error)
     {
-        const auto code = std::get<json::String>(json_result.values["code"]).value;
-        const auto message = std::get<json::String>(json_result.values["message"]).value;
+        const auto code = result.values["code"].get<json::String>().value;
+        const auto message = result.values["message"].get<json::String>().value;
 
         std::cout << "Code: " << code << "\n";
         std::cout << "Message: " << code << "\n";
         return EXIT_FAILURE;
     }
 }
+catch (const std::exception &e)
+{
+    std::cerr << "Error: " << e.what() << std::endl;
+    return EXIT_FAILURE;
+}

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);

features/bicycle/access.feature

@@ -7,180 +7,170 @@ Feature: Bike - Access tags on ways
 
     Scenario: Bike - Access tag hierarchy on ways
         Then routability should be
-            | highway | access | vehicle | bicycle | bothw   |
-            | primary |        |         |         | cycling |
-            | primary | yes    |         |         | cycling |
-            | primary | no     |         |         |         |
-            | primary |        | yes     |         | cycling |
-            | primary |        | no      |         |         |
-            | primary | no     | yes     |         | cycling |
-            | primary | yes    | no      |         |         |
-            | primary |        |         | yes     | cycling |
-            | primary |        |         | no      |         |
-            | primary | no     |         | yes     | cycling |
-            | primary | yes    |         | no      |         |
-            | primary |        | no      | yes     | cycling |
-            | primary |        | yes     | no      |         |
+            | highway | access | vehicle | bicycle | bothw |
+            |         |        |         |         | x     |
+            |         | yes    |         |         | x     |
+            |         | no     |         |         |       |
+            |         |        | yes     |         | x     |
+            |         |        | no      |         |       |
+            |         | no     | yes     |         | x     |
+            |         | yes    | no      |         |       |
+            |         |        |         | yes     | x     |
+            |         |        |         | no      |       |
+            |         | no     |         | yes     | x     |
+            |         | yes    |         | no      |       |
+            |         |        | no      | yes     | x     |
+            |         |        | 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 |
-            | primary |                |                 |                 | cycling |       |
-            | primary | yes            |                 |                 | cycling |       |
-            | primary | no             |                 |                 |         |       |
-            | primary |                | yes             |                 | cycling |       |
-            | primary |                | no              |                 |         |       |
-            | primary | no             | yes             |                 | cycling |       |
-            | primary | yes            | no              |                 |         |       |
-            | primary |                |                 | yes             | cycling |       |
-            | primary |                |                 | no              |         |       |
-            | primary | no             |                 | yes             | cycling |       |
-            | primary | yes            |                 | no              |         |       |
-            | primary |                | no              | yes             | cycling |       |
-            | primary |                | yes             | no              |         |       |
-            | runway  |                |                 |                 | cycling |       |
-            | runway  | yes            |                 |                 | cycling |       |
-            | runway  | no             |                 |                 |         |       |
-            | runway  |                | yes             |                 | cycling |       |
-            | runway  |                | no              |                 |         |       |
-            | runway  | no             | yes             |                 | cycling |       |
-            | runway  | yes            | no              |                 |         |       |
-            | runway  |                |                 | yes             | cycling |       |
-            | runway  |                |                 | no              |         |       |
-            | runway  | no             |                 | yes             | cycling |       |
-            | runway  | yes            |                 | no              |         |       |
-            | runway  |                | no              | yes             | cycling |       |
-            | runway  |                | yes             | no              |         |       |
+            | highway | access:forward | vehicle:forward | bicycle:forward | forw | backw |
+            |         |                |                 |                 | x    |       |
+            |         | yes            |                 |                 | x    |       |
+            |         | no             |                 |                 |      |       |
+            |         |                | yes             |                 | x    |       |
+            |         |                | no              |                 |      |       |
+            |         | no             | yes             |                 | x    |       |
+            |         | yes            | no              |                 |      |       |
+            |         |                |                 | yes             | x    |       |
+            |         |                |                 | no              |      |       |
+            |         | no             |                 | yes             | x    |       |
+            |         | yes            |                 | no              |      |       |
+            |         |                | no              | yes             | x    |       |
+            |         |                | yes             | no              |      |       |
+            | runway  |                |                 |                 | x    |       |
+            | 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 backward direction
         Then routability should be
-            | highway | access:forward | vehicle:forward | bicycle:forward | forw | backw   |
-            | primary |                |                 |                 |      | cycling |
-            | primary | yes            |                 |                 |      | cycling |
-            | primary | no             |                 |                 |      |         |
-            | primary |                | yes             |                 |      | cycling |
-            | primary |                | no              |                 |      |         |
-            | primary | no             | yes             |                 |      | cycling |
-            | primary | yes            | no              |                 |      |         |
-            | primary |                |                 | yes             |      | cycling |
-            | primary |                |                 | no              |      |         |
-            | primary | no             |                 | yes             |      | cycling |
-            | primary | yes            |                 | no              |      |         |
-            | primary |                | no              | yes             |      | cycling |
-            | primary |                | yes             | no              |      |         |
-            | runway  |                |                 |                 |      | cycling |
-            | runway  | yes            |                 |                 |      | cycling |
-            | runway  | no             |                 |                 |      |         |
-            | runway  |                | yes             |                 |      | cycling |
-            | runway  |                | no              |                 |      |         |
-            | runway  | no             | yes             |                 |      | cycling |
-            | runway  | yes            | no              |                 |      |         |
-            | runway  |                |                 | yes             |      | cycling |
-            | runway  |                |                 | no              |      |         |
-            | runway  | no             |                 | yes             |      | cycling |
-            | runway  | yes            |                 | no              |      |         |
-            | runway  |                | no              | yes             |      | cycling |
-            | runway  |                | yes             | no              |      |         |
+            | highway | access:forward | vehicle:forward | bicycle:forward | forw | backw |
+            |         |                |                 |                 |      | x     |
+            |         | yes            |                 |                 |      | x     |
+            |         | no             |                 |                 |      |       |
+            |         |                | yes             |                 |      | x     |
+            |         |                | no              |                 |      |       |
+            |         | no             | yes             |                 |      | x     |
+            |         | yes            | no              |                 |      |       |
+            |         |                |                 | yes             |      | x     |
+            |         |                |                 | no              |      |       |
+            |         | no             |                 | yes             |      | x     |
+            |         | yes            |                 | no              |      |       |
+            |         |                | no              | yes             |      | x     |
+            |         |                | yes             | no              |      |       |
+            | runway  |                |                 |                 |      | x     |
+            | 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              |      |       |
 
     Scenario: Bike - Overwriting implied acccess on ways
         Then routability should be
-            | highway  | access | vehicle | bicycle | bothw   |
-            | cycleway |        |         |         | cycling |
-            | runway   |        |         |         |         |
-            | cycleway | no     |         |         |         |
-            | cycleway |        | no      |         |         |
-            | cycleway |        |         | no      |         |
-            | runway   | yes    |         |         | cycling |
-            | runway   |        | yes     |         | cycling |
-            | runway   |        |         | yes     | cycling |
+            | highway  | access | vehicle | bicycle | bothw |
+            | cycleway |        |         |         | x     |
+            | runway   |        |         |         |       |
+            | cycleway | no     |         |         |       |
+            | cycleway |        | no      |         |       |
+            | cycleway |        |         | no      |       |
+            | runway   | yes    |         |         | x     |
+            | runway   |        | yes     |         | x     |
+            | runway   |        |         | yes     | x     |
 
     Scenario: Bike - Access tags on ways
         Then routability should be
-            | access       | vehicle      | bicycle      | bothw   |
-            |              |              |              | cycling |
-            | yes          |              |              | cycling |
-            | permissive   |              |              | cycling |
-            | designated   |              |              | cycling |
-            | some_tag     |              |              | cycling |
-            | no           |              |              |         |
-            | private      |              |              |         |
-            | agricultural |              |              |         |
-            | forestry     |              |              |         |
-            | delivery     |              |              |         |
-            |              | yes          |              | cycling |
-            |              | permissive   |              | cycling |
-            |              | designated   |              | cycling |
-            |              | some_tag     |              | cycling |
-            |              | no           |              |         |
-            |              | private      |              |         |
-            |              | agricultural |              |         |
-            |              | forestry     |              |         |
-            |              | delivery     |              |         |
-            |              |              | yes          | cycling |
-            |              |              | permissive   | cycling |
-            |              |              | designated   | cycling |
-            |              |              | some_tag     | cycling |
-            |              |              | no           |         |
-            |              |              | private      |         |
-            |              |              | agricultural |         |
-            |              |              | forestry     |         |
-            |              |              | delivery     |         |
-            |              |              | use_sidepath |         |
+            | access       | vehicle      | bicycle      | bothw |
+            |              |              |              | x     |
+            | yes          |              |              | x     |
+            | permissive   |              |              | x     |
+            | designated   |              |              | x     |
+            | some_tag     |              |              | x     |
+            | no           |              |              |       |
+            | private      |              |              |       |
+            | agricultural |              |              |       |
+            | forestry     |              |              |       |
+            | delivery     |              |              |       |
+            |              | yes          |              | x     |
+            |              | permissive   |              | x     |
+            |              | designated   |              | x     |
+            |              | some_tag     |              | x     |
+            |              | no           |              |       |
+            |              | private      |              |       |
+            |              | agricultural |              |       |
+            |              | forestry     |              |       |
+            |              | delivery     |              |       |
+            |              |              | yes          | x     |
+            |              |              | permissive   | x     |
+            |              |              | designated   | x     |
+            |              |              | some_tag     | x     |
+            |              |              | no           |       |
+            |              |              | private      |       |
+            |              |              | agricultural |       |
+            |              |              | forestry     |       |
+            |              |              | delivery     |       |
 
     Scenario: Bike - Access tags on both node and way
         Then routability should be
-            | access   | node/access | bothw   |
-            | yes      | yes         | cycling |
-            | yes      | no          |         |
-            | yes      | some_tag    | cycling |
-            | no       | yes         |         |
-            | no       | no          |         |
-            | no       | some_tag    |         |
-            | some_tag | yes         | cycling |
-            | some_tag | no          |         |
-            | some_tag | some_tag    | cycling |
+            | access   | node/access | bothw |
+            | yes      | yes         | x     |
+            | yes      | no          |       |
+            | yes      | some_tag    | x     |
+            | no       | yes         |       |
+            | no       | no          |       |
+            | no       | some_tag    |       |
+            | some_tag | yes         | x     |
+            | some_tag | no          |       |
+            | some_tag | some_tag    | x     |
 
     Scenario: Bike - Access combinations
         Then routability should be
-            | highway     | access     | vehicle    | bicycle    | forw    | backw   |
-            | runway      | private    |            | yes        | cycling | cycling |
-            | footway     |            | no         | permissive | cycling | cycling |
-            | motorway    |            |            | yes        | cycling |         |
-            | track       | forestry   |            | permissive | cycling | cycling |
-            | cycleway    | yes        | designated | no         |         |         |
-            | primary     |            | yes        | private    |         |         |
-            | residential | permissive |            | no         |         |         |
+            | highway     | access     | vehicle    | bicycle    | forw | backw |
+            | runway      | private    |            | yes        | x    | x     |
+            | footway     |            | no         | permissive | x    | x     |
+            | motorway    |            |            | yes        | x    |       |
+            | track       | forestry   |            | permissive | x    | x     |
+            | cycleway    | yes        | designated | no         |      |       |
+            | primary     |            | yes        | private    |      |       |
+            | residential | permissive |            | no         |      |       |
 
     Scenario: Bike - Ignore access tags for other modes
         Then routability should be
-            | highway  | boat | motor_vehicle | moped | bothw   |
-            | river    | yes  |               |       |         |
-            | cycleway | no   |               |       | cycling |
-            | runway   |      | yes           |       |         |
-            | cycleway |      | no            |       | cycling |
-            | runway   |      |               | yes   |         |
-            | cycleway |      |               | no    | cycling |
-
-    Scenario: Bike - Bridleways when access is explicit
-        Then routability should be
-            | highway   | horse      | foot | bicycle | bothw        |
-            | bridleway |            |      | yes     | cycling      |
-            | bridleway |            | yes  |         | pushing bike |
-            | bridleway | designated |      |         |              |
-            | bridleway |            |      |         |              |
-
-    Scenario: Bike - Tram with oneway when access is implicit
-        Then routability should be
-            | highway     | railway | access | oneway | forw    | backw        |
-            | residential | tram    |        | yes    | cycling | pushing bike |
-            | service     | tram    | psv    | yes    | cycling | pushing bike |
-
-    Scenario: Bike - Access combinations
-        Then routability should be
-            | highway    | access     | bothw   |
-            | primary    | permissive | cycling |
-            | steps      | permissive | cycling |
-            | footway    | permissive | cycling |
-            | garbagetag | permissive | cycling |
+            | highway  | boat | motor_vehicle | moped | bothw |
+            | river    | yes  |               |       |       |
+            | cycleway | no   |               |       | x     |
+            | runway   |      | yes           |       |       |
+            | cycleway |      | no            |       | x     |
+            | runway   |      |               | yes   |       |
+            | cycleway |      |               | no    | x     |

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   |
-            |             |              |              |              | cycling |
-            | yes         |              |              |              | cycling |
-            | no          |              |              |              |         |
-            |             | yes          |              |              | cycling |
-            |             | no           |              |              |         |
-            | no          | yes          |              |              | cycling |
-            | yes         | no           |              |              |         |
-            |             |              | yes          |              | cycling |
-            |             |              | no           |              |         |
-            |             |              | no           | crossing     | cycling |
-            | no          |              | yes          |              | cycling |
-            | yes         |              | no           |              |         |
-            |             | no           | yes          |              | cycling |
-            |             | yes          | no           |              |         |
+            | node/access | node/vehicle | node/bicycle | node/highway  | bothw |
+            |             |              |              |               | x     |
+            | yes         |              |              |               | x     |
+            | no          |              |              |               |       |
+            |             | yes          |              |               | x     |
+            |             | no           |              |               |       |
+            | no          | yes          |              |               | x     |
+            | yes         | no           |              |               |       |
+            |             |              | yes          |               | x     |
+            |             |              | no           |               |       |
+            |             |              | no           | crossing      | x     |
+            | no          |              | yes          |               | x     |
+            | yes         |              | no           |               |       |
+            |             | no           | yes          |               | x     |
+            |             | 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   |
-            | cycleway |             |              |              | cycling |
-            | runway   |             |              |              |         |
-            | cycleway | no          |              |              |         |
-            | cycleway |             | no           |              |         |
-            | cycleway |             |              | no           |         |
-            | runway   | yes         |              |              |         |
-            | runway   |             | yes          |              |         |
-            | runway   |             |              | yes          |         |
+            | highway  | node/access | node/vehicle | node/bicycle | bothw |
+            | cycleway |             |              |              | x     |
+            | runway   |             |              |              |       |
+            | cycleway | no          |              |              |       |
+            | cycleway |             | no           |              |       |
+            | cycleway |             |              | no           |       |
+            | runway   | yes         |              |              |       |
+            | runway   |             | yes          |              |       |
+            | runway   |             |              | yes          |       |
 
     Scenario: Bike - Access tags on nodes
         Then routability should be
-            | node/access  | node/vehicle | node/bicycle | bothw   |
-            |              |              |              | cycling |
-            | yes          |              |              | cycling |
-            | permissive   |              |              | cycling |
-            | designated   |              |              | cycling |
-            | some_tag     |              |              | cycling |
-            | no           |              |              |         |
-            | private      |              |              |         |
-            | agricultural |              |              |         |
-            | forestry     |              |              |         |
-            | delivery     |              |              |         |
-            |              | yes          |              | cycling |
-            |              | permissive   |              | cycling |
-            |              | designated   |              | cycling |
-            |              | some_tag     |              | cycling |
-            |              | no           |              |         |
-            |              | private      |              |         |
-            |              | agricultural |              |         |
-            |              | forestry     |              |         |
-            |              | delivery     |              |         |
-            |              |              | yes          | cycling |
-            |              |              | permissive   | cycling |
-            |              |              | designated   | cycling |
-            |              |              | some_tag     | cycling |
-            |              |              | no           |         |
-            |              |              | private      |         |
-            |              |              | agricultural |         |
-            |              |              | forestry     |         |
-            |              |              | delivery     |         |
+            | node/access  | node/vehicle | node/bicycle | bothw |
+            |              |              |              | x     |
+            | yes          |              |              | x     |
+            | permissive   |              |              | x     |
+            | designated   |              |              | x     |
+            | some_tag     |              |              | x     |
+            | no           |              |              |       |
+            | private      |              |              |       |
+            | agricultural |              |              |       |
+            | forestry     |              |              |       |
+            | delivery     |              |              |       |
+            |              | yes          |              | x     |
+            |              | permissive   |              | x     |
+            |              | designated   |              | x     |
+            |              | some_tag     |              | x     |
+            |              | no           |              |       |
+            |              | private      |              |       |
+            |              | agricultural |              |       |
+            |              | forestry     |              |       |
+            |              | delivery     |              |       |
+            |              |              | yes          | x     |
+            |              |              | permissive   | x     |
+            |              |              | designated   | x     |
+            |              |              | some_tag     | x     |
+            |              |              | no           |       |
+            |              |              | private      |       |
+            |              |              | agricultural |       |
+            |              |              | forestry     |       |
+            |              |              | delivery     |       |

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           |
-

features/bicycle/area.feature

@@ -7,11 +7,9 @@ Feature: Bike - Squares and other areas
     @square
     Scenario: Bike - Route along edge of a squares
         Given the node map
-            """
-            x
-            a b
-            d c
-            """
+            | x |   |
+            | a | b |
+            | d | c |
 
         And the ways
             | nodes | area | highway     |
@@ -32,11 +30,9 @@ Feature: Bike - Squares and other areas
     @building
     Scenario: Bike - Don't route on buildings
         Given the node map
-            """
-            x
-            a b
-            d c
-            """
+            | x |   |
+            | a | b |
+            | d | c |
 
         And the ways
             | nodes | highway | area | building | access |
@@ -57,11 +53,9 @@ Feature: Bike - Squares and other areas
     @parking
     Scenario: Bike - parking areas
         Given the node map
-            """
-            e     f
-            x a b y
-              d c
-            """
+            | e |   |   | f |
+            | x | a | b | y |
+            |   | d | c |   |
 
         And the ways
             | nodes | highway | amenity |
@@ -71,26 +65,24 @@ Feature: Bike - Squares and other areas
             | abcda | (nil)   | parking |
 
         When I route I should get
-            | from | to | route       |
-            | x    | y  | xa,abcda,by |
-            | y    | x  | by,abcda,xa |
-            | a    | b  | abcda,abcda |
-            | a    | d  | abcda,abcda |
-            | b    | c  | abcda,abcda |
-            | c    | b  | abcda,abcda |
-            | c    | d  | abcda,abcda |
-            | d    | c  | abcda,abcda |
-            | d    | a  | abcda,abcda |
-            | a    | d  | abcda,abcda |
+            | from | to | route          |
+            | x    | y  | xa,abcda,by,by |
+            | y    | x  | by,abcda,xa,xa |
+            | a    | b  | abcda,abcda    |
+            | a    | d  | abcda,abcda    |
+            | b    | c  | abcda,abcda    |
+            | c    | b  | abcda,abcda    |
+            | c    | d  | abcda,abcda    |
+            | d    | c  | abcda,abcda    |
+            | d    | a  | abcda,abcda    |
+            | a    | d  | abcda,abcda    |
 
 
     @train @platform
     Scenario: Bike - railway platforms
         Given the node map
-            """
-            x a b y
-              d c
-            """
+            | x | a | b | y |
+            |   | d | c |   |
 
         And the ways
             | nodes | highway | railway  |
@@ -99,14 +91,14 @@ Feature: Bike - Squares and other areas
             | abcda | (nil)   | platform |
 
         When I route I should get
-            | from | to | route       |
-            | x    | y  | xa,abcda,by |
-            | y    | x  | by,abcda,xa |
-            | a    | b  | abcda,abcda |
-            | a    | d  | abcda,abcda |
-            | b    | c  | abcda,abcda |
-            | c    | b  | abcda,abcda |
-            | c    | d  | abcda,abcda |
-            | d    | c  | abcda,abcda |
-            | d    | a  | abcda,abcda |
-            | a    | d  | abcda,abcda |
+            | from | to | route          |
+            | x    | y  | xa,abcda,by,by |
+            | y    | x  | by,abcda,xa,xa |
+            | a    | b  | abcda,abcda    |
+            | a    | d  | abcda,abcda    |
+            | b    | c  | abcda,abcda    |
+            | c    | b  | abcda,abcda    |
+            | c    | d  | abcda,abcda    |
+            | d    | c  | abcda,abcda    |
+            | d    | a  | abcda,abcda    |
+            | a    | d  | abcda,abcda    |

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

features/bicycle/bridge.feature

@@ -4,13 +4,11 @@ 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
-                  d
-                  e   f g
-            """
+            | a | b | c |   |   |
+            |   |   | d |   |   |
+            |   |   | e | f | g |
 
         And the ways
             | nodes | highway | bridge  | bicycle |
@@ -19,16 +17,21 @@ 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
-                  d
-                  e   f g
-            """
+            | a | b | c |   |   |
+            |   |   | d |   |   |
+            |   |   | e | f | g |
 
         And the ways
             | nodes | highway | bridge  | duration |
@@ -37,8 +40,8 @@ Feature: Bicycle - Handle cycling
             | efg   | primary |         |          |
 
         When I route I should get
-            | from | to | route           | modes                           | speed  |
-            | a    | g  | abc,cde,efg,efg | cycling,cycling,cycling,cycling | 6 km/h |
-            | b    | f  | abc,cde,efg,efg | cycling,cycling,cycling,cycling | 5 km/h |
-            | c    | e  | cde,cde         | cycling,cycling                 | 2 km/h |
-            | e    | c  | cde,cde         | cycling,cycling                 | 2 km/h |
+            | from | to | route           | modes                                  | speed  |
+            | a    | g  | 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 |

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)],[()],[()] |

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 |          | track         |                | x    |       |
-            | motorway |          | opposite      |                | x    | x     |
+            | motorway | opposite |               |                |      | x     |
+            | motorway |          | track         |                |      | x     |
+            | motorway |          | opposite      |                |      | x     |
             | motorway |          |               | track          | x    |       |
-            | motorway |          |               | opposite       | x    | x     |
-            # motorways are implicit oneways and cycleway tracks next to oneways always
-            # follow the oneway direction (unless tagged as opposite)
-            | motorway |          | track         | track          | x    |       |
+            | motorway |          |               | opposite       | x    |       |
+            | motorway |          | track         | track          | x    | 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 |

features/bicycle/destination.feature

@@ -6,12 +6,10 @@ Feature: Bike - Destination only, no passing through
 
     Scenario: Bike - Destination only street
         Given the node map
-            """
-            a       e
-              b c d
-
-            x       y
-            """
+            | a |   |   |   | e |
+            |   | b | c | d |   |
+            |   |   |   |   |   |
+            | x |   |   |   | y |
 
         And the ways
             | nodes | access      |
@@ -21,24 +19,22 @@ Feature: Bike - Destination only, no passing through
             | axye  |             |
 
         When I route I should get
-            | from | to | route     |
-            | a    | b  | ab,ab     |
-            | a    | c  | ab,bcd    |
-            | a    | d  | ab,bcd    |
-            | a    | e  | axye,axye |
-            | e    | d  | de,de     |
-            | e    | c  | de,bcd    |
-            | e    | b  | de,bcd    |
-            | e    | a  | axye,axye |
+            | from | to | route      |
+            | a    | b  | ab,ab      |
+            | a    | c  | ab,bcd,bcd |
+            | a    | d  | ab,bcd,bcd |
+            | a    | e  | axye,axye  |
+            | e    | d  | de,de      |
+            | e    | c  | de,bcd,bcd |
+            | e    | b  | de,bcd,bcd |
+            | e    | a  | axye,axye  |
 
     Scenario: Bike - Destination only street
         Given the node map
-            """
-            a       e
-              b c d
-
-            x       y
-            """
+            | a |   |   |   | e |
+            |   | b | c | d |   |
+            |   |   |   |   |   |
+            | x |   |   |   | y |
 
         And the ways
             | nodes | access      |
@@ -49,23 +45,21 @@ Feature: Bike - Destination only, no passing through
             | axye  |             |
 
         When I route I should get
-            | from | to | route     |
-            | a    | b  | ab,ab     |
-            | a    | c  | ab,bc     |
-            | a    | d  | ab,bc,cd  |
-            | a    | e  | axye,axye |
-            | e    | d  | de,de     |
-            | e    | c  | de,cd,cd  |
-            | e    | b  | de,cd,bc  |
-            | e    | a  | axye,axye |
+            | from | to | route       |
+            | a    | b  | ab,ab       |
+            | a    | c  | ab,bc,bc    |
+            | a    | d  | ab,bc,cd,cd |
+            | a    | e  | axye,axye   |
+            | e    | d  | de,de       |
+            | e    | c  | de,cd,cd    |
+            | e    | b  | de,cd,bc,bc |
+            | e    | a  | axye,axye   |
 
     Scenario: Bike - Routing inside a destination only area
         Given the node map
-            """
-            a   c   e
-              b   d
-            x       y
-            """
+            | a |   | c |   | e |
+            |   | b |   | d |   |
+            | x |   |   |   | y |
 
         And the ways
             | nodes | access      |
@@ -76,8 +70,8 @@ Feature: Bike - Destination only, no passing through
             | axye  |             |
 
         When I route I should get
-            | from | to | route       |
-            | a    | e  | ab,bc,cd,de |
-            | e    | a  | de,cd,bc,ab |
-            | b    | d  | bc,cd       |
-            | d    | b  | cd,bc       |
+            | from | to | route          |
+            | a    | e  | ab,bc,cd,de,de |
+            | e    | a  | de,cd,bc,ab,ab |
+            | b    | d  | bc,cd,cd       |
+            | d    | b  | cd,bc,bc       |

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 |

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        |
-
-

features/bicycle/ferry.feature

@@ -6,11 +6,9 @@ Feature: Bike - Handle ferry routes
 
     Scenario: Bike - Ferry route
         Given the node map
-            """
-            a b c
-                d
-                e f g
-            """
+            | a | b | c |   |   |
+            |   |   | d |   |   |
+            |   |   | e | f | g |
 
         And the ways
             | nodes | highway | route | bicycle |
@@ -21,17 +19,20 @@ 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
         Given the node map
-            """
-            a b c d
-                e f
-                g h
-                i j
-            """
+            | a | b | c | d |
+            |   |   | e | f |
+            |   |   | g | h |
+            |   |   | i | j |
 
         And the ways
             | nodes | highway | route | bicycle | duration |
@@ -47,9 +48,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
             | nodes | highway | route | bicycle | duration |
@@ -58,6 +58,6 @@ Feature: Bike - Handle ferry routes
             | abcd  |         | ferry | yes     | 1:00     |
 
         When I route I should get
-            | from | to | route     | time  |
-            | a    | d  | abcd,abcd | 3600s |
-            | d    | a  | abcd,abcd | 3600s |
+            | from | to | route | time       |
+            | a    | d  | abcd,abcd  | 3600s +-10 |
+            | d    | a  | abcd,abcd  | 3600s +-10 |

features/bicycle/maxspeed.feature

@@ -40,9 +40,7 @@ Feature: Bike - Max speed restrictions
 
     Scenario: Bike - Do not use maxspeed when higher that way type speed
         Given the node map
-            """
-            a b c
-            """
+            | a | b | c |
 
         And the ways
             | nodes | highway     | maxspeed |

features/bicycle/mode.feature

@@ -6,10 +6,8 @@ Feature: Bike - Mode flag
 
     Scenario: Bike - Mode when using a ferry
     	Given the node map
-    	 """
-    	 a b
-    	   c d
-    	 """
+    	 | a | b |   |
+    	 |   | c | d |
 
     	And the ways
     	 | nodes | highway | route | duration |
@@ -20,15 +18,16 @@ 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
-     	 """
-     	 a b
-     	   c d
-     	 """
+     	 | a | b |   |
+     	 |   | c | d |
 
      	And the ways
      	 | nodes | highway | railway | bicycle |
@@ -39,25 +38,22 @@ 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
-     	 """
-     	 a b e
-     	 f c d
-     	 """
+     	 | a | b |   |
+     	 |   | c | d |
 
      	And the ways
      	 | nodes | highway | oneway |
      	 | ab    | primary |        |
      	 | bc    | primary | yes    |
      	 | cd    | primary |        |
-     	 | be    | primary |        |
-     	 | cf    | primary |        |
-
 
      	When I route I should get
      	 | from | to | route       | modes                                |
@@ -65,12 +61,92 @@ 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 b
-         """
+         | a | b |
 
         And the ways
          | nodes | oneway |
@@ -83,9 +159,7 @@ Feature: Bike - Mode flag
 
     Scenario: Bicycle - Modes when starting on reverse oneway
         Given the node map
-         """
-         a b
-         """
+         | a | b |
 
         And the ways
          | nodes | oneway |

features/bicycle/names.feature

@@ -6,10 +6,8 @@ Feature: Bike - Street names in instructions
 
     Scenario: Bike - A named street
         Given the node map
-            """
-            a b
-              c
-            """
+            | a | b |
+            |   | c |
 
         And the ways
             | nodes | name     | ref |
@@ -17,15 +15,13 @@ Feature: Bike - Street names in instructions
             | bc    | Your Way | A7  |
 
         When I route I should get
-            | from | to | route           | ref   |
-            | a    | c  | My Way,Your Way | A6,A7 |
+            | from | to | route                                   |
+            | a    | c  | My Way (A6),Your Way (A7),Your Way (A7) |
 
     @unnamed
-    Scenario: Bike - No longer use way type to describe unnamed ways, see #3231
+    Scenario: Bike - Use way type to describe unnamed ways
         Given the node map
-            """
-            a b c d
-            """
+            | a | b | c | d |
 
         And the ways
             | nodes | highway  | name |
@@ -33,5 +29,5 @@ Feature: Bike - Street names in instructions
             | bcd   | track    |      |
 
         When I route I should get
-            | from | to | route |
-            | a    | d  | ,     |
+            | from | to | route                                              |
+            | a    | d  | {highway:cycleway},{highway:track},{highway:track} |

features/bicycle/oneway.feature

@@ -8,22 +8,18 @@ Feature: Bike - Oneway streets
 
     Scenario: Bike - Simple oneway
         Then routability should be
-            | highway | foot | oneway | forw    | backw        |
-            | primary | no   | yes    | cycling |              |
-            | primary |      | yes    | cycling | pushing bike |
+            | highway | foot | oneway | forw | backw |
+            | primary | no   | yes    | x    |       |
 
     Scenario: Simple reverse oneway
         Then routability should be
-            | highway | foot | oneway | forw         | backw   |
-            | primary | no   | -1     |              | cycling |
-            | primary |      | -1     | pushing bike | cycling |
+            | highway | foot | oneway | forw | backw |
+            | primary | no   | -1     |      | x     |
 
     Scenario: Bike - Around the Block
         Given the node map
-            """
-              a b
-            f d c e
-            """
+            | a | b |
+            | d | c |
 
         And the ways
             | nodes | oneway | foot |
@@ -31,8 +27,6 @@ Feature: Bike - Oneway streets
             | bc    |        | no   |
             | cd    |        | no   |
             | da    |        | no   |
-            | df    |        | no   |
-            | ce    |        | no   |
 
         When I route I should get
             | from | to | route       |
@@ -41,89 +35,87 @@ Feature: Bike - Oneway streets
 
     Scenario: Bike - Handle various oneway tag values
         Then routability should be
-            | foot | oneway   | forw    | backw   |
-            | no   |          | cycling | cycling |
-            | no   | nonsense | cycling | cycling |
-            | no   | no       | cycling | cycling |
-            | no   | false    | cycling | cycling |
-            | no   | 0        | cycling | cycling |
-            | no   | yes      | cycling |         |
-            | no   | true     | cycling |         |
-            | no   | 1        | cycling |         |
-            | no   | -1       |         | cycling |
+            | foot | oneway   | forw | backw |
+            | no   |          | x    | x     |
+            | no   | nonsense | x    | x     |
+            | no   | no       | x    | x     |
+            | no   | false    | x    | x     |
+            | no   | 0        | x    | x     |
+            | no   | yes      | x    |       |
+            | no   | true     | x    |       |
+            | no   | 1        | x    |       |
+            | no   | -1       |      | x     |
 
     Scenario: Bike - Implied oneways
         Then routability should be
-            | highway       | foot | bicycle | junction   | forw    | backw   | #                     |
-            |               | no   |         |            | cycling | cycling |                       |
-            |               | no   |         | roundabout | cycling |         |                       |
-            | motorway      | no   | yes     |            | cycling |         |                       |
-            | motorway_link | no   | yes     |            | cycling | cycling | does not imply oneway |
-            | motorway      | no   | yes     | roundabout | cycling |         |                       |
-            | motorway_link | no   | yes     | roundabout | cycling |         |                       |
+            | highway         | foot | bicycle | junction   | forw | backw | #                     |
+            |                 | no   |         |            | x    | x     |                       |
+            |                 | no   |         | roundabout | x    |       |                       |
+            | motorway        | no   | yes     |            | x    |       |                       |
+            | motorway_link   | no   | yes     |            | x    | x     | does not imply oneway |
+            | motorway        | no   | yes     | roundabout | x    |       |                       |
+            | motorway_link   | no   | yes     | roundabout | x    |       |                       |
 
     Scenario: Bike - Overriding implied oneways
         Then routability should be
-            | highway       | foot | junction   | oneway | forw    | backw   |
-            | primary       | no   | roundabout | no     | cycling | cycling |
-            | primary       | no   | roundabout | yes    | cycling |         |
-            | motorway_link | no   |            | -1     |         |         |
-            | trunk_link    | no   |            | -1     |         |         |
-            | primary       | no   | roundabout | -1     |         | cycling |
+            | highway         | foot | junction   | oneway | forw | backw |
+            | primary         | no   | roundabout | no     | x    | x     |
+            | primary         | no   | roundabout | yes    | x    |       |
+            | motorway_link   | no   |            | -1     |      |       |
+            | trunk_link      | no   |            | -1     |      |       |
+            | 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   |
-            | no   | yes            |        |            | cycling |         |
-            | no   | yes            | yes    |            | cycling |         |
-            | no   | yes            | no     |            | cycling |         |
-            | no   | yes            | -1     |            | cycling |         |
-            | no   | yes            |        | roundabout | cycling |         |
-            | no   | no             |        |            | cycling | cycling |
-            | no   | no             | yes    |            | cycling | cycling |
-            | no   | no             | no     |            | cycling | cycling |
-            | no   | no             | -1     |            | cycling | cycling |
-            | no   | no             |        | roundabout | cycling | cycling |
-            | no   | -1             |        |            |         | cycling |
-            | no   | -1             | yes    |            |         | cycling |
-            | no   | -1             | no     |            |         | cycling |
-            | no   | -1             | -1     |            |         | cycling |
-            | no   | -1             |        | roundabout |         | cycling |
+            | foot | oneway:bicycle | oneway | junction   | forw | backw |
+            | no   | yes            |        |            | x    |       |
+            | no   | yes            | yes    |            | x    |       |
+            | no   | yes            | no     |            | x    |       |
+            | no   | yes            | -1     |            | x    |       |
+            | no   | yes            |        | roundabout | x    |       |
+            | no   | no             |        |            | x    | x     |
+            | no   | no             | yes    |            | x    | x     |
+            | no   | no             | no     |            | x    | x     |
+            | no   | no             | -1     |            | x    | x     |
+            | no   | no             |        | roundabout | x    | x     |
+            | no   | -1             |        |            |      | x     |
+            | no   | -1             | yes    |            |      | x     |
+            | no   | -1             | no     |            |      | x     |
+            | no   | -1             | -1     |            |      | x     |
+            | no   | -1             |        | roundabout |      | x     |
 
     Scenario: Bike - Contra flow
         Then routability should be
-            | foot | oneway | cycleway       | forw    | backw   |
-            | no   | yes    | opposite       | cycling | cycling |
-            | no   | yes    | opposite_track | cycling | cycling |
-            | no   | yes    | opposite_lane  | cycling | cycling |
-            | no   | -1     | opposite       | cycling | cycling |
-            | no   | -1     | opposite_track | cycling | cycling |
-            | no   | -1     | opposite_lane  | cycling | cycling |
-            | no   | no     | opposite       | cycling | cycling |
-            | no   | no     | opposite_track | cycling | cycling |
-            | no   | no     | opposite_lane  | cycling | cycling |
+            | foot | oneway | cycleway       | forw | backw |
+            | no   | yes    | opposite       | x    | x     |
+            | no   | yes    | opposite_track | x    | x     |
+            | no   | yes    | opposite_lane  | x    | x     |
+            | no   | -1     | opposite       | x    | x     |
+            | no   | -1     | opposite_track | x    | x     |
+            | no   | -1     | opposite_lane  | x    | x     |
+            | no   | no     | opposite       | x    | x     |
+            | no   | no     | opposite_track | x    | x     |
+            | 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   |
-            | no   |            | yes    | yes        | cycling |         |
-            | no   |            | yes    | no         | cycling |         |
-            | no   |            | yes    | -1         | cycling |         |
-            | no   |            | no     | yes        | cycling | cycling |
-            | no   |            | no     | no         | cycling | cycling |
-            | no   |            | no     | -1         | cycling | cycling |
-            | no   |            | -1     | yes        |         | cycling |
-            | no   |            | -1     | no         |         | cycling |
-            | no   |            | -1     | -1         |         | cycling |
-            | no   | roundabout |        | yes        | cycling |         |
-            | no   | roundabout |        | no         | cycling |         |
-            | no   | roundabout |        | -1         | cycling |         |
+            | foot | junction   | oneway | oneway:car | forw | backw |
+            | no   |            | yes    | yes        | x    |       |
+            | no   |            | yes    | no         | x    |       |
+            | no   |            | yes    | -1         | x    |       |
+            | no   |            | no     | yes        | x    | x     |
+            | no   |            | no     | no         | x    | x     |
+            | no   |            | no     | -1         | x    | x     |
+            | no   |            | -1     | yes        |      | x     |
+            | no   |            | -1     | no         |      | x     |
+            | no   |            | -1     | -1         |      | x     |
+            | no   | roundabout |        | yes        | x    |       |
+            | no   | roundabout |        | no         | x    |       |
+            | no   | roundabout |        | -1         | x    |       |
 
     Scenario: Bike - Two consecutive oneways
         Given the node map
-            """
-            a b   c
-            """
+            | a | b |   | c |
 
         And the ways
             | nodes | oneway |
@@ -134,19 +126,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      |

features/bicycle/pushing.feature

@@ -3,39 +3,41 @@ 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        |
-            | (nil)      |        |              |              |
-            | cycleway   |        | cycling      | cycling      |
-            | primary    |        | cycling      | cycling      |
-            | pedestrian |        | pushing bike | pushing bike |
-            | cycleway   |        | cycling      | cycling      |
-            | primary    | yes    | cycling      | pushing bike |
+            | highway    | oneway | forw | backw |
+            | (nil)      |        |      |       |
+            | cycleway   |        | bike | bike  |
+            | primary    |        | bike | bike  |
+            | pedestrian |        | foot | foot  |
+            | footway    |        | foot | foot  |
+            | primary    | yes    | bike | foot  |
 
     Scenario: Bike - Pushing bikes against normal oneways
         Then routability should be
-            | highway    | oneway | forw         | backw        |
-            | (nil)      |        |              |              |
-            | primary    | yes    | cycling      | pushing bike |
-            | pedestrian | yes    | pushing bike | pushing bike |
+            | highway    | oneway | forw | backw |
+            | (nil)      |        |      |       |
+            | primary    | yes    | bike | foot  |
+            | pedestrian | yes    | foot | foot  |
 
     Scenario: Bike - Pushing bikes against reverse oneways
         Then routability should be
-            | highway    | oneway | forw         | backw        |
-            | (nil)      |        |              |              |
-            | primary    | -1     | pushing bike | cycling      |
-            | pedestrian | -1     | pushing bike | pushing bike |
+            | highway    | oneway | forw | backw |
+            | (nil)      |        |      |       |
+            | primary    | -1     | foot | bike  |
+            | pedestrian | -1     | foot | foot  |
 
     @square
     Scenario: Bike - Push bikes on pedestrian areas
         Given the node map
-            """
-            x
-            a b
-            d c
-            """
+            | x |   |
+            | a | b |
+            | d | c |
 
         And the ways
             | nodes | area | highway    |
@@ -43,7 +45,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 +57,18 @@ Feature: Bike - Accessability of different way types
 
     Scenario: Bike - Pushing bikes on ways with foot=yes
         Then routability should be
-            | highway  | foot | forw         | backw        |
-            | motorway |      |              |              |
-            | motorway | yes  | pushing bike |              |
-            | runway   |      |              |              |
-            | runway   | yes  | pushing bike | pushing bike |
+            | highway  | foot | forw | backw |
+            | motorway |      |      |       |
+            | motorway | yes  | foot |       |
+            | runway   |      |      |       |
+            | 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        |
-            | motorway |              |               |              |              |
-            | motorway | yes          |               | pushing bike |              |
-            | motorway |              | yes           |              | pushing bike |
+            | highway  | foot:forward | foot:backward | forw | backw |
+            | motorway |              |               |      |       |
+            | motorway | yes          |               | foot |       |
+            | motorway |              | yes           |      | foot  |
 
     @construction
     Scenario: Bike - Don't allow routing on ways still under construction
@@ -78,15 +79,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
@@ -95,32 +87,26 @@ Feature: Bike - Accessability of different way types
 
     Scenario: Bike - Instructions when pushing bike on oneways
         Given the node map
-            """
-            a b e
-            f c d
-            """
+            | a | b |   |
+            |   | c | d |
 
         And the ways
             | nodes | highway | oneway |
             | ab    | primary |        |
             | bc    | primary | yes    |
             | cd    | primary |        |
-            | be    | primary |        |
-            | cf    | primary |        |
 
         When I route I should get
-            | from | to | route       | modes                                |
-            | a    | d  | ab,bc,cd,cd | cycling,cycling,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    |
+            | from | to | route       | modes                                   |
+            | a    | d  | ab,bc,cd,cd | cycling,cycling,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       |
 
     Scenario: Bike - Instructions when pushing bike on footway/pedestrian, etc.
         Given the node map
-            """
-            a b
-              c d
-            """
+            | a | b |   |
+            |   | c | d |
 
         And the ways
             | nodes | highway |

features/bicycle/ref.feature

@@ -0,0 +1,41 @@
+@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                               |
+            | a    | b  | Utopia Drive (E7),Utopia Drive (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 |
+            | 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 |

features/bicycle/restrictions.feature

@@ -5,18 +5,13 @@ 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
-            """
-              n
-            w j e
-              s
-            """
+            |   | n |   |
+            | w | j | e |
+            |   | s |   |
 
         And the ways
             | nodes | oneway | foot |
@@ -35,15 +30,180 @@ 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
-            """
-            b x c
-            a j d
-              s
-            """
+            | b | x | c |
+            | a | j | d |
+            |   | s |   |
 
         And the ways
             | nodes | oneway | foot |
@@ -71,11 +231,9 @@ Feature: Bike - Turn restrictions
     @except
     Scenario: Bike - Except tag and on only_ restrictions
         Given the node map
-            """
-            a   b
-              j
-              s
-            """
+            | a |   | b |
+            |   | j |   |
+            |   | s |   |
 
         And the ways
             | nodes | oneway | foot |
@@ -95,14 +253,12 @@ Feature: Bike - Turn restrictions
     @except
     Scenario: Bike - Multiple except tag values
         Given the node map
-            """
-            s j a
-                b
-                c
-                d
-                e
-                f
-            """
+            | s | j | a |
+            |   |   | b |
+            |   |   | c |
+            |   |   | d |
+            |   |   | e |
+            |   |   | f |
 
         And the ways
             | nodes | oneway | foot |

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 |

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      |

features/bicycle/stop_area.feature

@@ -14,10 +14,8 @@ Feature: Bike - Stop areas for public transport
 
     Scenario: Bike - railway platforms
         Given the node map
-            """
-            a b c d
-              s t
-            """
+            | a | b | c | d |
+            |   | s | t |   |
 
         And the nodes
             | node | public_transport |

features/bicycle/surface.feature

@@ -6,63 +6,35 @@ Feature: Bike - Surfaces
 
     Scenario: Bicycle - Slow surfaces
         Then routability should be
-            | highway  | surface               | bothw   |
-            | cycleway |                       | 48 s    |
-            | cycleway | asphalt               | 47.9 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 | ground                | 72 s    |
-            | cycleway | dirt                  | 90 s    |
-            | cycleway | cobblestone           | 102.9 s |
-            | cycleway | gravel                | 120 s   |
-            | cycleway | pebblestone           | 120 s   |
-            | cycleway | grass_paver           | 120 s   |
-            | cycleway | dirt                  | 90 s    |
-            | cycleway | earth                 | 120 s   |
-            | cycleway | grass                 | 120 s   |
-            | cycleway | mud                   | 240 s   |
-            | cycleway | sand                  | 240 s   |
-            | cycleway | woodchips             | 240 s   |
-            | cycleway | sett                  | 80 s    |
+            | highway  | surface               | bothw |
+            | cycleway |                       | 48s   |
+            | cycleway | asphalt               | 48s   |
+            | cycleway | cobblestone:flattened | 72s   |
+            | cycleway | paving_stones         | 72s   |
+            | cycleway | compacted             | 72s   |
+            | cycleway | cobblestone           | 120s  |
+            | cycleway | unpaved               | 120s  |
+            | cycleway | fine_gravel           | 120s  |
+            | cycleway | gravel                | 120s  |
+            | cycleway | pebblestone           | 120s  |
+            | cycleway | dirt                  | 120s  |
+            | cycleway | earth                 | 120s  |
+            | cycleway | grass                 | 120s  |
+            | cycleway | mud                   | 240s  |
+            | cycleway | sand                  | 240s  |
 
     Scenario: Bicycle - Good surfaces on small paths
         Then routability should be
-        | highway  | surface | bothw  |
-        | cycleway |         | 48 s   |
-        | path     |         | 55.3 s |
-        | track    |         | 60 s   |
-        | track    | asphalt | 60 s   |
-        | path     | asphalt | 55.4 s |
+        | highway  | surface | bothw |
+        | cycleway |         | 48s   |
+        | path     |         | 60s   |
+        | track    |         | 60s   |
+        | track    | asphalt | 48s   |
+        | path     | asphalt | 48s   |
 
     Scenario: Bicycle - Surfaces should not make unknown ways routable
         Then routability should be
         | highway  | surface | bothw |
-        | cycleway |         | 48 s  |
+        | cycleway |         | 48s   |
         | nosense  |         |       |
         | nosense  | asphalt |       |
-
-    Scenario: Bicycle - Surfaces should not increase speed when pushing bikes
-      Given the node map
-         """
-         a b
-         c d
-         """
-
-      And the ways
-        | nodes | highway | oneway | surface |
-        | ab    | primary | yes    | asphalt |
-        | cd    | footway |        | asphalt |
-
-      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  |
-        | c    | d  | cd,cd | pushing bike,pushing bike | 4 km/h  |
-        | d    | c  | cd,cd | pushing bike,pushing bike | 4 km/h  |

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
-            """
-            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    |         | train   |         |
-            | de    |         | train   | yes     |
-            | fg    |         | train   | no      |
-
-        When I route I should get
-            | from | to | route       |
-            | 1    | 2  |             |
-            | 2    | 3  | cd,de,ef,ef |
-            | 3    | 4  |             |
-
-    Scenario: Bike - Bringing bikes on trains, invalid railway tag is accepted if access specified
-        Given the node map
-            """
-            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  |       |
+        Then routability should be
+            | highway | railway    | bicycle | bothw |
+            | primary |            |         | x     |
+            | (nil)   | train      |         |       |
+            | (nil)   | train      | no      |       |
+            | (nil)   | train      | yes     | x     |
+            | (nil)   | railway    |         |       |
+            | (nil)   | railway    | no      |       |
+            | (nil)   | railway    | yes     | x     |
+            | (nil)   | subway     |         |       |
+            | (nil)   | subway     | no      |       |
+            | (nil)   | subway     | yes     | x     |
+            | (nil)   | tram       |         |       |
+            | (nil)   | tram       | no      |       |
+            | (nil)   | tram       | yes     | x     |
+            | (nil)   | light_rail |         |       |
+            | (nil)   | light_rail | no      |       |
+            | (nil)   | light_rail | yes     | x     |
+            | (nil)   | monorail   |         |       |
+            | (nil)   | monorail   | no      |       |
+            | (nil)   | monorail   | yes     | x     |
+            | (nil)   | some_tag   |         |       |
+            | (nil)   | some_tag   | no      |       |
+            | (nil)   | some_tag   | yes     | x     |
 
     @construction
     Scenario: Bike - Don't route on railways under construction
-        Given the node map
-            """
-            a 1 b   c 2 d
-            """
-
-        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  |       |
+        Then routability should be
+            | highway | railway      | bicycle | bothw |
+            | primary |              |         | x     |
+            | (nil)   | construction | yes     |       |

features/bicycle/turn_penalty.feature

@@ -2,41 +2,32 @@
 Feature: Turn Penalties
 
     Background:
-        Given the profile "bicycle"
-        Given a grid size of 200 meters
+        Given the profile "turnbot"
 
-
-    Scenario: Bicycle - Turn penalties on cyclability
-        Given the profile file "bicycle" initialized with
-        """
-        profile.properties.weight_name = 'cyclability'
-        """
+    Scenario: Bike - turns should incur a delay that depend on the angle
 
         Given the node map
-            """
-            a--b-----c
-               |
-               |
-               d
-
-            e--------f-----------g
-                  /
-                /
-              /
-            h
-            """
+            | c | d | e |
+            | b | j | f |
+            | a | s | g |
 
         And the ways
-            | nodes | highway     |
-            | abc   | residential |
-            | bd    | residential |
-            | efg   | residential |
-            | fh    | residential |
+            | nodes |
+            | sj    |
+            | ja    |
+            | jb    |
+            | jc    |
+            | jd    |
+            | je    |
+            | jf    |
+            | jg    |
 
         When I route I should get
-            | from | to | distance  | weight | #                                         |
-            | a    | c  | 900m +- 1 | 216    | Going straight has no penalties           |
-            | a    | d  | 900m +- 1 | 220.2  | Turning right had penalties               |
-            | e    | g  | 2100m +- 5| 503.9  | Going straght has no penalties            |
-            | e    | h  | 2100m +- 5| 515.1  | Turn sharp right has even higher penalties|
-
+            | from | to | route    | time    | distance |
+            | s    | a  | sj,ja,ja | 39s +-1 | 242m +-1 |
+            | s    | b  | sj,jb,jb | 30s +-1 | 200m +-1 |
+            | s    | c  | sj,jc,jc | 29s +-1 | 242m +-1 |
+            | 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 |

features/car/access.feature

@@ -5,7 +5,7 @@ Feature: Car - Restricted access
     Background:
         Given the profile "car"
 
-    Scenario: Car - Access tag hierarchy on ways
+    Scenario: Car - Access tag hierarchy    on ways
         Then routability should be
             | access | vehicle | motor_vehicle | motorcar | bothw |
             |        |         |               |          | x     |
@@ -30,35 +30,6 @@ Feature: Car - Restricted access
             |        |         | no            | yes      | x     |
             |        |         | yes           | no       |       |
 
-    Scenario: Car - Access tag hierarchy and forward/backward
-        Then routability should be
-            | access | access:forward | access:backward | motorcar | motorcar:forward | motorcar:backward | forw | backw |
-            |        |                |                 |          |                  |                   | x    | x     |
-            | yes    |                |                 |          |                  |                   | x    | x     |
-            | yes    | no             |                 |          |                  |                   |      | x     |
-            | yes    | yes            |                 | no       |                  |                   |      |       |
-            | yes    | yes            |                 | yes      | no               |                   |      | x     |
-            | yes    |                |                 |          |                  |                   | x    | x     |
-            | yes    |                | no              |          |                  |                   | x    |       |
-            | yes    |                | yes             | no       |                  |                   |      |       |
-            | yes    |                | yes             | yes      |                  | no                | x    |       |
-            | no     |                |                 |          |                  |                   |      |       |
-            | no     | yes            |                 |          |                  |                   | x    |       |
-            | no     | no             |                 | yes      |                  |                   | x    | x     |
-            | no     | no             |                 | no       | yes              |                   | x    |       |
-            | no     |                |                 |          |                  |                   |      |       |
-            | no     |                | yes             |          |                  |                   |      | x     |
-            | no     |                | no              | yes      |                  |                   | x    | x     |
-            | no     |                | no              | no       |                  | yes               |      | x     |
-            |        | no             |                 |          | no               |                   |      | x     |
-            |        |                | no              |          |                  | no                | x    |       |
-            |        | no             |                 |          |                  | no                |      |       |
-            |        |                | no              | no       |                  |                   |      |       |
-            |        | no             |                 |          | yes              |                   | x    | x     |
-            |        |                | no              |          |                  | yes               | x    | x     |
-            |        | yes            |                 |          | no               |                   |      | x     |
-            |        |                | yes             |          |                  | no                | x    |       |
-
     Scenario: Car - Access tag hierarchy on nodes
         Then routability should be
             | node/access | node/vehicle | node/motor_vehicle | node/motorcar | bothw |
@@ -119,13 +90,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 +105,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 +127,15 @@ Feature: Car - Restricted access
 
     Scenario: Car - Access combinations
         Then routability should be
-            | highway      | access       | vehicle    | motor_vehicle | motorcar    | forw | backw | # |
-            | runway       | private      |            |               | permissive  | x    | x     |   |
-            | primary      | forestry     |            | yes           |             | x    | x     |   |
-            | cycleway     |              |            | designated    |             | x    | x     |   |
-            | unclassified |              |            | destination   | destination | x    | x     |   |
-            | residential  |              | yes        | no            |             |      |       |   |
-            | motorway     | yes          | permissive |               | private     | x    |       | implied oneway  |
-            | trunk        | agricultural | designated | permissive    | no          |      |       |   |
-            | pedestrian   |              |            |               |             |      |       |   |
-            | pedestrian   |              |            |               | destination |      |       | temporary disabled #3773 |
+            | highway     | accesss      | vehicle    | motor_vehicle | motorcar    | bothw |
+            | runway      | private      |            |               | permissive  | x     |
+            | primary     | forestry     |            | yes           |             | x     |
+            | cycleway    |              |            | designated    |             | x     |
+            | residential |              | yes        | no            |             |       |
+            | motorway    | yes          | permissive |               | private     |       |
+            | trunk       | agricultural | designated | permissive    | no          |       |
+            | pedestrian  |              |            |               |             |       |
+            | pedestrian  |              |            |               | destination | x     |
 
     Scenario: Car - Ignore access tags for other modes
         Then routability should be
@@ -179,129 +148,3 @@ Feature: Car - Restricted access
             | primary |      |         | no  |           | x     |
             | runway  |      |         |     | yes       |       |
             | primary |      |         |     | no        | x     |
-
-    @hov
-    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 | yes        | x     | 18.3       | 18.3        |
-            | primary | no         | x     | 18.2       | 18.2        |
-
-    # Models:
-    # https://www.openstreetmap.org/way/124891268
-    # https://www.openstreetmap.org/way/237173472
-    @hov
-    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 | lane        |                                    | 3     | designated | yes    | x    |       | 25.3       |
-
-    @hov
-    Scenario: Car - a way with all lanes HOV-designated is highly penalized by default (similar to hov=designated)
-        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       |
-            # This test is flaky because non-deterministic turn generation sometimes emits a NoTurn here that is marked as restricted. #3769
-            #| primary |                        | designated             |                        |        | x    | x     | 18.2      | 18.2       |
-            #| primary | designated             |                        |                        |        | x    | x     | 18.2      | 18.2       |
-            | primary | designated\|designated | designated\|designated |                        |        | x    | x     | 18.3      | 18.3       |
-            | primary | designated\|no         | designated\|no         |                        |        | x    | x     | 18.2      | 18.2       |
-            | primary | yes\|no                | yes\|no                |                        |        | x    | x     | 18.2      | 18.2       |
-            | primary |                        |                        |                        |        | x    | x     | 18.2      | 18.2       |
-            | primary | designated             |                        |                        | -1     |      | x     |           | 18.2       |
-            | primary |                        | designated             |                        | -1     |      | x     |           | 18.2       |
-            | primary |                        |                        | designated             | yes    | x    |       | 18.2      |            |
-            | primary |                        |                        | designated             | -1     |      | x     |           | 18.2       |
-            | primary |                        |                        | designated\|           | yes    | x    |       | 18.2      |            |
-            | primary |                        |                        | designated\|           | -1     |      | x     |           | 18.2       |
-            | primary |                        |                        | designated\|designated | yes    | x    |       | 18.2      |            |
-            | primary |                        |                        | designated\|designated | -1     |      | x     |           | 18.2       |
-            | primary |                        |                        | designated\|yes        | yes    | x    |       | 18.2      |            |
-            | primary |                        |                        | designated\|no         | -1     |      | x     |           | 18.2       |
-
-     Scenario: Car - these toll roads always work
-        Then routability should be
-            | highway | toll        | bothw |
-            | primary | no          | x     |
-            | primary | snowmobile  | x     |
-
-     Scenario: Car - toll=yes ways are enabled by default
-        Then routability should be
-            | highway | toll        | bothw |
-            | primary | yes         | x     |
-
-    Scenario: Car - directional access tags
-        Then routability should be
-            | highway | access | access:forward | access:backward | forw | backw |
-            | primary | yes    | yes            | yes             | x    | x     |
-            | primary | yes    |                | no              | x    |       |
-            | primary | yes    | no             |                 |      | x     |
-            | primary | yes    | no             | no              |      |       |
-            | primary | no     | no             | no              |      |       |
-            | primary | no     |                | yes             |      | x     |
-            | primary | no     | yes            |                 | x    |       |
-            | primary | no     | yes            | yes             | x    | x     |
-
-
-     Scenario: Car - barrier=gate should be routed over unless explicitely forbidden
-        Then routability should be
-            | node/barrier | access     | bothw |
-            | gate         |            | x     |
-            | gate         | no         |       |
-            | gate         | yes        | x     |
-            | gate         | permissive | x     |
-            | gate         | designated | x     |
-            | gate         | private    | x     |
-            | gate         | garbagetag | x     |
-
-    Scenario: Car - a way with conditional access
-        Then routability should be
-            | highway    | vehicle:forward | vehicle:backward:conditional | forw | backw |
-            | pedestrian | yes             | delivery @ (20:00-11:00)     | x    |       |
-
-    Scenario: Car - a way with a list of tags
-        Then routability should be
-            | highway | motor_vehicle            | motor_vehicle:forward | motor_vehicle:backward | forw | backw | # |
-            | primary |                          | no                    | destination            |      | x     |   |
-            | primary | 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
-            | highway | access | forw | backw |
-            | steps   | yes    |      |       |
-            | steps   | no     |      |       |
-            | primary |        |  x   |   x   |
-
-    Scenario: Car - Access combinations
-        Then routability should be
-            | highway    | access     | bothw |
-            | primary    | permissive | x     |
-            | 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   |

features/car/advisory.feature

@@ -8,9 +8,7 @@ OSRM will use 4/5 of the projected free-flow speed.
 
     Scenario: Car - Advisory speed overwrites maxspeed
         Given the node map
-            """
-            a b c
-            """
+            | a | b | c |
 
         And the ways
             | nodes | highway       | maxspeed | maxspeed:advisory |
@@ -19,14 +17,12 @@ OSRM will use 4/5 of the projected free-flow speed.
 
         When I route I should get
             | from | to | route | speed        |
-            | a    | b  | ab,ab | 36 km/h +- 1 |
-            | b    | c  | bc,bc | 36 km/h +- 1 |
+            | a    | b  | ab,ab | 47 km/h +- 1 |
+            | b    | c  | bc,bc | 47 km/h +- 1 |
 
     Scenario: Car - Advisory speed overwrites forward maxspeed
         Given the node map
-            """
-            a b c
-            """
+            | a | b | c |
 
         And the ways
             | nodes | highway       | maxspeed:forward | maxspeed:advisory:forward |
@@ -35,14 +31,12 @@ OSRM will use 4/5 of the projected free-flow speed.
 
         When I route I should get
             | from | to | route | speed        |
-            | a    | b  | ab,ab | 36 km/h +- 1 |
-            | b    | c  | bc,bc | 36 km/h +- 1 |
+            | a    | b  | ab,ab | 47 km/h +- 1 |
+            | b    | c  | bc,bc | 47 km/h +- 1 |
 
     Scenario: Car - Advisory speed overwrites backwards maxspeed
         Given the node map
-            """
-            a b c
-            """
+            | a | b | c |
 
         And the ways
             | nodes | highway       | maxspeed:backward | maxspeed:advisory:backward |
@@ -51,14 +45,12 @@ OSRM will use 4/5 of the projected free-flow speed.
 
         When I route I should get
             | from | to | route | speed        |
-            | b    | a  | ab,ab | 36 km/h +- 1 |
-            | c    | b  | bc,bc | 36 km/h +- 1 |
+            | b    | a  | ab,ab | 47 km/h +- 1 |
+            | c    | b  | bc,bc | 47 km/h +- 1 |
 
     Scenario: Car - Advisory speed overwrites backwards maxspeed
         Given the node map
-            """
-            a b c d
-            """
+            | a | b | c | d |
 
         And the ways
             | nodes | highway       | maxspeed:backward | maxspeed:advisory:backward |
@@ -68,14 +60,12 @@ OSRM will use 4/5 of the projected free-flow speed.
 
         When I route I should get
             | from | to | route | speed        |
-            | c    | b  | bc,bc | 36 km/h +- 1 |
-            | d    | c  | cd,cd | 36 km/h +- 1 |
+            | c    | b  | bc,bc | 47 km/h +- 1 |
+            | d    | c  | cd,cd | 47 km/h +- 1 |
 
     Scenario: Car - Directional advisory speeds play nice with eachother
         Given the node map
-            """
-            a b c
-            """
+            | a | b | c |
 
         And the ways
             | nodes | highway       | maxspeed:advisory | maxspeed:advisory:forward | maxspeed:advisory:backward |
@@ -84,9 +74,9 @@ OSRM will use 4/5 of the projected free-flow speed.
 
         When I route I should get
             | from | to | route | speed        |
-            | a    | b  | ab,ab | 36 km/h +- 1 |
-            | b    | a  | ab,ab | 48 km/h +- 1 |
-            | b    | c  | bc,bc | 48 km/h +- 1 |
-            | c    | b  | bc,bc | 36 km/h +- 1 |
+            | a    | b  | ab,ab | 47 km/h +- 1 |
+            | b    | a  | ab,ab | 59 km/h +- 1 |
+            | b    | c  | bc,bc | 59 km/h +- 1 |
+            | c    | b  | bc,bc | 47 km/h +- 1 |