Fix segfault when route includes very short segments.

[skip ci] Add breaking notice to changelog
Update the v5.2.4 changelog
2016-06-22 14:55:20 -07:00 · 2016-06-21 19:49:13 +02:00 · 2016-06-21 19:47:39 +02:00 · 2016-06-21 19:41:01 +02:00 · 2016-06-21 19:40:50 +02:00 · 2016-06-21 18:23:29 +02:00
1510 changed files with 34191 additions and 192499 deletions
@@ -1,8 +0,0 @@
-{
-    "plugins": ["transform-class-properties"],
-    "presets": [
-        "stage-0",
-        "es2015",
-        "react"
-    ]
-}
@@ -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)/'
@@ -1,15 +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
@@ -1,13 +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.
-
-## Tasklist
- - [ ] ADD OWN TASKS HERE
- - [ ] update relevant [Wiki pages](https://github.com/Project-OSRM/osrm-backend/wiki)
- - [ ] add regression / cucumber cases (see docs/testing.md)
- - [ ] review
- - [ ] adjust for comments
-
-## Requirements / Relations
- Link any requirements here. Other pull requests this PR is based on?
@@ -1,14 +1,7 @@
-# mason #
-#########
-/.mason
-/mason_packages
-
 # pre compiled dependencies #
 #############################
 osrm-deps

-.ycm_extra_conf.py
-
 # Compiled source #
 ###################
 *.com
@@ -46,13 +39,9 @@ Thumbs.db

 # build related files #
 #######################
-/_build*
 /build/
 /example/build/
 /test/data/monaco*
-/test/data/ch
-/test/data/corech
-/test/data/mld
 /cmake/postinst

 # Eclipse related files #
@@ -62,11 +51,6 @@ Thumbs.db
 .cproject
 .project

-# Visual Studio (Code) related files #
-######################################
-/.vs*
-/*.local.bat
-
 # stxxl related files #
 #######################
 .stxxl
@@ -97,6 +81,7 @@ stxxl.errlog
 /test/cache
 /test/speeds.csv
 /test/penalties.csv
+/test/data/monaco.*
 node_modules

 # Deprecated config file #
@@ -104,9 +89,3 @@ node_modules
 /server.ini

 *.swp
-
-# local lua debugging file
-debug.lua
-
-# node-osrm artifacts
-lib/binding
@@ -1,15 +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/*
@@ -7,21 +7,15 @@ git:
 sudo: required
 dist: trusty

-node_js:
-    - "4"
-    - "6"
-
 notifications:
  email: false

 branches:
  only:
    - master
-    # enable building tags
-    - /^v\d+\.\d+(\.\d+)?(-\S*)?$/
+    - "5.2"

 cache:
-  yarn: true
  ccache: true
  apt: true
  directories:
@@ -29,16 +23,9 @@ cache:

 env:
  global:
-   - secure: "hk+32aXXF5t1ApaM2Wjqooz3dx1si907L87WRMkO47WlpJmUUU/Ye+MJk9sViH8MdhOcceocVAmdYl5/WFWOIbDWNlBya9QvXDZyIu2KIre/0QyOCTZbrsif8paBXKIO5O/R4OTvIZ8rvWZsadBdmAT9GSbDhih6FzqXAEgeIYQ="
-   - secure: "VE+cFkseFwW4jK6XwkP0yW3h4DixPJ8+Eb3yKcchGZ5iIJxlZ/8i1vKHYxadgPRwSYwPSB14tF70xj2OmiT2keGzZUfphmPXinBaLEhYk+Bde+GZZkoSl5ND109I/LcyNr0nG9dDgtV6pkvFchgchpyP9JnVOOS0+crEZlAz0RE="
   - CCACHE_TEMPDIR=/tmp/.ccache-temp
   - CCACHE_COMPRESS=1
-   - CASHER_TIME_OUT=599 # one second less than 10m to avoid 10m timeout error: https://github.com/Project-OSRM/osrm-backend/issues/2742
-   - CCACHE_VERSION=3.3.1
-   - CMAKE_VERSION=3.7.2
-   - MASON="$(pwd)/scripts/mason.sh"
-   - ENABLE_NODE_BINDINGS=On
-   - NODE="4"
+   - JOBS=4

 matrix:
  fast_finish: true
@@ -48,294 +35,116 @@ matrix:

    # Debug Builds
    - os: linux
-      compiler: "format-taginfo-docs"
-      env: NODE=6
-      sudo: false
-      before_install:
-      install:
-        - source $NVM_DIR/nvm.sh
-        - nvm install $NODE
-        - nvm use $NODE
-        - npm --version
-        - npm install --ignore-scripts
-        - npm link --ignore-scripts
-      script:
-        - ./scripts/check_taginfo.py taginfo.json profiles/car.lua
-        - ${MASON} install clang-format 3.8.1
-        - PATH=$(${MASON} prefix clang-format 3.8.1)/bin:${PATH} ./scripts/format.sh && ./scripts/error_on_dirty.sh
-        # See issue 4043
-        #- npm run docs && ./scripts/error_on_dirty.sh
-      after_success:
-
-    - os: linux
-      compiler: "gcc-6-debug-cov"
-      addons: &gcc6
+      compiler: "gcc-5-debug"
+      addons: &gcc5
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
-      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' ENABLE_COVERAGE=ON CUCUMBER_TIMEOUT=20000
-      after_success:
-        - bash <(curl -s https://codecov.io/bash)
+          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-6-debug-asan"
-      addons: &gcc6
+      compiler: "gcc-4.8-debug"
+      addons: &gcc48
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
-      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' TARGET_ARCH='x86_64-asan' ENABLE_SANITIZER=ON CUCUMBER_TIMEOUT=20000
+          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-4.0-debug"
-      addons: &clang40
+      compiler: "clang-3.8-debug"
+      addons: &clang38
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
-      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Debug' CUCUMBER_TIMEOUT=60000
+          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: linux
-      compiler: "mason-linux-debug-asan"
-      addons:
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev']
-      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_SANITIZER=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: "mason-linux-release"
-      addons:
+      compiler: "gcc-5-release"
+      addons: &gcc5
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev']
-      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON RUN_CLANG_FORMAT=ON ENABLE_LTO=ON
+          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'

-    - os: linux
-      compiler: "gcc-6-release"
-      addons: &gcc6
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
-      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release'
-
-    - os: linux
-      compiler: "gcc-6-release-i686"
-      env: >
-        TARGET_ARCH='i686' CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release'
-        CFLAGS='-m32 -msse2 -mfpmath=sse' CXXFLAGS='-m32 -msse2 -mfpmath=sse'
-
-    - os: linux
-      compiler: "gcc-6-stxxl"
-      addons: &gcc6
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
-      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' ENABLE_STXXL=On
-
-    - os: linux
-      compiler: "gcc-4.9-release"
-      addons: &gcc49
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.9', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
-      env: CCOMPILER='gcc-4.9' CXXCOMPILER='g++-4.9' BUILD_TYPE='Release'
-
-    - os: osx
-      osx_image: xcode8.2
-      compiler: "mason-osx-release"
-      # we use the xcode provides clang and don't install our own
-      env: ENABLE_MASON=ON BUILD_TYPE='Release' CUCUMBER_TIMEOUT=60000 CCOMPILER='clang' CXXCOMPILER='clang++' ENABLE_ASSERTIONS=ON ENABLE_LTO=ON
-      after_success:
-        - ./scripts/travis/publish.sh
+      # 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: &clang40
+      #- addons: &clang38
      #-   apt:
-      #-     sources: ['llvm-toolchain-trusty-4.0', 'ubuntu-toolchain-r-test']
-      #-     packages: ['clang-4.0', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
-      #- env: CCOMPILER='clang-4.0' CXXCOMPILER='clang++-4.0' BUILD_TYPE='Release'
+      #-     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-6-release-shared"
-      addons: &gcc6
+      compiler: "gcc-5-release-shared"
+      addons: &gcc5
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
-      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
+          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: &clang40
+      #- addons: &clang38
      #-   apt:
-      #-     sources: ['llvm-toolchain-trusty-4.0', 'ubuntu-toolchain-r-test']
-      #-     packages: ['clang-4.0', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
-      #- env: CCOMPILER='clang-4.0' CXXCOMPILER='clang++-4.0' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
-
-    # Node build jobs. These skip running the tests.
-    - os: linux
-      sudo: false
-      compiler: "node-4-mason-linux-release"
-      addons:
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev']
-      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3
-      install:
-        - pushd ${OSRM_BUILD_DIR}
-        - |
-          cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-              -DENABLE_MASON=${ENABLE_MASON:-OFF} \
-              -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
-              -DENABLE_CCACHE=ON \
-              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
-        - make --jobs=${JOBS}
-        - popd
-      script:
-        - npm run nodejs-tests
-      after_success:
-        - ./scripts/travis/publish.sh
-
-    - os: linux
-      sudo: false
-      compiler: "node-4-mason-linux-release"
-      addons:
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev']
-      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Debug' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3
-      install:
-        - pushd ${OSRM_BUILD_DIR}
-        - |
-          cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-              -DENABLE_MASON=${ENABLE_MASON:-OFF} \
-              -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
-              -DENABLE_CCACHE=ON \
-              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
-        - make --jobs=${JOBS}
-        - popd
-      script:
-        - npm run nodejs-tests
-      after_success:
-        - ./scripts/travis/publish.sh
-
-    - os: linux
-      sudo: false
-      compiler: "node-6-mason-linux-release"
-      addons:
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev']
-      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 NODE="6"
-      install:
-        - pushd ${OSRM_BUILD_DIR}
-        - |
-          cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-              -DENABLE_MASON=${ENABLE_MASON:-OFF} \
-              -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
-              -DENABLE_CCACHE=ON \
-              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
-        - make --jobs=${JOBS}
-        - popd
-      script:
-        - npm run nodejs-tests
-      after_success:
-        - ./scripts/travis/publish.sh
-
-    - os: linux
-      sudo: false
-      compiler: "node-6-mason-linux-release"
-      addons:
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev']
-      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Debug' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 NODE="6"
-      install:
-        - pushd ${OSRM_BUILD_DIR}
-        - |
-          cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-              -DENABLE_MASON=${ENABLE_MASON:-OFF} \
-              -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
-              -DENABLE_CCACHE=ON \
-              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
-        - make --jobs=${JOBS}
-        - popd
-      script:
-        - npm run nodejs-tests
-      after_success:
-        - ./scripts/travis/publish.sh
+      #-     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:
-  - source $NVM_DIR/nvm.sh
-  - nvm install $NODE
-  - nvm use $NODE
-  - node --version
-  - if [[ ! -z $TARGET_ARCH ]] ; then source ./scripts/travis/before_install.$TARGET_ARCH.sh ; fi
+  - 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 [[ -z $JOBS ]]; then
-      if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
-        export JOBS=$((`nproc` + 1))
-      elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-        export JOBS=$((`sysctl -n hw.ncpu` + 1))
-      fi
+    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
-      sudo mdutil -i off /
+      # 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
-  - |
-    if [[ ! -f $(which yarn) ]]; then
-      npm install -g yarn
-    fi
-  - export PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)")
-  - export PUBLISH=$([[ "${TRAVIS_TAG:-}" == "v${PACKAGE_JSON_VERSION}" ]] && echo "On" || echo "Off")
-  - echo "Using ${JOBS} jobs"
-  - yarn install --ignore-scripts
-  - yarn check --ignore-scripts --integrity
-    # Bootstrap cmake to be able to run mason
-  - CMAKE_URL="https://mason-binaries.s3.amazonaws.com/${TRAVIS_OS_NAME}-x86_64/cmake/${CMAKE_VERSION}.tar.gz"
-  - CMAKE_DIR="mason_packages/${TRAVIS_OS_NAME}-x86_64/cmake/${CMAKE_VERSION}"
-  - mkdir -p ${CMAKE_DIR}
-  - travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${CMAKE_DIR} || travis_terminate 1
-  - export PATH=${CMAKE_DIR}/bin:${PATH}
-  - ${MASON} install tbb 2017_U7 && export LD_LIBRARY_PATH=$(${MASON} prefix tbb 2017_U7)/lib/:${LD_LIBRARY_PATH}
-  - ${MASON} install ccache ${CCACHE_VERSION} && export PATH=$(${MASON} prefix ccache ${CCACHE_VERSION})/bin:${PATH}
-  - |
-    if [[ ! -z ${CLANG_VERSION} ]]; then
-      export CCOMPILER='clang'
-      export CXXCOMPILER='clang++'
-      ${MASON} install clang++ ${CLANG_VERSION} && export PATH=$(${MASON} prefix clang++ ${CLANG_VERSION})/bin:${PATH} || travis_terminate 1
-      # we only enable lto for release builds
-      # and therefore don't need to us ld.gold or llvm tools for linking
-      # for debug builds
-      if [[ ${BUILD_TYPE} == 'Release' ]]; then
-        ${MASON} install binutils 2.27 && export PATH=$(${MASON} prefix binutils 2.27)/bin:${PATH} || travis_terminate 1
-      fi
-    fi
-  - ccache --max-size=256M  # limiting the cache's size to roughly the previous job's object sizes
-  - export OSRM_INSTALL_DIR="$(pwd)/install-osrm"
-  - export OSRM_BUILD_DIR="$(pwd)/build-osrm"
-  - export CC=${CCOMPILER} CXX=${CXXCOMPILER}
-  - mkdir ${OSRM_BUILD_DIR}

 install:
-  - pushd ${OSRM_BUILD_DIR}
  - |
-    cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-             -DENABLE_MASON=${ENABLE_MASON:-OFF} \
-             -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS:-OFF} \
-             -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} \
-             -DENABLE_COVERAGE=${ENABLE_COVERAGE:-OFF} \
-             -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
-             -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} \
-             -DENABLE_STXXL=${ENABLE_STXXL:-OFF} \
-             -DBUILD_TOOLS=ON \
-             -DENABLE_CCACHE=ON \
-             -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
+    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}
@@ -344,31 +153,35 @@ install:
  - sudo make install
  - |
    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
-      export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${OSRM_INSTALL_DIR}/lib
+      sudo ldconfig
    fi
  - popd
  - mkdir example/build && pushd example/build
-  - export PKG_CONFIG_PATH=${OSRM_INSTALL_DIR}/lib/pkgconfig
  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
-  - make --jobs=${JOBS}
+  - make
  - popd

 script:
-  - if [[ $TARGET_ARCH == armhf ]] ; then echo "Skip tests for $TARGET_ARCH" && exit 0 ; fi
+  - echo "travis_fold:start:BENCHMARK"
  - make -C test/data benchmark
-  - ./example/build/osrm-example test/data/ch/monaco.osrm
+  - echo "travis_fold:end:BENCHMARK"
+  - ./example/build/osrm-example test/data/monaco.osrm
  # All tests assume to be run from the build directory
-  - pushd ${OSRM_BUILD_DIR}
-  - ./unit_tests/library-tests
+  - 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
-  - ./unit_tests/partition-tests
+  - popd
+  - npm test
+
+after_success:
  - |
-    if [ -z "${ENABLE_SANITIZER}" ] && [ "$TARGET_ARCH" != "i686" ]; then
-      npm run nodejs-tests
+    if [ -n "${RUN_CLANG_FORMAT}" ]; then
+      ./scripts/format.sh # we don't want to fail just yet
    fi
  - |
-  - popd
-  - yarn test
+    if [ -n "${COVERAGE}" ]; then
+      bash <(curl -s https://codecov.io/bash)
+    fi
@@ -1,352 +1,15 @@
-# 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:
@@ -574,3 +237,5 @@
        - `properties.use_turn_restrictions`
        - `properties.u_turn_penalty`
        - `properties.allow_u_turn_at_via`
+
+
@@ -1,77 +0,0 @@
-# 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 to the issue if you want to express interest in this.
-
-# Developer
-
-We use `clang-format` version `3.8` to consistently format the code base. There is a helper script under `scripts/format.sh`.
-The format is automatically checked by the `mason-linux-release` job of a Travis CI build.
-To save development time a local hook `.git/hooks/pre-push`
-```
-#!/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.
-
@@ -1,165 +1,64 @@
-## Open Source Routing Machine
+## About

-| Linux / macOS | Windows | Code Coverage |
-| ------------- | ------- | ------------- |
-| [![Travis](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=master)](https://travis-ci.org/Project-OSRM/osrm-backend) | [![AppVeyor](https://ci.appveyor.com/api/projects/status/4iuo3s9gxprmcjjh)](https://ci.appveyor.com/project/DennisOSRM/osrm-backend) | [![Codecov](https://codecov.io/gh/Project-OSRM/osrm-backend/branch/master/graph/badge.svg)](https://codecov.io/gh/Project-OSRM/osrm-backend) |
+The Open Source Routing Machine is a high performance routing engine written in C++11 designed to run on OpenStreetMap data.

-High performance routing engine written in C++14 designed to run on OpenStreetMap data.
+## Current build status

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

-To quickly try OSRM use our [demo server](http://map.project-osrm.org) which comes with both the backend and a frontend on top.
+## Building

-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 [this guide about mapping for navigation](https://www.mapbox.com/mapping/mapping-for-navigation/).
+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).

-Related [Project-OSRM](https://github.com/Project-OSRM) repositories:
- [node-osrm](https://www.npmjs.com/package/osrm) - Production-ready NodeJs bindings for the routing engine
- [osrm-frontend](https://github.com/Project-OSRM/osrm-frontend) - User-facing frontend with map. The demo server runs this on top of the backend
- [osrm-text-instructions](https://github.com/Project-OSRM/osrm-text-instructions) - Text instructions from OSRM route response
- [osrm-backend-docker](https://hub.docker.com/r/osrm/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

- 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.
-
-### Using Docker
-
-We base our Docker images ([backend](https://hub.docker.com/r/osrm/osrm-backend/), [frontend](https://hub.docker.com/r/osrm/osrm-frontend/)) on Alpine Linux and make sure they are as lightweight as possible.
-
-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 osrm/osrm-backend osrm-extract -p /opt/car.lua /data/berlin-latest.osm.pbf
-    docker run -t -v $(pwd):/data osrm/osrm-backend osrm-contract /data/berlin-latest.osrm
-
-    docker run -t -i -p 5000:5000 -v $(pwd):/data osrm/osrm-backend osrm-routed /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 on Docker Cloud:
-
-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 16.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 libstxxl-dev libstxxl1v5 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
 ```

-Grab a `.osm.pbf` extract from [Geofabrik](http://download.geofabrik.de/index.html) or [Mapzen's Metro Extracts](https://mapzen.com/data/metro-extracts/)
-
-```bash
-wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf
-```
-
-Pre-process the extract and start the HTTP server
+Loading preparing a dataset and starting the server:

 ```
-osrm-extract berlin-latest.osm.pbf -p profiles/car.lua
-osrm-contract berlin-latest.osrm
-osrm-routed berlin-latest.osrm
+osrm-extract data.osm.pbf -p profiles/car.lua
+osrm-contract data.osrm
+osrm-routed data.osrm
 ```

-Running Queries
+Running a query on your local server:

 ```
-curl "http://127.0.0.1:5000/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true"
+curl http://127.0.0.1:5000/13.388860,52.517037;13.385983,52.496891?steps=true&alternatives=true
 ```

-### Request Against the Demo Server
+### Running a request against the Demo Server

-Read the [API usage policy](https://github.com/Project-OSRM/osrm-backend/wiki/Api-usage-policy).
-Simple query with instructions and alternatives on Berlin:
+First read the [API usage policy](https://github.com/Project-OSRM/osrm-backend/wiki/Api-usage-policy).
+
+Then run simple query with instructions and alternatives on Berlin:

 ```
-curl "https://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true&alternatives=true"
+curl https://router.project-osrm.org/13.388860,52.517037;13.385983,52.496891?steps=true&alternatives=true
 ```

-### Using the Node.js Bindings
-
-The Node.js bindings provide read-only access to the routing engine.
-We provide API documentation and examples [here](docs/nodejs/api.md).
-
-You will need a modern `libstdc++` toolchain (`>= GLIBCXX_3.4.20`) for binary compatibility if you want to use the pre-built binaries.
-For older Ubuntu systems you can upgrade your standard library for example with:
-
-```
-sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-sudo apt-get update -y
-sudo apt-get install -y libstdc++-5-dev
-```
-
-You can install the Node.js bindings via `npm install osrm` or from this repository either via
-
-    npm install
-
-which will check and use pre-built binaries if they're available for this release and your Node version, or via
-
-    npm install --build-from-source
-
-to always force building the Node.js bindings from source.
-
-For usage details have a look [these API docs](docs/nodejs/api.md).
-
-
 ## References in publications

 When using the code in a (scientific) publication, please cite
@@ -182,3 +81,4 @@ When using the code in a (scientific) publication, please cite
 address = {New York, NY, USA},
 }
 ```
+
@@ -8,18 +8,18 @@ SET PROJECT_DIR=%CD%
 ECHO PROJECT_DIR^: %PROJECT_DIR%
 ECHO NUMBER_OF_PROCESSORS^: %NUMBER_OF_PROCESSORS%
 ECHO cmake^: && cmake --version
-IF %ERRORLEVEL% NEQ 0 ECHO CMAKE not found && GOTO CMAKE_NOT_OK
+IF %ERRORLEVEL% NEQ 0 ECHO CMAKE not found GOTO ERROR

-cmake --version | findstr /C:"3.7.1" && GOTO CMAKE_OK
+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
-SET CMAKE_VERSION=3.7.1
-ECHO CMAKE NOT OK - downloading new CMake %CMAKE_VERSION%
-IF NOT EXIST cm.zip powershell Invoke-WebRequest https://cmake.org/files/v3.7/cmake-%CMAKE_VERSION%-win32-x86.zip -OutFile $env:PROJECT_DIR\cm.zip
+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-%CMAKE_VERSION%-win32-x86 7z -y x cm.zip | %windir%\system32\FIND "ing archive"
+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-%CMAKE_VERSION%-win32-x86\bin;%PATH%
+SET PATH=%PROJECT_DIR%\cmake-3.5.1-win32-x86\bin;%PATH%

 :CMAKE_OK
 ECHO CMAKE_OK
@@ -119,45 +119,16 @@ SET PATH=%PROJECT_DIR%\osrm-deps\libs\bin;%PATH%
 ECHO running extractor-tests.exe ...
 unit_tests\%Configuration%\extractor-tests.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
 ECHO running engine-tests.exe ...
 unit_tests\%Configuration%\engine-tests.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
 ECHO running util-tests.exe ...
 unit_tests\%Configuration%\util-tests.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-
 ECHO running server-tests.exe ...
 unit_tests\%Configuration%\server-tests.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR

-ECHO running library-tests.exe ...
-SET test_region=monaco
-SET test_region_ch=ch\monaco
-SET test_region_corech=corech\monaco
-SET test_region_mld=mld\monaco
-SET test_osm=%test_region%.osm.pbf
-IF NOT EXIST %test_osm% powershell Invoke-WebRequest https://s3.amazonaws.com/mapbox/osrm/testing/monaco.osm.pbf -OutFile %test_osm%
-%Configuration%\osrm-extract.exe -p ../profiles/car.lua %test_osm%
-MKDIR ch
-XCOPY %test_region%.osrm.* ch\
-XCOPY %test_region%.osrm ch\
-MKDIR corech
-XCOPY %test_region%.osrm.* corech\
-XCOPY %test_region%.osrm corech\
-MKDIR mld
-XCOPY %test_region%.osrm.* mld\
-XCOPY %test_region%.osrm mld\
-%Configuration%\osrm-contract.exe %test_region_ch%.osrm
-%Configuration%\osrm-contract.exe --core 0.8 %test_region_corech%.osrm
-%Configuration%\osrm-partition.exe %test_region_mld%.osrm
-%Configuration%\osrm-customize.exe %test_region_mld%.osrm
-XCOPY /Y ch\*.* ..\test\data\ch\
-XCOPY /Y corech\*.* ..\test\data\corech\
-XCOPY /Y mld\*.* ..\test\data\mld\
-unit_tests\%Configuration%\library-tests.exe
-
 IF NOT "%APPVEYOR_REPO_BRANCH%"=="master" GOTO DONE
 ECHO ========= CREATING PACKAGES ==========

@@ -3,9 +3,6 @@ environment:
  - configuration: Release
 #  - configuration: Debug

-install:
-  - ps: Install-Product node 6
-
 # scripts that are called at very beginning, before repo cloning
 init:
  - git config --global core.autocrlf input
@@ -20,14 +17,7 @@ platform: x64
 build_script:
  - CALL appveyor-build.bat

-before_test:
-  - node --version
-  - npm --version
-  - npm install --ignore-scripts
-  - npm link --ignore-scripts
-  - SET PATH=%CD%\osrm-deps\libs\bin;%PATH%
-  - SET OSRM_BUILD_DIR=build\%Configuration%
-  - npm test
+test: off

 artifacts:
  - path: osrm_Release.zip
@@ -11,7 +11,8 @@ SET CONFIGURATION=Release
 FOR /F "tokens=*" %%i in ('git rev-parse --abbrev-ref HEAD') do SET APPVEYOR_REPO_BRANCH=%%i
 ECHO APPVEYOR_REPO_BRANCH^: %APPVEYOR_REPO_BRANCH%

-SET PATH=C:\mb\windows-builds-64\tmp-bin\cmake-3.7.0-rc2-win32-x86\bin;%PATH%
+::SET PATH=C:\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
@@ -1,75 +0,0 @@
-{
-    "AWSTemplateFormatVersion": "2010-09-09",
-    "Description": "user for publishing to s3://mapbox-node-binary/osrm",
-    "Resources": {
-        "User": {
-            "Type": "AWS::IAM::User",
-            "Properties": {
-                "Policies": [
-                    {
-                        "PolicyName": "list",
-                        "PolicyDocument": {
-                            "Statement": [
-                                {
-                                    "Action": [
-                                        "s3:ListBucket"
-                                    ],
-                                    "Effect": "Allow",
-                                    "Resource": "arn:aws:s3:::mapbox-node-binary",
-                                    "Condition": {
-                                        "StringLike": {
-                                            "s3:prefix": [
-                                                "osrm/*"
-                                            ]
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    },
-                    {
-                        "PolicyName": "publish",
-                        "PolicyDocument": {
-                            "Statement": [
-                                {
-                                    "Action": [
-                                        "s3:DeleteObject",
-                                        "s3:GetObject",
-                                        "s3:GetObjectAcl",
-                                        "s3:PutObject",
-                                        "s3:PutObjectAcl"
-                                    ],
-                                    "Effect": "Allow",
-                                    "Resource": "arn:aws:s3:::mapbox-node-binary/osrm/*"
-                                }
-                            ]
-                        }
-                    }
-                ]
-            }
-        },
-        "AccessKey": {
-            "Type": "AWS::IAM::AccessKey",
-            "Properties": {
-                "UserName": {
-                    "Ref": "User"
-                }
-            }
-        }
-    },
-    "Outputs": {
-        "AccessKeyId": {
-            "Value": {
-                "Ref": "AccessKey"
-            }
-        },
-        "SecretAccessKey": {
-            "Value": {
-                "Fn::GetAtt": [
-                    "AccessKey",
-                    "SecretAccessKey"
-                ]
-            }
-        }
-    }
-}
@@ -1,59 +0,0 @@
-var cf = require('@mapbox/cloudfriend');
-var package_json = require('../package.json')
-
-module.exports = {
-  AWSTemplateFormatVersion: '2010-09-09',
-  Description: 'user for publishing to s3://mapbox-node-binary/' + package_json.name,
-  Resources: {
-    User: {
-      Type: 'AWS::IAM::User',
-      Properties: {
-        Policies: [
-          {
-            PolicyName: 'list',
-            PolicyDocument: {
-              Statement: [
-                {
-                  Action: ['s3:ListBucket'],
-                  Effect: 'Allow',
-                  Resource: 'arn:aws:s3:::mapbox-node-binary',
-                  Condition : {
-                    StringLike : {
-                      "s3:prefix": [ package_json.name + "/*"]
-                    }
-                  }
-                }
-              ]
-            }
-          },
-          {
-            PolicyName: 'publish',
-            PolicyDocument: {
-              Statement: [
-                {
-                  Action: ['s3:DeleteObject', 's3:GetObject', 's3:GetObjectAcl', 's3:PutObject', 's3:PutObjectAcl'],
-                  Effect: 'Allow',
-                  Resource: 'arn:aws:s3:::mapbox-node-binary/' + package_json.name + '/*'
-                }
-              ]
-            }
-          }
-        ]
-      }
-    },
-    AccessKey: {
-      Type: 'AWS::IAM::AccessKey',
-      Properties: {
-        UserName: cf.ref('User')
-      }
-    }
-  },
-  Outputs: {
-    AccessKeyId: {
-      Value: cf.ref('AccessKey')
-    },
-    SecretAccessKey: {
-      Value: cf.getAtt('AccessKey', 'SecretAccessKey')
-    }
-  }
-};
@@ -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}/LICENCE.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)
@@ -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]")
@@ -1,194 +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/
-
-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.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}
-        )
-    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)
-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
-  ~/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)
@@ -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)
+
@@ -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()
@@ -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)
@@ -1,21 +0,0 @@
-# - Try to find Shapefile C Library
-#   http://shapelib.maptools.org/
-#
-# Exports:
-#  Shapefile_FOUND
-#  LIBSHAPEFILE_INCLUDE_DIR
-#  LIBSHAPEFILE_LIBRARY
-# Hints:
-#  LIBSHAPEFILE_LIBRARY_DIR
-
-find_path(LIBSHAPEFILE_INCLUDE_DIR
-          shapefil.h)
-
-find_library(LIBSHAPEFILE_LIBRARY
-             NAMES shp
-             HINTS "${LIBSHAPEFILE_LIBRARY_DIR}")
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Shapefile DEFAULT_MSG
-                                  LIBSHAPEFILE_LIBRARY LIBSHAPEFILE_INCLUDE_DIR)
-mark_as_advanced(LIBSHAPEFILE_INCLUDE_DIR LIBSHAPEFILE_LIBRARY)
@@ -1,286 +1,284 @@
-# 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")
-    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 "/usr")
-        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
-    HINTS ${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)
-
-if(EXISTS ${_TBB_INSTALL_DIR}/build)
-  file(GLOB _TBB_BUILD_DIR_RELEASE ${_TBB_INSTALL_DIR}/build/*_release)
-  file(GLOB _TBB_BUILD_DIR_DEBUG ${_TBB_INSTALL_DIR}/build/*_debug)
-endif()
-
-# 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_BUILD_DIR_RELEASE} ${_TBB_LIBRARY_DIR})
-find_library(TBB_MALLOC_LIBRARY ${_TBB_LIB_MALLOC_NAME} HINTS ${_TBB_BUILD_DIR_RELEASE} ${_TBB_LIBRARY_DIR})
-
-#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_BUILD_DIR_DEBUG} ${_TBB_LIBRARY_DIR}
-        PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
-find_library(TBB_MALLOC_LIBRARY_DEBUG ${_TBB_LIB_MALLOC_DEBUG_NAME} HINTS ${_TBB_BUILD_DIR_DEBUG} ${_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)
+# 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)
@@ -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()
@@ -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()
@@ -1,215 +0,0 @@
-# Mason CMake
-
-include(CMakeParseArguments)
-
-function(mason_detect_platform)
-    # Determine platform
-    if(NOT MASON_PLATFORM)
-        # we call uname -s manually here since
-        # CMAKE_HOST_SYSTEM_NAME will not be defined before the project() call
-        execute_process(
-            COMMAND uname -s
-            OUTPUT_VARIABLE UNAME
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-        if (UNAME STREQUAL "Darwin")
-            set(MASON_PLATFORM "osx" PARENT_SCOPE)
-        else()
-            set(MASON_PLATFORM "linux" PARENT_SCOPE)
-        endif()
-    endif()
-
-    # Determine platform version string
-    if(NOT MASON_PLATFORM_VERSION)
-        execute_process(
-            COMMAND uname -m
-            OUTPUT_VARIABLE MASON_PLATFORM_VERSION
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-        set(MASON_PLATFORM_VERSION "${MASON_PLATFORM_VERSION}" PARENT_SCOPE)
-    endif()
-endfunction()
-
-function(mason_use _PACKAGE)
-    if(NOT _PACKAGE)
-        message(FATAL_ERROR "[Mason] No package name given")
-    endif()
-
-    cmake_parse_arguments("" "HEADER_ONLY" "VERSION" "" ${ARGN})
-
-    if(_UNPARSED_ARGUMENTS)
-        message(FATAL_ERROR "[Mason] mason_use() called with unrecognized arguments: ${_UNPARSED_ARGUMENTS}")
-    endif()
-
-    if(NOT _VERSION)
-        message(FATAL_ERROR "[Mason] Specifying a version is required")
-    endif()
-
-    if(MASON_PACKAGE_${_PACKAGE}_INVOCATION STREQUAL "${MASON_INVOCATION}")
-        # Check that the previous invocation of mason_use didn't select another version of this package
-        if(NOT MASON_PACKAGE_${_PACKAGE}_VERSION STREQUAL ${_VERSION})
-            message(FATAL_ERROR "[Mason] Already using ${_PACKAGE} ${MASON_PACKAGE_${_PACKAGE}_VERSION}. Cannot select version ${_VERSION}.")
-        endif()
-    else()
-        if(_HEADER_ONLY)
-            set(_PLATFORM_ID "headers")
-        else()
-            set(_PLATFORM_ID "${MASON_PLATFORM}-${MASON_PLATFORM_VERSION}")
-        endif()
-
-        set(_SLUG "${_PLATFORM_ID}/${_PACKAGE}/${_VERSION}")
-        set(_INSTALL_PATH "${MASON_PACKAGE_DIR}/${_SLUG}")
-        file(RELATIVE_PATH _INSTALL_PATH_RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${_INSTALL_PATH}")
-
-        if(NOT EXISTS "${_INSTALL_PATH}")
-            set(_CACHE_PATH "${MASON_PACKAGE_DIR}/.binaries/${_SLUG}.tar.gz")
-            if (NOT EXISTS "${_CACHE_PATH}")
-                # Download the package
-                set(_URL "${MASON_REPOSITORY}/${_SLUG}.tar.gz")
-                message("[Mason] Downloading package ${_URL}...")
-
-                set(_FAILED)
-                set(_ERROR)
-                # Note: some CMake versions are compiled without SSL support
-                get_filename_component(_CACHE_DIR "${_CACHE_PATH}" DIRECTORY)
-                file(MAKE_DIRECTORY "${_CACHE_DIR}")
-                execute_process(
-                    COMMAND curl --retry 3 -s -f -S -L "${_URL}" -o "${_CACHE_PATH}.tmp"
-                    RESULT_VARIABLE _FAILED
-                    ERROR_VARIABLE _ERROR)
-                if(_FAILED)
-                    message(FATAL_ERROR "[Mason] Failed to download ${_URL}: ${_ERROR}")
-                else()
-                    # We downloaded to a temporary file to prevent half-finished downloads
-                    file(RENAME "${_CACHE_PATH}.tmp" "${_CACHE_PATH}")
-                endif()
-            endif()
-
-            # Unpack the package
-            message("[Mason] Unpacking package to ${_INSTALL_PATH_RELATIVE}...")
-            file(MAKE_DIRECTORY "${_INSTALL_PATH}")
-            execute_process(
-                COMMAND ${CMAKE_COMMAND} -E tar xzf "${_CACHE_PATH}"
-                WORKING_DIRECTORY "${_INSTALL_PATH}")
-        endif()
-
-        # Error out if there is no config file.
-        if(NOT EXISTS "${_INSTALL_PATH}/mason.ini")
-            message(FATAL_ERROR "[Mason] Could not find mason.ini for package ${_PACKAGE} ${_VERSION}")
-        endif()
-
-        set(MASON_PACKAGE_${_PACKAGE}_PREFIX "${_INSTALL_PATH}" CACHE STRING "${_PACKAGE} ${_INSTALL_PATH}" FORCE)
-        mark_as_advanced(MASON_PACKAGE_${_PACKAGE}_PREFIX)
-
-        # Load the configuration from the ini file
-        file(STRINGS "${_INSTALL_PATH}/mason.ini" _CONFIG_FILE)
-        foreach(_LINE IN LISTS _CONFIG_FILE)
-            string(REGEX MATCH "^([a-z_]+) *= *" _KEY "${_LINE}")
-            if (_KEY)
-                string(LENGTH "${_KEY}" _KEY_LENGTH)
-                string(SUBSTRING "${_LINE}" ${_KEY_LENGTH} -1 _VALUE)
-                string(REGEX REPLACE ";.*$" "" _VALUE "${_VALUE}") # Trim trailing commas
-                string(REPLACE "{prefix}" "${_INSTALL_PATH}" _VALUE "${_VALUE}")
-                string(STRIP "${_VALUE}" _VALUE)
-                string(REPLACE "=" "" _KEY "${_KEY}")
-                string(STRIP "${_KEY}" _KEY)
-                string(TOUPPER "${_KEY}" _KEY)
-                if(_KEY STREQUAL "INCLUDE_DIRS" OR _KEY STREQUAL "STATIC_LIBS" )
-                    separate_arguments(_VALUE)
-                endif()
-                set(MASON_PACKAGE_${_PACKAGE}_${_KEY} "${_VALUE}" CACHE STRING "${_PACKAGE} ${_KEY}" FORCE)
-                mark_as_advanced(MASON_PACKAGE_${_PACKAGE}_${_KEY})
-            endif()
-        endforeach()
-
-        # Compare version in the package to catch errors early on
-        if(NOT _VERSION STREQUAL MASON_PACKAGE_${_PACKAGE}_VERSION)
-            message(FATAL_ERROR "[Mason] Package at ${_INSTALL_PATH_RELATIVE} has version '${MASON_PACKAGE_${_PACKAGE}_VERSION}', but required '${_VERSION}'")
-        endif()
-
-        if(NOT _PACKAGE STREQUAL MASON_PACKAGE_${_PACKAGE}_NAME)
-            message(FATAL_ERROR "[Mason] Package at ${_INSTALL_PATH_RELATIVE} has name '${MASON_PACKAGE_${_PACKAGE}_NAME}', but required '${_NAME}'")
-        endif()
-
-        if(NOT _HEADER_ONLY)
-            if(NOT MASON_PLATFORM STREQUAL MASON_PACKAGE_${_PACKAGE}_PLATFORM)
-                message(FATAL_ERROR "[Mason] Package at ${_INSTALL_PATH_RELATIVE} has platform '${MASON_PACKAGE_${_PACKAGE}_PLATFORM}', but required '${MASON_PLATFORM}'")
-            endif()
-
-            if(NOT MASON_PLATFORM_VERSION STREQUAL MASON_PACKAGE_${_PACKAGE}_PLATFORM_VERSION)
-                message(FATAL_ERROR "[Mason] Package at ${_INSTALL_PATH_RELATIVE} has platform version '${MASON_PACKAGE_${_PACKAGE}_PLATFORM_VERSION}', but required '${MASON_PLATFORM_VERSION}'")
-            endif()
-        endif()
-
-        # Concatenate the static libs and libraries
-        set(_LIBRARIES)
-        list(APPEND _LIBRARIES ${MASON_PACKAGE_${_PACKAGE}_STATIC_LIBS} ${MASON_PACKAGE_${_PACKAGE}_LDFLAGS})
-        set(MASON_PACKAGE_${_PACKAGE}_LIBRARIES "${_LIBRARIES}" CACHE STRING "${_PACKAGE} _LIBRARIES" FORCE)
-        mark_as_advanced(MASON_PACKAGE_${_PACKAGE}_LIBRARIES)
-
-        if(NOT _HEADER_ONLY)
-            string(REGEX MATCHALL "(^| +)-L *([^ ]+)" MASON_PACKAGE_${_PACKAGE}_LIBRARY_DIRS "${MASON_PACKAGE_${_PACKAGE}_LDFLAGS}")
-            string(REGEX REPLACE "(^| +)-L *" "\\1" MASON_PACKAGE_${_PACKAGE}_LIBRARY_DIRS "${MASON_PACKAGE_${_PACKAGE}_LIBRARY_DIRS}")
-            set(MASON_PACKAGE_${_PACKAGE}_LIBRARY_DIRS "${MASON_PACKAGE_${_PACKAGE}_LIBRARY_DIRS}" CACHE STRING "${_PACKAGE} ${MASON_PACKAGE_${_PACKAGE}_LIBRARY_DIRS}" FORCE)
-            mark_as_advanced(MASON_PACKAGE_${_PACKAGE}_LIBRARY_DIRS)
-        endif()
-
-        # Store invocation ID to prevent different versions of the same package in one invocation
-        set(MASON_PACKAGE_${_PACKAGE}_INVOCATION "${MASON_INVOCATION}" CACHE INTERNAL "${_PACKAGE} invocation ID" FORCE)
-    endif()
-endfunction()
-
-macro(target_add_mason_package _TARGET _VISIBILITY _PACKAGE)
-    if (NOT MASON_PACKAGE_${_PACKAGE}_INVOCATION)
-        message(FATAL_ERROR "[Mason] Package ${_PACKAGE} has not been initialized yet")
-    endif()
-
-    target_include_directories(${_TARGET} ${_VISIBILITY} "${MASON_PACKAGE_${_PACKAGE}_INCLUDE_DIRS}")
-    target_compile_definitions(${_TARGET} ${_VISIBILITY} "${MASON_PACKAGE_${_PACKAGE}_DEFINITIONS}")
-    target_compile_options(${_TARGET} ${_VISIBILITY} "${MASON_PACKAGE_${_PACKAGE}_OPTIONS}")
-    target_link_libraries(${_TARGET} ${_VISIBILITY} "${MASON_PACKAGE_${_PACKAGE}_LIBRARIES}")
-endmacro()
-
-# Setup
-
-string(RANDOM LENGTH 16 MASON_INVOCATION)
-
-# Read environment variables if CMake is run in command mode
-if (CMAKE_ARGC)
-    set(MASON_PLATFORM "$ENV{MASON_PLATFORM}")
-    set(MASON_PLATFORM_VERSION "$ENV{MASON_PLATFORM_VERSION}")
-    set(MASON_PACKAGE_DIR "$ENV{MASON_PACKAGE_DIR}")
-    set(MASON_REPOSITORY "$ENV{MASON_REPOSITORY}")
-endif()
-
-# Directory where Mason packages are located; typically ends with mason_packages
-if (NOT MASON_PACKAGE_DIR)
-    set(MASON_PACKAGE_DIR "${CMAKE_SOURCE_DIR}/mason_packages")
-endif()
-
-# URL prefix of where packages are located.
-if (NOT MASON_REPOSITORY)
-    set(MASON_REPOSITORY "https://mason-binaries.s3.amazonaws.com")
-endif()
-
-mason_detect_platform()
-
-# Execute commands if CMake is run in command mode
-if (CMAKE_ARGC)
-    # Collect remaining arguments for passing to mason_use
-    set(_MASON_ARGS)
-    if (${CMAKE_ARGC} LESS 5)
-        message(FATAL_ERROR "Usage: mason.sh [install|prefix] PACKAGE VERSION")
-    endif()
-
-    if (${CMAKE_ARGV3} STREQUAL "install")
-        # Install the package
-        mason_use(${CMAKE_ARGV4} VERSION ${CMAKE_ARGV5})
-    elseif (${CMAKE_ARGV3} STREQUAL "prefix")
-        set(PKG_PREFIX "${MASON_PACKAGE_DIR}/${MASON_PLATFORM}-${MASON_PLATFORM_VERSION}/${CMAKE_ARGV4}/${CMAKE_ARGV5}")
-        # CMake can't write to stdout with message()
-        execute_process(COMMAND ${CMAKE_COMMAND} -E echo "${PKG_PREFIX}")
-    else()
-        message(FATAL_ERROR "Usage: mason.sh [install|prefix] PACKAGE VERSION")
-    endif()
-
-endif()
@@ -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: v@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@
@@ -1,6 +1,7 @@
 coverage:

  ignore:
+    - unit_tests/.*
    - third_party/.*

 comment: off
@@ -1,7 +1,11 @@
 module.exports = {
-    default: '--strict --tags ~@stress --tags ~@todo --require features/support --require features/step_definitions',
-    verify: '--strict --tags ~@stress --tags ~@todo -f progress --require features/support --require features/step_definitions',
-    todo: '--strict --tags @todo --require features/support --require features/step_definitions',
-    all: '--strict --require features/support --require features/step_definitions',
-    mld: '--strict --tags ~@stress --tags ~@todo --tags ~@alternative --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'
 }
+
+
+
@@ -1,53 +1,27 @@
-FROM alpine:3.5
+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

-RUN mkdir /opt
 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 NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
-    echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
-    apk update && \
-    apk upgrade && \
-    apk add git cmake wget make libc-dev gcc g++ bzip2-dev boost-dev zlib-dev expat-dev lua5.1-dev libtbb@testing libtbb-dev@testing && \
-    \
-    echo "Building libstxxl" && \
-    cd /opt && \
-    git clone --depth 1 --branch 1.4.1 https://github.com/stxxl/stxxl.git && \
-    cd stxxl && \
-    mkdir build && \
-    cd build && \
-    cmake -DCMAKE_BUILD_TYPE=Release .. && \
-    make -j${NPROC} && \
-    make install
+RUN useradd -ms /bin/bash mapbox
+USER mapbox
+ENV HOME /home/mapbox
+WORKDIR /home/mapbox

-ARG DOCKER_TAG
-RUN mkdir /src
-COPY . /src
-WORKDIR /src
-
-RUN NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
-    echo "Building OSRM ${DOCKER_TAG}" && \
-    git show --format="%H" | head -n1 > /opt/OSRM_GITSHA && \
-    echo "Building OSRM gitsha $(cat /opt/OSRM_GITSHA)" && \
-    mkdir 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 && \
-    \
-    echo "Cleaning up" && \
-    strip /usr/local/bin/* && \
-    rm /usr/local/lib/libstxxl* && \
-    cd /opt && \
-    apk del boost-dev && \
-    apk del g++ cmake libc-dev expat-dev zlib-dev bzip2-dev lua5.1-dev git make gcc && \
-    apk add boost-filesystem boost-program_options boost-regex boost-iostreams boost-thread libgomp lua5.1 expat && \
-    rm -rf /src /opt/stxxl /usr/local/bin/stxxl_tool /usr/local/lib/libosrm*
-
-EXPOSE 5000
+RUN echo "source /opt/nvm/nvm.sh" > .bashrc
+RUN echo "source /home/mapbox/.bashrc" > .profile
@@ -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.
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+docker build \
+    -t mapbox/osrm:linux \
+    docker/
+
@@ -1,9 +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 --build-arg DOCKER_TAG=${DOCKER_TAG} -t $IMAGE_NAME -f Dockerfile ..
@@ -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"
@@ -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"
@@ -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
@@ -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 guar a name, so it actually gets a lifetime.
-
-The field `data-for-conversion` can be an arbitrary long set of features and needs to match the parameters used for constructing our policy (in this case `util::NodeIdVectorToLineString`).
-
-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 the a scopeguard to log decisions in the edge-based-graph-factory would be right before we run it ([here](https://github.com/Project-OSRM/osrm-backend/blob/a933b5d94943bf3edaf42c84a614a99650d23cba/src/extractor/extractor.cpp#L497)). If you put `util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString> geojson_guard( "debug.geojson", node_coordinate_vector);` at that location, you can then print `util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString>::Write(list_of_node_ids);` anywhere within the `edge-based-graph-factory`.
-
-This location would enable call for all guidance related pre-processing which is called in the edge-based-graph-factory.
-Logging any turn-handler decisions, for example, would now be possible.
-
-## Limitations
-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);`
@@ -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
@@ -1,345 +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, which is prepared by the OSRM toolchain.
-You can create such a `.osrm` file 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` file, you can calculate routes in javascript with this object.
-
-```javascript
-var osrm = new OSRM('network.osrm');
-```
-
-**Parameters**
-
-   `options` **([Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object) \| [String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String))** Options for creating an OSRM object or string to the `.osrm` file. (optional, default `{shared_memory:true}`)
-    -   `options.algorithm` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** The algorithm to use for routing. Can be 'CH', 'CoreCH' or 'MLD'. Default is 'CH'.
-               Make sure you prepared the dataset with the correct toolchain.
-    -   `options.shared_memory` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Connects to the persistent shared memory datastore.
-               This requires you to run `osrm-datastore` prior to creating an `OSRM` object.
-    -   `options.path` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** The path to the `.osrm` files. This is mutually exclusive with setting {options.shared_memory} to true.
-    -   `options.max_locations_trip` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in trip query (default: unlimited).
-    -   `options.max_locations_viaroute` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in viaroute query (default: unlimited).
-    -   `options.max_locations_distance_table` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in distance table query (default: unlimited).
-    -   `options.max_locations_map_matching` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in map-matching query (default: unlimited).
-    -   `options.max_results_nearest` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. results supported in nearest query (default: unlimited).
-    -   `options.max_alternatives` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max.number of alternatives supported in alternative routes query (default: 3).
-
-### route
-
-Returns the fastest route between two or more coordinates while visiting the waypoints in order.
-
-**Parameters**
-
-   `options` **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the route query.
-    -   `options.coordinates` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
-    -   `options.bearings` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
-                                          Can be `null` or an array of `[{value},{range}]` with `integer 0 .. 360,integer 0 .. 180`.
-    -   `options.radiuses` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the coordinate snapping to streets in the given radius in meters. Can be `null` (unlimited, default) or `double >= 0`.
-    -   `options.hints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
-    -   `options.alternatives` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Search for alternative routes. (optional, default `false`)
-    -   `options.alternatives` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)** Search for up to this many alternative routes.
-        _Please note that even if alternative routes are requested, a result cannot be guaranteed._ (optional, default `0`)
-    -   `options.steps` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route steps for each route leg. (optional, default `false`)
-    -   `options.annotations` **([Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array) \| [Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean))** An array with strings of `duration`, `nodes`, `distance`, `weight`, `datasources`, `speed` or boolean for enabling/disabling all. (optional, default `false`)
-    -   `options.geometries` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route geometry format (influences overview and per step). Can also be `geojson`. (optional, default `polyline`)
-    -   `options.overview` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Add overview geometry either `full`, `simplified` according to highest zoom level it could be display on, or not at all (`false`). (optional, default `simplified`)
-    -   `options.continue_straight` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Forces the route to keep going straight at waypoints and don't do a uturn even if it would be faster. Default value depends on the profile.
-    -   `options.approaches` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
-                         `null`/`true`/`false`
-   `callback` **[Function](https://developer.mozilla.org/en-US/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/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** An array of [Waypoint](#waypoint) objects representing all waypoints in order AND an array of [`Route`](#route) objects ordered by descending recommendation rank.
-
-### 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/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the nearest query.
-    -   `options.coordinates` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
-    -   `options.bearings` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
-                                          Can be `null` or an array of `[{value},{range}]` with `integer 0 .. 360,integer 0 .. 180`.
-    -   `options.radiuses` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the coordinate snapping to streets in the given radius in meters. Can be `null` (unlimited, default) or `double >= 0`.
-    -   `options.hints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
-    -   `options.number` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)** Number of nearest segments that should be returned.
-        Must be an integer greater than or equal to `1`. (optional, default `1`)
-    -   `options.approaches` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
-   `callback` **[Function](https://developer.mozilla.org/en-US/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/en-US/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 tables for the given locations. Allows for both symmetric and asymmetric
-tables.
-
-**Parameters**
-
-   `options` **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the table query.
-    -   `options.coordinates` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
-    -   `options.bearings` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
-                                          Can be `null` or an array of `[{value},{range}]` with `integer 0 .. 360,integer 0 .. 180`.
-    -   `options.radiuses` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the coordinate snapping to streets in the given radius in meters. Can be `null` (unlimited, default) or `double >= 0`.
-    -   `options.hints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
-    -   `options.sources` **[Array](https://developer.mozilla.org/en-US/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/en-US/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/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
-   `callback` **[Function](https://developer.mozilla.org/en-US/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.sources); // array of Waypoint objects
-  console.log(response.destinations); // array of Waypoint objects
-});
-```
-
-Returns **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** containing `durations`, `sources`, and `destinations`.
-**`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.
-**`sources`**: array of [`Ẁaypoint`](#waypoint) objects describing all sources in order.
-**`destinations`**: array of [`Ẁaypoint`](#waypoint) objects describing all destinations in order.
-
-### 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/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)** an array consisting of `x`, `y`, and `z` values representing tile coordinates like
-           [wiki.openstreetmap.org/wiki/Slippy_map_tilenames](https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames)
-           and are supported by vector tile viewers like [Mapbox GL JS](https://www.mapbox.com/mapbox-gl-js/api/).
-   `callback` **[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)** 
-
-**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/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the match query.
-    -   `options.coordinates` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
-    -   `options.bearings` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
-                                          Can be `null` or an array of `[{value},{range}]` with `integer 0 .. 360,integer 0 .. 180`.
-    -   `options.hints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
-    -   `options.steps` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route steps for each route. (optional, default `false`)
-    -   `options.annotations` **([Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array) \| [Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean))** An array with strings of `duration`, `nodes`, `distance`, `weight`, `datasources`, `speed` or boolean for enabling/disabling all. (optional, default `false`)
-    -   `options.geometries` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route geometry format (influences overview and per step). Can also be `geojson`. (optional, default `polyline`)
-    -   `options.overview` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Add overview geometry either `full`, `simplified` according to highest zoom level it could be display on, or not at all (`false`). (optional, default `simplified`)
-    -   `options.timestamps` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)&lt;[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)>?** Timestamp of the input location (integers, UNIX-like timestamp).
-    -   `options.radiuses` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Standard deviation of GPS precision used for map matching. If applicable use GPS accuracy. Can be `null` for default value `5` meters or `double >= 0`.
-    -   `options.gaps` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** Allows the input track splitting based on huge timestamp gaps between points. Either `split` or `ignore` (optional, default `split`).
-    -   `options.tidy` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Allows the input track modification to obtain better matching quality for noisy tracks (optional, default `false`).
-   `callback` **[Function](https://developer.mozilla.org/en-US/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/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** containing `tracepoints` and `matchings`.
-**`tracepoints`** Array of [`Ẁaypoint`](#waypoint) objects representing all points of the trace in order.
-                  If the trace point was ommited by map matching because it is an outlier, the entry will be null.
-                  Each `Waypoint` object includes two 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.
-**`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/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the trip query.
-    -   `options.coordinates` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
-    -   `options.bearings` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
-                                          Can be `null` or an array of `[{value},{range}]` with `integer 0 .. 360,integer 0 .. 180`.
-    -   `options.radiuses` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the coordinate snapping to streets in the given radius in meters. Can be `double >= 0` or `null` (unlimited, default).
-    -   `options.hints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
-    -   `options.steps` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route steps for each route. (optional, default `false`)
-    -   `options.annotations` **([Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array) \| [Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean))** An array with strings of `duration`, `nodes`, `distance`, `weight`, `datasources`, `speed` or boolean for enabling/disabling all. (optional, default `false`)
-    -   `options.geometries` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route geometry format (influences overview and per step). Can also be `geojson`. (optional, default `polyline`)
-    -   `options.overview` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Add overview geometry either `full`, `simplified` (optional, default `simplified`)
-    -   `options.roundtrip` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route is a roundtrip. (optional, default `true`)
-    -   `options.source` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Return route starts at `any` or `first` coordinate. (optional, default `any`)
-    -   `options.destination` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Return route ends at `any` or `last` coordinate. (optional, default `any`)
-    -   `options.approaches` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
-   `callback` **[Function](https://developer.mozilla.org/en-US/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/en-US/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.
-
-## Responses
-
-Responses
-
-### Route
-
-Represents a route through (potentially multiple) waypoints.
-
-**Parameters**
-
-   `exteral` **documentation** in
-    [`osrm-backend`](../http.md#route)
-
-### RouteLeg
-
-Represents a route between two waypoints.
-
-**Parameters**
-
-   `exteral` **documentation** in
-    [`osrm-backend`](../http.md#routeleg)
-
-### 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**
-
-   `exteral` **documentation** in
-    [`osrm-backend`](https://github.com/Project-OSRM/osrm-backend/blob/master/docs/http.md#routestep)
-
-### StepManeuver
-
-**Parameters**
-
-   `exteral` **documentation** in
-    [`osrm-backend`](https://github.com/Project-OSRM/osrm-backend/blob/master/docs/http.md#stepmaneuver)
-
-### Waypoint
-
-Object used to describe waypoint on a route.
-
-**Parameters**
-
-   `exteral` **documentation** in
-    [`osrm-backend`](https://github.com/Project-OSRM/osrm-backend/blob/master/docs/http.md#waypoint)
@@ -1,86 +0,0 @@
-# Releasing
-
-Releasing a new version of `node-osrm` is mostly automated using Travis CI.
-
-The version of `node-osrm` is locked to the same version as `osrm-backend`. Every `node-osrm` should have a `osrm-backend` release of the same version. Of course, only release a `node-osrm` after the release has been tagged in `osrm-backend`.
-
-These steps all happen on `master`. After the release is out, create a branch using the MAJOR.MINOR version of the release to document code changes made for that version.
-
-### Steps to release
-
-1. Update the `osrm_release` field in `package.json` to the corresonding git tag in `osrm-backend.`
-   
-   Confirm the desired OSRM branch and commit to `master`.
-
-1. Bump node-osrm version
-
-   Update the `CHANGELOG.md` and the `package.json` version if needed.
-
-1. Check that Travis CI [builds are passing](https://travis-ci.org/Project-OSRM/node-osrm) for the latest commit on `master`.
-
-1. Publishing binaries
-
-   If travis builds are passing then it's time to publish binaries by committing with a message containing `[publish binary]`. Use an empty commit for this.
-
-   ```
-   git commit --allow-empty -m "[publish binary] vMAJOR.MINOR.PATCH"
-   ```
-
-1. Test
-
-   Locally you can now test binaries. Cleanup, re-install, and run the tests like:
-
-   ```
-   make clean
-   npm install # will pull remote binaries
-   npm ls # confirm deps are correct
-   make test
-   ```
-
-1. Tag
-
-   Once binaries are published for Linux and OS X then its time to tag a new release and add the changelog to the tag:
-
-   ```
-   git tag vMAJOR.MINOR.PATCH -a
-   git push --tags
-   ```
-
-1. Publish node-osrm. **we only do this for stable releases**
-
-   First ensure your local `node-pre-gyp` is up to date:
-
-   ```
-   npm ls
-   ```
-
-   This is important because it is bundled during packaging.
-
-   If you see any errors then do:
-
-   ```
-   rm -rf node_modules/node-pre-gyp
-   npm install node-pre-gyp
-   ```
-
-   Now we're ready to publish `node-osrm` to <https://www.npmjs.org/package/osrm>:
-
-   ```
-   npm publish
-   ```
-
-   Dependent apps can now pull from the npm registry like:
-
-   ```
-   "dependencies": {
-       "osrm": "^MAJOR.MINOR.PATCH"
-   }
-   ```
-
-   Or can still pull from the github tag like:
-
-   ```
-   "dependencies": {
-       "osrm": "https://github.com/Project-OSRM/node-osrm/archive/vMAJOR.MINOR.PATCH.tar.gz"
-   }
-   ```
@@ -1,275 +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 places 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` functions, 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 be modifying this configuration table.
+## way_function

-The setup function is also where you can do other setup, like loading 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 comes 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 if 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 measure of what is the best route. That's why there's a need for different profiles.
-
-Because speeds very 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 concept 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 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 you 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 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 street, 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 2.
-
-### 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
-destination.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 it's functions later, of if you need only a single 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 iinterpreter will have it's 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 instructions 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`)
-
-### process_node(profile, node, result)
-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.
-
-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)
-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`.
-node     | The input way to process (read-only).
-result   | The output that you will modify.
-
-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
-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/guidance/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.
-
-In the `process_segment` you don't have access to OSM tags. Instead you use the geographical location of the start and end point of the way to lookup other 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   |  "   "
-target.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
-------------------|-------------|---------|------------------------------------------------------
-direction_modifier | Read        | Enum    | Geometry of turn. Defined in `include/extractor/guidance/turn_instruction.hpp`
-turn_type          | Read        | Enum    | Priority of turn. Defined in `include/extractor/guidance/turn_instruction.hpp`
-has_traffic_light  | Read        | Boolean | Is a traffic light present at this turn?
-source_restricted  | Read        | Boolean | Is it from a restricted access road? (See definition in `process_way`)
-target_restricted  | Read        | Boolean | Is it to a restricted access road? (See definition in `process_way`)
-angle              | Read        | Float   | Angle of turn in degrees (`0-360`: `0`=u-turn, `180`=straight on)
-duration           | Read/write  | Float   | Penalty to be applied for this turn (duration in deciseconds)
-weight             | Read/write  | Float   | Penalty to be applied for this turn (routing weight)
-
-## 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 build-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 use 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.
@@ -1,56 +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 OSRM version in `CMakeLists.txt` is up to date
-4. Make sure the `package.json` is up to date.
-5. Make sure all tests are passing (e.g. Travis CI gives you a :thumbs_up:)
-6. Use an annotated tag to mark the release: `git tag vx.y.z -a` Body of the tag description should be the changelog entries.
-7. 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
-8. Push tags and commits: `git push; git push --tags`
-9. If not a release-candidate: Write a mailing-list post to osrm-talk@openstreetmap.org to announce the release
-10. Wait until the travis 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-latest.1` on the `master` branch after the release.
+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
+
@@ -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.
@@ -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';
@@ -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>
@@ -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 = [];
@@ -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 unique, we need to split segments that contribute to the restriction into the smallest possible parts.
-E.g. the above scenario could correctly be expressed as:
-
-```
-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 changed the turn angles, obviously you can expect changes in the distinction between `slight right` and `right`.
-In such a case it is, of course, reasonable to change the expected route to report `right` instead of `slight right`. You should consider inspecting the actual turn angles at `b` to see if you feel that change is justified.
-
-However, you should never adjust the test itself.
-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 finde in `util/debug.hpp` (and potentially other related headers).
-
-If your test is inspecting a series of turns (remember, a turn not necessarily equals an instruction), you could see interaction with post-processing.
-To see the unprocessed turns, you should print the steps at the end of step assembly (`assembleSteps` in `engine/guidance/assemble_steps.hpp`).
-
-If you see unexpected changes, you can consider adding the `locations` field to your test to study what location a turn is reported at.
-
-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.
@@ -19,7 +19,7 @@ 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)
@@ -33,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})
@@ -1,283 +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)
+# 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)
@@ -18,7 +18,7 @@

 #include <cstdlib>

-int main(int argc, const char *argv[])
+int main(int argc, const char *argv[]) try
 {
    if (argc < 2)
    {
@@ -34,14 +34,14 @@ int main(int argc, const char *argv[])
    config.use_shared_memory = false;

    // 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
    json::Object result;
@@ -58,8 +58,8 @@ int main(int argc, const char *argv[])
        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";
@@ -67,7 +67,6 @@ 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)
    {
@@ -79,3 +78,8 @@ int main(int argc, const char *argv[])
        return EXIT_FAILURE;
    }
 }
+catch (const std::exception &e)
+{
+    std::cerr << "Error: " << e.what() << std::endl;
+    return EXIT_FAILURE;
+}
@@ -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);
@@ -7,179 +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     |         |
+            | 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     |
@@ -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     |       |
@@ -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    | 200.4  | Avoids d,e,f                     |
-            | a    | e  | 1:2:5      | 176.4  | Take the alley b,e if neccessary |
-            | d    | f  | 4:1:2:3:6  | 252.6  | Avoids the alley d,e,f           |
-
@@ -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    |
@@ -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 |
@@ -79,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 | 6 km/h +-1 |
-            | cycleway    | track    | yes    | 15 km/h | 6 km/h +-1 |
-            | footway     | track    | yes    | 15 km/h | 6 km/h +-1 |
@@ -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       |
@@ -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 |
@@ -9,7 +9,7 @@ Feature: Bike - Max speed restrictions
        Then routability should be
            | highway     | maxspeed | bothw   |
            | residential |          | 15 km/h |
-            | residential | 10       | 9 km/h  |
+            | residential | 10       | 10 km/h |

    Scenario: Bicycle - Ignore maxspeed when higher than way speed
        Then routability should be
@@ -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 |
@@ -65,12 +63,12 @@ Feature: Bike - Max speed restrictions
        Then routability should be
            | maxspeed | maxspeed:forward | maxspeed:backward | forw    | backw   |
            |          |                  |                   | 15 km/h | 15 km/h |
-            | 10       |                  |                   | 9 km/h  | 9 km/h  |
-            |          | 10               |                   | 9 km/h  | 15 km/h |
-            |          |                  | 10                | 14 km/h | 9 km/h  |
-            | 2        | 10               |                   | 9 km/h  | 2 km/h  |
-            | 2        |                  | 10                | 2 km/h  | 9 km/h  |
-            | 2        | 5                | 10                | 5 km/h  | 9 km/h  |
+            | 10       |                  |                   | 10 km/h | 10 km/h |
+            |          | 10               |                   | 10 km/h | 15 km/h |
+            |          |                  | 10                | 15 km/h | 10 km/h |
+            | 2        | 10               |                   | 10 km/h | 2 km/h  |
+            | 2        |                  | 10                | 2 km/h  | 10 km/h |
+            | 2        | 5                | 10                | 5 km/h  | 10 km/h |

    Scenario: Bike - Maxspeed should not allow routing on unroutable ways
        Then routability should be
@@ -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 |
@@ -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} |
@@ -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,12 +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 | cycling      |
-            | primary     | yes    | track          | track          | cycling | cycling      |
@@ -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
@@ -86,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 |
@@ -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 |
@@ -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 |
@@ -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.9 |        2.9 |
-            | secondary      |          | 15 km/h    | 15 km/h    |       3.1 |        3.1 |
-            | tertiary       |          | 15 km/h    | 15 km/h    |       3.3 |        3.3 |
-            | primary_link   |          | 15 km/h    | 15 km/h    |       2.9 |        2.9 |
-            | secondary_link |          | 15 km/h    | 15 km/h    |       3.1 |        3.1 |
-            | 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        |          | 6 km/h +-1 | 6 km/h +-1 |       1.7 |        1.7 |
-
-    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       | 15 km/h | 15 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        | 15 km/h | 15 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.9 |
-            | secondary      | track          |               | 15 km/h     | 15 km/h     |       4.2 |        3.1 |
-            | tertiary       | track          |               | 15 km/h     | 15 km/h     |       4.2 |        3.3 |
-            | primary_link   | track          |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
-            | secondary_link | track          |               | 15 km/h     | 15 km/h     |       4.2 |        3.1 |
-            | tertiary_link  | track          |               | 15 km/h     | 15 km/h     |       4.2 |        3.3 |
-            | residential    | track          |               | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
-            | cycleway       | track          |               | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
-            | footway        | track          |               | 15 km/h     | 6 km/h +-1  |       4.2 |        1.7 |
-            | motorway       |                | track         |             | 15 km/h     |           |        4.2 |
-            | primary        |                | track         | 15 km/h     | 15 km/h     |       2.9 |        4.2 |
-            | secondary      |                | track         | 15 km/h     | 15 km/h     |       3.1 |        4.2 |
-            | tertiary       |                | track         | 15 km/h     | 15 km/h     |       3.3 |        4.2 |
-            | primary_link   |                | track         | 15 km/h     | 15 km/h     |       2.9 |        4.2 |
-            | secondary_link |                | track         | 15 km/h     | 15 km/h     |       3.1 |        4.2 |
-            | tertiary_link  |                | track         | 15 km/h     | 15 km/h     |       3.3 |        4.2 |
-            | residential    |                | track         | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
-            | cycleway       |                | track         | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
-            | footway        |                | track         | 6 km/h +-1  | 15 km/h     |       1.7 |        4.2 |
-            | motorway       | lane           |               | 15 km/h     |             |       4.2 |            |
-            | primary        | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
-            | secondary      | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        3.1 |
-            | tertiary       | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        3.3 |
-            | primary_link   | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
-            | secondary_link | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        3.1 |
-            | 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     | 6 km/h +-1  |       4.2 |        1.7 |
-            | motorway       |                | lane          |             | 15 km/h     |           |        4.2 |
-            | primary        |                | lane          | 15 km/h     | 15 km/h     |       2.9 |        4.2 |
-            | secondary      |                | lane          | 15 km/h +-1 | 15 km/h +-1 |       3.1 |        4.2 |
-            | tertiary       |                | lane          | 15 km/h     | 15 km/h     |       3.3 |        4.2 |
-            | primary_link   |                | lane          | 15 km/h     | 15 km/h     |       2.9 |        4.2 |
-            | secondary_link |                | lane          | 15 km/h     | 15 km/h     |       3.1 |        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          | 6 km/h +-1  | 15 km/h     |       1.7 |        4.2 |
-            | motorway       | shared_lane    |               | 15 km/h     |             |       4.2 |            |
-            | primary        | shared_lane    |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
-            | motorway       |                | shared_lane   |             | 15 km/h     |           |        4.2 |
-            | primary        |                | shared_lane   | 15 km/h     | 15 km/h     |       2.9 |        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 |        4.2 |
@@ -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      |
@@ -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 |
@@ -6,54 +6,35 @@ Feature: Bike - Surfaces

    Scenario: Bicycle - Slow surfaces
        Then routability should be
-            | highway  | surface               | bothw   |
-            | cycleway |                       | 48 s    |
-            | cycleway | asphalt               | 48 s    |
-            | cycleway | cobblestone:flattened | 72 s    |
-            | cycleway | paving_stones         | 72 s    |
-            | cycleway | compacted             | 72 s    |
-            | cycleway | cobblestone           | 120 s   |
-            | cycleway | fine_gravel           | 120 s   |
-            | cycleway | gravel                | 120 s   |
-            | cycleway | pebblestone           | 120.1 s |
-            | cycleway | dirt                  | 120 s   |
-            | cycleway | earth                 | 120 s   |
-            | cycleway | grass                 | 120 s   |
-            | cycleway | mud                   | 240 s   |
-            | cycleway | sand                  | 240.1 s |
-            | cycleway | sett                  | 72 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     |         | 60 s  |
-        | track    |         | 60 s  |
-        | track    | asphalt | 60 s  |
-        | path     | asphalt | 60 s  |
+        | 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 | 6 km/h  |
-        | c    | d  | cd,cd | pushing bike,pushing bike | 6 km/h  |
-        | d    | c  | cd,cd | pushing bike,pushing bike | 6 km/h  |
@@ -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     |       |
@@ -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 +- 4| 503.9  | Going straght has no penalties            |
-            | e    | h  | 2100m +- 4| 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 |
@@ -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,15 +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     |   |
-            | 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
@@ -178,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.2       | 18.2        |
-            | 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         |
-
-    @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.2      | 18.2       |
-            | 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   |
@@ -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 |


@@ -29,14 +29,14 @@ Feature: Car - Barriers
            | gate         | permissive    | x     |
            | gate         | designated    | x     |
            | gate         | no            |       |
-            | gate         | private       | x     |
+            | gate         | private       |       |
            | gate         | agricultural  |       |
            | wall         |               |       |
            | wall         | yes           | x     |
            | wall         | permissive    | x     |
            | wall         | designated    | x     |
            | wall         | no            |       |
-            | wall         | private       | x     |
+            | wall         | private       |       |
            | wall         | agricultural  |       |

    Scenario: Car - Rising bollard exception for barriers
@@ -3,62 +3,45 @@ Feature: Car - Handle driving

    Background:
        Given the profile "car"
-        Given a grid size of 200 meters

    Scenario: Car - Use a ferry route
        Given the node map
-            """
-            a b c
-                d
-                e f g
-            """
+            | a | b | c |   |   |
+            |   |   | d |   |   |
+            |   |   | e | f | g |

        And the ways
            | nodes | highway | bridge  | bicycle |
            | abc   | primary |         |         |
-            | cde   | primary | movable | yes     |
+            | cde   |         | movable | yes     |
            | efg   | primary |         |         |

        When I route I should get
-            | from | to | route           | modes                           |
+            | from | to | route           | modes                                  |
            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving |
+            | b    | f  | abc,cde,efg,efg | driving,driving,driving,driving |
+            | e    | c  | cde,cde         | driving,driving          |
+            | e    | b  | cde,abc,abc     | driving,driving,driving         |
            | e    | a  | cde,abc,abc     | driving,driving,driving         |
-
-    Scenario: Car - Control test without durations, osrm uses movable bridge speed to calculate duration
-        Given the node map
-            """
-            a b c
-                d
-                e f g
-            """
-
-        And the ways
-            | nodes | highway | bridge  |
-            | abc   | primary |         |
-            | cde   | primary | movable |
-            | efg   | primary |         |
-
-        When I route I should get
-            | from | to | route           | modes                           | speed   | time     |
-            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving | 13 km/h | 340s +-1 |
-            | e    | c  | cde,cde         | driving,driving                 | 5 km/h  | 295s +-1 |
+            | c    | e  | cde,cde         | driving,driving          |
+            | c    | f  | cde,efg,efg     | driving,driving,driving         |
+            | c    | g  | cde,efg,efg     | driving,driving,driving         |

    Scenario: Car - 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 |
            | abc   | primary |         |          |
-            | cde   | primary | movable | 00:10:00 |
+            | cde   |         | movable | 00:05:00 |
            | efg   | primary |         |          |

        When I route I should get
-            | from | to | route           | modes                           | speed  |
+            | from | to | route           | modes                                  | speed  |
            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving | 7 km/h |
-            | c    | e  | cde,cde         | driving,driving                 | 2 km/h |
-            | e    | c  | cde,cde         | driving,driving                 | 2 km/h |
+            | b    | f  | abc,cde,efg,efg | driving,driving,driving,driving | 5 km/h |
+            | c    | e  | cde,cde         | driving,driving          | 2 km/h |
+            | e    | c  | cde,cde         | driving,driving          | 2 km/h |
@@ -1,127 +0,0 @@
-@routing @car @mode
-Feature: Car - Mode flag
-    Background:
-        Given the profile "car"
-
-    Scenario: Car - We tag ferries with a class
-        Given the node map
-            """
-            a b
-              c d
-            """
-
-        And the ways
-            | nodes | highway | route |
-            | ab    | primary |       |
-            | bc    |         | ferry |
-            | cd    | primary |       |
-
-        When I route I should get
-            | from | to | route       | turns                                              | classes                  |
-            | a    | d  | ab,bc,cd,cd | depart,notification right,notification left,arrive | [()],[(ferry)],[()],[()] |
-            | d    | a  | cd,bc,ab,ab | depart,notification right,notification left,arrive | [()],[(ferry)],[()],[()] |
-            | c    | a  | bc,ab,ab    | depart,notification left,arrive                    | [(ferry)],[()],[()]      |
-            | d    | b  | cd,bc,bc    | depart,notification right,arrive                   | [()],[(ferry)],[()]      |
-            | a    | c  | ab,bc,bc    | depart,notification right,arrive                   | [()],[(ferry)],[()]      |
-            | b    | d  | bc,cd,cd    | depart,notification left,arrive                    | [(ferry)],[()],[()]      |
-
-
-    Scenario: Car - We tag motorways with a class
-        Given the node map
-            """
-            a b
-              c d
-            """
-
-        And the ways
-            | nodes | highway |
-            | ab    | primary |
-            | bc    | motorway|
-            | cd    | primary |
-
-        When I route I should get
-            | from | to | route    | turns         | classes                 |
-            | a    | d  | ab,cd    | depart,arrive | [(),(motorway),()],[()] |
-            | a    | c  | ab,bc    | depart,arrive | [(),(motorway)],[()]    |
-            | b    | d  | bc,cd    | depart,arrive | [(motorway),()],[()]    |
-
-    Scenario: Car - We tag motorway_link with a class
-        Given the node map
-            """
-            a b
-              c d
-            """
-
-        And the ways
-            | nodes | highway       |
-            | ab    | primary       |
-            | bc    | motorway_link |
-            | cd    | primary       |
-
-        When I route I should get
-            | from | to | route    | turns                       | classes                   | #                                |
-            | a    | d  | ab,bc,cd | depart,on ramp right,arrive | [()],[(motorway),()],[()] | on-ramp at class change          |
-            | a    | c  | ab,bc,bc | depart,on ramp right,arrive | [()],[(motorway)],[()]    |    "                "            |
-            | b    | d  | bc,cd    | depart,arrive               | [(motorway),()],[()]      | no announcement                  |
-
-
-    Scenario: Car - We tag restricted with a class
-        Given the node map
-            """
-            a b
-              c d
-            """
-
-        And the ways
-            | nodes | highway | access   |
-            | ab    | primary | private  |
-            | bc    | motorway| private  |
-            | cd    | primary |          |
-
-        When I route I should get
-            | from | to | route | turns        | classes                                      |
-            | a    | d  | ab,cd | depart,arrive| [(restricted),(motorway,restricted),()],[()] |
-
-    Scenario: Car - We toll restricted with a class
-        Given the node map
-            """
-            a b
-              c d
-            """
-
-        And the ways
-            | nodes | highway | toll     |
-            | ab    | primary | yes      |
-            | bc    | motorway| yes      |
-            | cd    | primary |          |
-
-        When I route I should get
-            | from | to | route    | turns         | classes                          |
-            | a    | d  | ab,cd    | depart,arrive | [(toll),(motorway,toll),()],[()] |
-
-    Scenario: Car - From roundabout on toll road
-        Given the node map
-            """
-                     c
-                  /     \
-            a---b         d---f
-                  \     /
-                     e
-                     |
-                     g
-            """
-
-        And the ways
-            | nodes | oneway | highway | junction   | toll     |
-            | ab    | yes    | primary |            |          |
-            | cb    | yes    | primary | roundabout |          |
-            | dc    | yes    | primary | roundabout |          |
-            | be    | yes    | primary | roundabout |          |
-            | ed    | yes    | motorway| roundabout |          |
-            | eg    | yes    | primary |            |          |
-            | df    | yes    | motorway|            | yes      |
-
-        When I route I should get
-            | from | to | route    | turns                           | classes                                   |
-            | a    | f  | ab,df,df | depart,roundabout-exit-2,arrive | [()],[(),(motorway),(toll,motorway)],[()] |
-
@@ -1,17 +0,0 @@
-@routing @car @construction
-Feature: Car - all construction tags the OpenStreetMap community could think of and then some
-
-    Background:
-        Given the profile "car"
-
-    Scenario: Various ways to tag construction and proposed roads
-        Then routability should be
-            | highway      | construction | proposed | bothw |
-            | primary      |              |          | x     |
-            | construction |              |          |       |
-            | proposed     |              |          |       |
-            | primary      |          yes |          |       |
-            | primary      |              |     yes  |       |
-            | primary      |           no |          | x     |
-            | primary      |     widening |          | x     |
-            | primary      |        minor |          | x     |
@@ -1,4 +1,4 @@
-@routing @car @destination
+@routing @car @destination @todo
 Feature: Car - Destination only, no passing through

    Background:
@@ -6,12 +6,10 @@ Feature: Car - Destination only, no passing through

    Scenario: Car - 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      |
@@ -23,22 +21,20 @@ Feature: Car - Destination only, no passing through
        When I route I should get
            | from | to | route      |
            | a    | b  | ab,ab      |
-            | a    | c  | ab,bcd     |
+            | a    | c  | ab,bcd,bcd |
            | a    | d  | ab,bcd,bcd |
            | a    | e  | axye,axye  |
            | e    | d  | de,de      |
-            | e    | c  | de,bcd     |
+            | e    | c  | de,bcd,bcd |
            | e    | b  | de,bcd,bcd |
            | e    | a  | axye,axye  |

    Scenario: Car - 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      |
@@ -51,21 +47,19 @@ Feature: Car - Destination only, no passing through
        When I route I should get
            | from | to | route       |
            | a    | b  | ab,ab       |
-            | a    | c  | ab,bc       |
-            | a    | d  | ab,cd       |
+            | a    | c  | ab,bc,bc    |
+            | a    | d  | ab,bc,cd,cd |
            | a    | e  | axye,axye   |
            | e    | d  | de,de       |
-            | e    | c  | de,cd       |
-            | e    | b  | de,bc       |
+            | e    | c  | de,cd,cd    |
+            | e    | b  | de,cd,bc,bc |
            | e    | a  | axye,axye   |

    Scenario: Car - 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      |
@@ -81,53 +75,3 @@ Feature: Car - Destination only, no passing through
            | e    | a  | de,cd,bc,ab,ab |
            | b    | d  | bc,cd,cd       |
            | d    | b  | cd,bc,bc       |
-
-    Scenario: Car - Routing around a way that becomes destination only
-        Given the node map
-            """
-            b
-             \
-              |
-              e++d++++++c--i
-              |             \
-               \             h--a
-                \            |
-                 \___________g
-            """
-
-        And the ways
-            | nodes | access      | oneway |
-            | ah    |             | no     |
-            | ihg   |             | no     |
-            | eg    |             | no     |
-            | icde  |             | no     |
-            | cde   | destination | no     |
-            | eb    |             | no     |
-
-        When I route I should get
-            | from | to | route           | # |
-            | i    | b  | ihg,eg,eb,eb    | # goes around access=destination, though restricted way starts at two node intersection |
-            | b    | d  | eb,cde,cde      | # ends in restricted way correctly     |
-            | b    | i  | eb,eg,ihg,ihg   | # goes around restricted way correctly |
-
-    Scenario: Car - Routing around a way that becomes destination only
-        Given the node map
-            """
-               a---c---b
-                   +    \
-                   +    |
-                   d    |
-                    \___e
-            """
-
-        And the ways
-            | nodes | access      | oneway |
-            | acbe  |             | no     |
-            | cd    | destination | no     |
-            | de    |             | no     |
-
-        When I route I should get
-            | from | to | route         |
-            | e    | a  | acbe,acbe     |
-            | d    | a  | de,acbe,acbe  |
-            | c    | d  | cd,cd         |
@@ -6,11 +6,9 @@ Feature: Car - Handle ferry routes

    Scenario: Car - 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 | route | bicycle |
@@ -29,35 +27,11 @@ Feature: Car - Handle ferry routes
            | c    | f  | cde,efg,efg     | ferry,driving,driving         |
            | c    | g  | cde,efg,efg     | ferry,driving,driving         |

-
-    Scenario: Car - Use default speeds to calculate duration if no duration given
-        Given the node map
-            """
-            a b c
-                d
-                e f g
-            """
-
-        And the ways
-            | nodes | highway | route |
-            | abc   | primary |       |
-            | cde   |         | ferry |
-            | efg   | primary |       |
-
-        When I route I should get
-            | from | to | route           | modes                         | speed   | time    |
-            | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving | 12 km/h | 173.4s  |
-            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 9 km/h  | 162.4s  |
-            | c    | e  | cde,cde         | ferry,ferry                   | 5 km/h  | 151.4s  |
-            | e    | c  | cde,cde         | ferry,ferry                   | 5 km/h  | 151.4s  |
-
    Scenario: Car - Properly handle simple durations
        Given the node map
-            """
-            a b c
-                d
-                e f g
-            """
+            | a | b | c |   |   |
+            |   |   | d |   |   |
+            |   |   | e | f | g |

        And the ways
            | nodes | highway | route | duration |
@@ -66,19 +40,17 @@ Feature: Car - Handle ferry routes
            | efg   | primary |       |          |

        When I route I should get
-            | from | to | route           | modes                         | speed   | time  |
-            | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving | 24 km/h | 89.4s |
-            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 18 km/h | 78.4s |
-            | c    | e  | cde,cde         | ferry,ferry                   | 11 km/h | 67.4s |
-            | e    | c  | cde,cde         | ferry,ferry                   | 11 km/h | 67.4s |
+            | from | to | route           | modes                         | speed   |
+            | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving | 25 km/h |
+            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 20 km/h |
+            | c    | e  | cde,cde         | ferry,ferry                   | 12 km/h |
+            | e    | c  | cde,cde         | ferry,ferry                   | 12 km/h |

    Scenario: Car - Properly handle ISO 8601 durations
        Given the node map
-            """
-            a b c
-                d
-                e f g
-            """
+            | a | b | c |   |   |
+            |   |   | d |   |   |
+            |   |   | e | f | g |

        And the ways
            | nodes | highway | route | duration |
@@ -87,25 +59,8 @@ Feature: Car - Handle ferry routes
            | efg   | primary |       |          |

        When I route I should get
-            | from | to | route           | modes                         | speed   | time  |
-            | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving | 24 km/h | 89.4s |
-            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 18 km/h | 78.4s |
-            | c    | e  | cde,cde         | ferry,ferry                   | 11 km/h | 67.4s |
-            | e    | c  | cde,cde         | ferry,ferry                   | 11 km/h | 67.4s |
-
-	@snapping
-    Scenario: Car - Snapping when using a ferry
-        Given the node map
-            """
-            a b   c d   e f
-            """
-
-        And the ways
-            | nodes | highway | route | duration |
-            | ab    | primary |       |          |
-            | bcde  |         | ferry | 0:10     |
-            | ef    | primary |       |          |
-
-        When I route I should get
-            | from | to | route     | modes       | time  |
-            | c    | d  | bcde,bcde | ferry,ferry | 600s  |
+            | from | to | route           | modes                         | speed   |
+            | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving | 25 km/h |
+            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 20 km/h |
+            | c    | e  | cde,cde         | ferry,ferry                   | 12 km/h |
+            | e    | c  | cde,cde         | ferry,ferry                   | 12 km/h |
@@ -1,36 +0,0 @@
-@routing @car @hov
-Feature: Car - Handle driving
-
-    Background:
-        Given the profile "car"
-        And a grid size of 100 meters
-
-    Scenario: Car - Avoid hov when not on hov
-        Given the node map
-            """
-               b=========c========================e====j
-             ~            ~                         ~
-            a              ~                         f----m
-            |               i                        |
-            |               |        ----------------l
-            |               |       /
-            g_______________h______k_____n
-            """
-
-        And the ways
-            | nodes | highway       | hov           |
-            | ab    | motorway_link |               |
-            | bcej  | motorway      | designated    |
-            | ag    | primary       |               |
-            | ghkn  | primary       |               |
-            | ih    | primary       |               |
-            | kl    | secondary     |               |
-            | lf    | secondary     |               |
-            | ci    | motorway_link |               |
-            | ef    | motorway_link |               |
-            | fm    | secondary     |               |
-
-        When I route I should get
-            | from | to | route                |
-            | a    | m  | ag,ghkn,kl,lf,fm,fm  |
-            | c    | m  | bcej,ef,fm,fm        |
@@ -9,10 +9,8 @@ Feature: Car - Speed on links

    Scenario: Car - Use motorway_link when reasonable
        Given the node map
-            """
-                e       f
-            x a b       c d y
-            """
+            |   |   | e |   |   |   | f |   |   |
+            | x | a | b |   |   |   | c | d | y |

        And the ways
            | nodes | highway       |
@@ -32,10 +30,8 @@ Feature: Car - Speed on links

    Scenario: Car - Use trunk_link when reasonable
        Given the node map
-            """
-                e       f
-            x a b       c d y
-            """
+            |   |   | e |   |   |   | f |   |   |
+            | x | a | b |   |   |   | c | d | y |

        And the ways
            | nodes | highway      |
@@ -54,10 +50,8 @@ Feature: Car - Speed on links

    Scenario: Car - Use primary_link when reasonable
        Given the node map
-            """
-                e       f
-            x a b       c d y
-            """
+            |   |   | e |   |   |   | f |   |   |
+            | x | a | b |   |   |   | c | d | y |

        And the ways
            | nodes | highway        |
@@ -76,10 +70,8 @@ Feature: Car - Speed on links

    Scenario: Car - Use secondary_link when reasonable
        Given the node map
-            """
-                e       f
-            x a b       c d y
-            """
+            |   |   | e |   |   |   | f |   |   |
+            | x | a | b |   |   |   | c | d | y |

        And the ways
            | nodes | highway          |
@@ -99,10 +91,8 @@ Feature: Car - Speed on links

    Scenario: Car - Use tertiary_link when reasonable
        Given the node map
-            """
-                e       f
-            x a b       c d y
-            """
+            |   |   | e |   |   |   | f |   |   |
+            | x | a | b |   |   |   | c | d | y |

        And the ways
            | nodes | highway         |
@@ -6,11 +6,9 @@ OSRM will use 4/5 of the projected free-flow speed.
        Given the profile "car"
        Given a grid size of 1000 meters

-    Scenario: Car - Respect maxspeeds when lower than way type speed
+    Scenario: Car - Respect maxspeeds when lower that way type speed
        Given the node map
-            """
-            a b c d e f g
-            """
+            | a | b | c | d | e | f | g |

        And the ways
            | nodes | highway | maxspeed    |
@@ -22,48 +20,42 @@ OSRM will use 4/5 of the projected free-flow speed.
            | fg    | trunk   | CH:motorway |

        When I route I should get
-            | from | to | route | speed   |
-            | a    | b  | ab,ab | 85 km/h |
-            | b    | c  | bc,bc | 48 km/h |
-            | c    | d  | cd,cd | 40 km/h |
-            | d    | e  | de,de | 64 km/h |
-            | e    | f  | ef,ef | 80 km/h |
-            | f    | g  | fg,fg | 96 km/h |
+            | from | to | route | speed         |
+            | a    | b  | ab,ab |  79 km/h      |
+            | b    | c  | bc,bc |  59 km/h +- 1 |
+            | c    | d  | cd,cd |  51 km/h      |
+            | d    | e  | de,de |  75 km/h      |
+            | e    | f  | ef,ef |  91 km/h      |
+            | f    | g  | fg,fg | 107 km/h      |

    Scenario: Car - Do not ignore maxspeed when higher than way speed
        Given the node map
-            """
-            a b c d
-            """
+            | a | b | c | d |

        And the ways
-            | nodes | highway       | maxspeed | # |
-            | ab    | residential   |          | default residential speed is 25 |
-            | bc    | residential   | 90       |   |
-            | cd    | living_street | FR:urban |   |
+            | nodes | highway       | maxspeed |
+            | ab    | residential   |          |
+            | bc    | residential   | 90       |
+            | cd    | living_street | FR:urban |

        When I route I should get
-            | from | to | route | speed   |
-            | a    | b  | ab,ab | 25 km/h |
-                                            # default residential speed is 25, don't mess with this
-            | b    | c  | bc,bc | 72 km/h |
-                                            # parsed maxspeeds are scaled by profile's speed_reduction value
-            | c    | d  | cd,cd | 40 km/h |
-                                            # symbolic posted speeds without explicit exceptions are parsed
-                                            # from the profile's maxspeed_table_default table
+            | from | to | route | speed        |
+            | a    | b  | ab,ab | 31 km/h      |
+            | b    | c  | bc,bc | 83 km/h +- 1 |
+            | c    | d  | cd,cd | 51 km/h      |

-    Scenario: Car - Forward/backward maxspeed are scaled by profile's speed_reduction if explicitly set
+    Scenario: Car - Forward/backward maxspeed
        Given a grid size of 100 meters

        Then routability should be
            | highway | maxspeed | maxspeed:forward | maxspeed:backward | forw    | backw   |
            | primary |          |                  |                   | 65 km/h | 65 km/h |
-            | primary | 60       |                  |                   | 48 km/h | 48 km/h |
-            | primary |          | 60               |                   | 48 km/h | 65 km/h |
-            | primary |          |                  | 60                | 65 km/h | 48 km/h |
-            | primary | 15       | 60               |                   | 48 km/h | 12 km/h |
-            | primary | 15       |                  | 60                | 12 km/h | 48 km/h |
-            | primary | 15       | 30               | 60                | 24 km/h | 48 km/h |
+            | primary | 60       |                  |                   | 60 km/h | 60 km/h |
+            | primary |          | 60               |                   | 60 km/h | 65 km/h |
+            | primary |          |                  | 60                | 65 km/h | 60 km/h |
+            | primary | 15       | 60               |                   | 60 km/h | 23 km/h |
+            | primary | 15       |                  | 60                | 23 km/h | 60 km/h |
+            | primary | 15       | 30               | 60                | 34 km/h | 60 km/h |

    Scenario: Car - Maxspeed should not allow routing on unroutable ways
        Then routability should be
@@ -85,55 +77,45 @@ OSRM will use 4/5 of the projected free-flow speed.
    Scenario: Car - Too narrow streets should be ignored or incur a penalty
        Then routability should be

-            | highway | maxspeed | width | maxspeed:forward | maxspeed:backward | forw    | backw   | forw_rate | backw_rate |
-            | primary |          |       |                  |                   | 64 km/h | 64 km/h | 18        | 18         |
-            | primary |          |   3   |                  |                   | 64 km/h | 64 km/h | 9         | 9          |
-            | primary | 60       |       |                  |                   | 47 km/h | 47 km/h | 13.3      | 13.3       |
-            | primary | 60       |   3   |                  |                   | 47 km/h | 47 km/h | 6.7       | 6.7        |
-            | primary |          |       | 60               |                   | 47 km/h | 64 km/h | 13.3      | 18         |
-            | primary |          |   3   | 60               |                   | 47 km/h | 64 km/h | 6.7       | 9          |
-            | primary |          |       |                  | 60                | 64 km/h | 47 km/h | 18        | 13.3       |
-            | primary |          |   3   |                  | 60                | 64 km/h | 47 km/h | 9         | 6.7        |
-            | primary | 15       |       | 60               |                   | 47 km/h | 11 km/h | 13.3      | 3.3        |
-            | primary | 15       |   3   | 60               |                   | 48 km/h | 12 km/h | 6.7       | 1.7        |
-            | primary | 15       |       |                  | 60                | 12 km/h | 47 km/h | 3.3       | 13.3       |
-            | primary | 15       |   3   |                  | 60                | 12 km/h | 47 km/h | 1.7       | 6.7        |
-            | primary | 15       |       | 30               | 60                | 23 km/h | 47 km/h | 6.7       | 13.3       |
-            | primary | 15       |   3   | 30               | 60                | 23 km/h | 47 km/h | 3.3       | 6.7        |
+            | highway | maxspeed | width | maxspeed:forward | maxspeed:backward | forw    | backw   |
+            | primary |          |       |                  |                   | 63 km/h | 63 km/h |
+            | primary |          |   3   |                  |                   | 32 km/h | 32 km/h |
+            | primary | 60       |       |                  |                   | 59 km/h | 59 km/h |
+            | primary | 60       |   3   |                  |                   | 30 km/h | 30 km/h |
+            | primary |          |       | 60               |                   | 59 km/h | 63 km/h |
+            | primary |          |   3   | 60               |                   | 30 km/h | 32 km/h |
+            | primary |          |       |                  | 60                | 63 km/h | 59 km/h |
+            | primary |          |   3   |                  | 60                | 32 km/h | 30 km/h |
+            | primary | 15       |       | 60               |                   | 59 km/h | 23 km/h |
+            | primary | 15       |   3   | 60               |                   | 30 km/h |  7 km/h |
+            | primary | 15       |       |                  | 60                | 23 km/h | 59 km/h |
+            | primary | 15       |   3   |                  | 60                |  7 km/h | 30 km/h |
+            | primary | 15       |       | 30               | 60                | 34 km/h | 59 km/h |
+            | primary | 15       |   3   | 30               | 60                | 15 km/h | 30 km/h |

    Scenario: Car - Single lane streets be ignored or incur a penalty
        Then routability should be

-            | highway | maxspeed | lanes | maxspeed:forward | maxspeed:backward | forw    | backw   | forw_rate | backw_rate |
-            | primary |          |       |                  |                   | 64 km/h | 64 km/h | 18        | 18         |
-            | primary |          |   1   |                  |                   | 64 km/h | 64 km/h | 9         | 9          |
-            | primary | 60       |       |                  |                   | 47 km/h | 47 km/h | 13.3      | 13.3       |
-            | primary | 60       |   1   |                  |                   | 47 km/h | 47 km/h | 6.7       | 6.7        |
-            | primary |          |       | 60               |                   | 47 km/h | 64 km/h | 13.3      | 18         |
-            | primary |          |   1   | 60               |                   | 47 km/h | 64 km/h | 6.7       | 9          |
-            | primary |          |       |                  | 60                | 64 km/h | 47 km/h | 18        | 13.3       |
-            | primary |          |   1   |                  | 60                | 64 km/h | 47 km/h | 9         | 6.7        |
-            | primary | 15       |       | 60               |                   | 47 km/h | 11 km/h | 13.3      | 3.3        |
-            | primary | 15       |   1   | 60               |                   | 48 km/h | 12 km/h | 6.7       | 1.7        |
-            | primary | 15       |       |                  | 60                | 12 km/h | 47 km/h | 3.3       | 13.3       |
-            | primary | 15       |   1   |                  | 60                | 12 km/h | 47 km/h | 1.7       | 6.7        |
-            | primary | 15       |       | 30               | 60                | 23 km/h | 47 km/h | 6.7       | 13.3       |
-            | primary | 15       |   1   | 30               | 60                | 23 km/h | 47 km/h | 3.3       | 6.7        |
+            | highway | maxspeed | lanes | maxspeed:forward | maxspeed:backward | forw    | backw   |
+            | primary |          |       |                  |                   | 63 km/h | 63 km/h |
+            | primary |          |   1   |                  |                   | 32 km/h | 32 km/h |
+            | primary | 60       |       |                  |                   | 59 km/h | 59 km/h |
+            | primary | 60       |   1   |                  |                   | 30 km/h | 30 km/h |
+            | primary |          |       | 60               |                   | 59 km/h | 63 km/h |
+            | primary |          |   1   | 60               |                   | 30 km/h | 32 km/h |
+            | primary |          |       |                  | 60                | 63 km/h | 59 km/h |
+            | primary |          |   1   |                  | 60                | 32 km/h | 30 km/h |
+            | primary | 15       |       | 60               |                   | 59 km/h | 23 km/h |
+            | primary | 15       |   1   | 60               |                   | 30 km/h |  7 km/h |
+            | primary | 15       |       |                  | 60                | 23 km/h | 59 km/h |
+            | primary | 15       |   1   |                  | 60                |  7 km/h | 30 km/h |
+            | primary | 15       |       | 30               | 60                | 34 km/h | 59 km/h |
+            | primary | 15       |   1   | 30               | 60                | 15 km/h | 30 km/h |

-    Scenario: Car - Single lane streets only incur a penalty for two-way streets
+    Scenario: Car - Single lane streets only incure a penalty for two-way streets
        Then routability should be
-            | highway | maxspeed | lanes  | oneway | forw    | backw   | forw_rate | backw_rate |
-            | primary |   30     |   1    | yes    | 23 km/h |         | 6.7       |            |
-            | primary |   30     |   1    | -1     |         | 23 km/h |           | 6.7        |
-            | primary |   30     |   1    |        | 23 km/h | 23 km/h | 3.3       | 3.3        |
-            | primary |   30     |   2    |        | 23 km/h | 23 km/h | 6.7       | 6.7        |
-
-    Scenario: Car - Forward/backward maxspeed on reverse oneways
-        Then routability should be
-            | highway | maxspeed | maxspeed:forward | maxspeed:backward | oneway | forw    | backw   | forw_rate | backw_rate |
-            | primary |          |                  |                   | -1     |         | 64 km/h |           | 18         |
-            | primary | 30       |                  |                   | -1     |         | 23 km/h |           | 6.7        |
-            | primary |          | 30               |                   | -1     |         | 64 km/h |           | 18         |
-            | primary |          |                  | 30                | -1     |         | 23 km/h |           | 6.7        |
-            | primary | 20       | 30               |                   | -1     |         | 15 km/h |           | 4.4        |
-            | primary | 20       |                  | 30                | -1     |         | 23 km/h |           | 6.7        |
+            | highway | maxspeed | lanes  | oneway | forw    | backw   |
+            | primary |   30     |   1    | yes    | 34 km/h |         |
+            | primary |   30     |   1    | -1     |         | 34 km/h |
+            | primary |   30     |   1    |        | 15 km/h | 15 km/h |
+            | primary |   30     |   2    |        | 34 km/h | 34 km/h |
@@ -0,0 +1,40 @@
+@routing @car @mode
+Feature: Car - Mode flag
+    Background:
+        Given the profile "car"
+
+    Scenario: Car - Mode when using a ferry
+        Given the node map
+            | a | b |   |
+            |   | c | d |
+
+        And the ways
+            | nodes | highway | route | duration |
+            | ab    | primary |       |          |
+            | bc    |         | ferry | 0:01     |
+            | cd    | primary |       |          |
+
+        When I route I should get
+            | from | to | route       | modes                         |
+            | a    | d  | ab,bc,cd,cd | driving,ferry,driving,driving |
+            | d    | a  | cd,bc,ab,ab | driving,ferry,driving,driving |
+            | c    | a  | bc,ab,ab    | ferry,driving,driving         |
+            | d    | b  | cd,bc,bc    | driving,ferry,ferry           |
+            | a    | c  | ab,bc,bc    | driving,ferry,ferry           |
+            | b    | d  | bc,cd,cd    | ferry,driving,driving         |
+
+    Scenario: Car - Snapping when using a ferry
+        Given the node map
+            | a | b |   | c | d |   | e | f |
+
+        And the ways
+            | nodes | highway | route | duration |
+            | ab    | primary |       |          |
+            | bcde  |         | ferry | 0:10     |
+            | ef    | primary |       |          |
+
+        When I route I should get
+            | from | to | route     | modes       | time  |
+            | c    | d  | bcde,bcde | ferry,ferry | 600s  |
+
+
@@ -3,52 +3,42 @@ Feature: Car - Street names in instructions

    Background:
        Given the profile "car"
-        Given a grid size of 5 meters
+
+    Scenario: Car - A named street
+        Given the node map
+            | a | b |
+            |   | c |
+
+        And the ways
+            | nodes | name     | ref |
+            | ab    | My Way   |     |
+            | bc    | Your Way | A1  |
+
+        When I route I should get
+            | from | to | route                              |
+            | a    | c  | My Way,Your Way (A1),Your Way (A1) |

    Scenario: Car - A named street with pronunciation
        Given the node map
-            """
-            a b d
-              1
-              c
-            """
+            | a | b | d |
+            |   | 1 |   |
+            |   | c |   |

        And the ways
-            | nodes | name     |name:pronunciation  | ref |
+            | nodes | name     |name:pronunciation | ref |
            | ab    | My Way   |                    |     |
            | bd    | My Way   | meyeway            | A1  |
            | cd    | Your Way | yourewaye          |     |

        When I route I should get
-            | from | to | route             | pronunciations      | ref |
-            | a    | d  | My Way,My Way     | ,meyeway            | ,A1 |
-            | 1    | c  | Your Way,Your Way | yourewaye,yourewaye | ,   |
-
-    # See #2860
-    Scenario: Car - same street name but different pronunciation
-        Given the node map
-            """
-            a b c
-              d
-              e
-            """
-
-        And the ways
-            | nodes | name       | name:pronunciation |
-            | abc   | Houston St | hew-stun           |
-            | bde   | Houston St | how-stun           |
-
-        When I route I should get
-            | from | to | route                            | pronunciations             |
-            | a    | c  | Houston St,Houston St            | hew-stun,hew-stun          |
-            | a    | e  | Houston St,Houston St,Houston St | hew-stun,how-stun,how-stun |
+            | from | to | route              | pronunciations      |
+            | a    | d  | My Way,My Way (A1) | ,meyeway             |
+            | 1    | c  | Your Way,Your Way  | yourewaye,yourewaye  |

    @todo
    Scenario: Car - 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 |
@@ -58,33 +48,3 @@ Feature: Car - Street names in instructions
        When I route I should get
            | from | to | route                            |
            | a    | c  | tertiary,residential,residential |
-
-    Scenario: Inner city expressway with on road
-        Given the node map
-            """
-            a b . . . c g
-                   `f .
-                     `
-                      .
-                      .
-                      d
-                      .
-                      .
-                      .
-                      e
-            """
-
-        And the ways
-            | nodes | highway      | name     | name:pronunciation | oneway |
-            | abc   | primary      | road     | roooaad            |        |
-            | cg    | primary      | road     | roooaad            |        |
-            | bfd   | trunk_link   | sliproad |                    | yes    |
-            | cde   | trunk        | trunk    | truank             | yes    |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction   |
-            | restriction | abc      | cde    | c        | no_right_turn |
-
-       When I route I should get
-            | waypoints | route                | turns                    | pronunciations        |
-            | a,e       | road,trunk,trunk     | depart,turn right,arrive | roooaad,truank,truank |
@@ -15,22 +15,6 @@ Feature: Car - Oneway streets
            | highway | oneway | forw | backw |
            | primary | -1     |      | x     |

-    Scenario: Car - Mode specific oneway
-        Then routability should be
-            | highway | oneway:motorcar | oneway:motor_vehicle | oneway:vehicle | oneway | forw | backw |
-            | primary |                 |                      |                |        | x    | x     |
-            | primary | yes             |                      |                |        | x    |       |
-            | primary |                 | yes                  |                |        | x    |       |
-            | primary |                 |                      | yes            |        | x    |       |
-            | primary |                 |                      |                | yes    | x    |       |
-            | primary | yes             | no                   |                |        | x    |       |
-            | primary |                 | yes                  | no             |        | x    |       |
-            | primary |                 |                      | yes            | no     | x    |       |
-            | primary |                 |                      |                | yes    | x    |       |
-            | primary | no              | yes                  |                |        | x    | x     |
-            | primary |                 | no                   | yes            |        | x    | x     |
-            | primary |                 |                      | no             | yes    | x    | x     |
-
    Scenario: Car - Implied oneways
        Then routability should be
            | highway         | junction   | forw | backw | #                     |
@@ -51,10 +35,8 @@ Feature: Car - Oneway streets

    Scenario: Car - Around the Block
        Given the node map
-            """
-              a b
-            f d c e
-            """
+            | a | b |
+            | d | c |

        And the ways
            | nodes | oneway |
@@ -62,8 +44,6 @@ Feature: Car - Oneway streets
            | bc    |        |
            | cd    |        |
            | da    |        |
-            | ce    |        |
-            | df    |        |

        When I route I should get
            | from | to | route       |
@@ -88,9 +68,7 @@ Feature: Car - Oneway streets

    Scenario: Car - Two consecutive oneways
        Given the node map
-            """
-            a b   c
-            """
+            | a | b |   | c |

        And the ways
            | nodes | oneway |
@@ -101,12 +79,3 @@ Feature: Car - Oneway streets
        When I route I should get
            | from | to | route    |
            | a    | c  | ab,bc,bc |
-
-
-    # Reversible oneways (low frequency) vs alternating oneways (high frequency).
-    # See: https://github.com/Project-OSRM/osrm-backend/issues/2837
-    Scenario: Car - Route over alternating but not reversible oneways
-        Then routability should be
-            | highway | oneway      | forw | backw |
-            | primary | reversible  |      |       |
-            | primary | alternating | x    | x     |
@@ -10,11 +10,9 @@ Feature: Car - Turn restrictions
    @no_turning
    Scenario: Car - No left turn
        Given the node map
-            """
-              n
-            w j e
-              s
-            """
+            |   | n |   |
+            | w | j | e |
+            |   | s |   |

        And the ways
            | nodes | oneway |
@@ -36,11 +34,9 @@ Feature: Car - Turn restrictions
    @no_turning
    Scenario: Car - No straight on
        Given the node map
-            """
-            a b j d e
-            v       z
-              w x y
-            """
+            | a | b | j | d | e |
+            | v |   |   |   | z |
+            |   | w | x | y |   |

        And the ways
            | nodes | oneway |
@@ -66,11 +62,9 @@ Feature: Car - Turn restrictions
    @no_turning
    Scenario: Car - No right turn
        Given the node map
-            """
-              n
-            w j e
-              s
-            """
+            |   | n |   |
+            | w | j | e |
+            |   | s |   |

        And the ways
            | nodes | oneway |
@@ -92,11 +86,9 @@ Feature: Car - Turn restrictions
    @no_turning
    Scenario: Car - No u-turn
        Given the node map
-            """
-              n
-            w j e
-              s
-            """
+            |   | n |   |
+            | w | j | e |
+            |   | s |   |

        And the ways
            | nodes | oneway |
@@ -118,11 +110,9 @@ Feature: Car - Turn restrictions
    @no_turning
    Scenario: Car - Handle any no_* relation
        Given the node map
-            """
-              n
-            w j e
-              s
-            """
+            |   | n |   |
+            | w | j | e |
+            |   | s |   |

        And the ways
            | nodes | oneway |
@@ -144,11 +134,9 @@ Feature: Car - Turn restrictions
    @only_turning
    Scenario: Car - Only left turn
        Given the node map
-            """
-              n
-            w j e
-              s
-            """
+            |   | n |   |
+            | w | j | e |
+            |   | s |   |

        And the ways
            | nodes | oneway |
@@ -161,38 +149,18 @@ Feature: Car - Turn restrictions
            | type        | way:from | way:to | node:via | restriction    |
            | restriction | sj       | wj     | j        | only_left_turn |

-    Scenario: Car - Only right turn, invalid
-        Given the node map
-            """
-              n
-            w j e r
-              s
-            """
-
-        And the ways
-            | nodes | oneway |
-            | sj    | yes    |
-            | nj    | -1     |
-            | wj    | -1     |
-            | ej    | -1     |
-            | re    | -1     |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction   |
-            | restriction | sj       | er     | j        | only_right_on |
-
        When I route I should get
-            | from | to | route       |
-            | s    | r  | sj,ej,re,re |
+            | from | to | route    |
+            | s    | w  | sj,wj,wj |
+            | s    | n  |          |
+            | s    | e  |          |

    @only_turning
    Scenario: Car - Only right turn
        Given the node map
-            """
-              n
-            w j e
-              s
-            """
+            |   | n |   |
+            | w | j | e |
+            |   | s |   |

        And the ways
            | nodes | oneway |
@@ -214,11 +182,9 @@ Feature: Car - Turn restrictions
    @only_turning
    Scenario: Car - Only straight on
        Given the node map
-            """
-              n
-            w j e
-              s
-            """
+            |   | n |   |
+            | w | j | e |
+            |   | s |   |

        And the ways
            | nodes | oneway |
@@ -240,11 +206,9 @@ Feature: Car - Turn restrictions
    @no_turning
    Scenario: Car - Handle any only_* restriction
        Given the node map
-            """
-              n
-            w j e
-              s
-            """
+            |   | n |   |
+            | w | j | e |
+            |   | s |   |

        And the ways
            | nodes | oneway |
@@ -266,11 +230,9 @@ Feature: Car - Turn restrictions
    @specific
    Scenario: Car - :hgv-qualified on a standard turn restriction
        Given the node map
-            """
-              n
-            w j e
-              s
-            """
+            |   | n |   |
+            | w | j | e |
+            |   | s |   |

        And the ways
            | nodes | oneway |
@@ -292,11 +254,9 @@ Feature: Car - Turn restrictions
    @specific
    Scenario: Car - :motorcar-qualified on a standard turn restriction
        Given the node map
-            """
-              n
-            w j e
-              s
-            """
+            |   | n |   |
+            | w | j | e |
+            |   | s |   |

        And the ways
            | nodes | oneway |
@@ -318,11 +278,9 @@ Feature: Car - Turn restrictions
    @except
    Scenario: Car - 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 |
@@ -350,11 +308,9 @@ Feature: Car - Turn restrictions
    @except
    Scenario: Car - Except tag and on only_ restrictions
        Given the node map
-            """
-            a   b
-              j
-              s
-            """
+            | a |   | b |
+            |   | j |   |
+            |   | s |   |

        And the ways
            | nodes | oneway |
@@ -374,12 +330,10 @@ Feature: Car - Turn restrictions
    @except
    Scenario: Car - Several only_ restrictions at the same segment
        Given the node map
-            """
-                    y
-            i j f b x a e g h
-
-                  c   d
-            """
+            |   |   |   |   | y |   |   |   |   |
+            | i | j | f | b | x | a | e | g | h |
+            |   |   |   |   |   |   |   |   |   |
+            |   |   |   | c |   | d |   |   |   |

        And the ways
            | nodes | oneway |
@@ -411,15 +365,13 @@ Feature: Car - Turn restrictions
    @except
    Scenario: Car - two only_ restrictions share same to-way
        Given the node map
-            """
-                e       f
-                    a
-
-                c   x   d
-                    y
-
-                    b
-            """
+            |   |   | e |   |   |   | f |   |   |
+            |   |   |   |   | a |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |
+            |   |   | c |   | x |   | d |   |   |
+            |   |   |   |   | y |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |
+            |   |   |   |   | b |   |   |   |   |

        And the ways
            | nodes | oneway |
@@ -447,15 +399,13 @@ Feature: Car - Turn restrictions
    @except
    Scenario: Car - two only_ restrictions share same from-way
        Given the node map
-            """
-                e       f
-                    a
-
-                c   x   d
-                    y
-
-                    b
-            """
+            |   |   | e |   |   |   | f |   |   |
+            |   |   |   |   | a |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |
+            |   |   | c |   | x |   | d |   |   |
+            |   |   |   |   | y |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |
+            |   |   |   |   | b |   |   |   |   |

        And the ways
            | nodes | oneway |
@@ -480,551 +430,3 @@ Feature: Car - Turn restrictions
            | a    | b  | ax,xy,yb,yb |
            | b    | a  | yb,xy,ax,ax |

-    @specific
-    Scenario: Car - Ignore unrecognized restriction
-        Given the node map
-            """
-              n
-            w j e
-              s
-            """
-
-        And the ways
-            | nodes | oneway |
-            | sj    | yes    |
-            | nj    | -1     |
-            | wj    | -1     |
-            | ej    | -1     |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction  |
-            | restriction | sj       | wj     | j        | yield        |
-
-        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
-
-    @restriction @compression
-    Scenario: Restriction On Compressed Geometry
-        Given the node map
-            """
-                        i
-                        |
-                    f - e
-                    |   |
-            a - b - c - d
-                    |
-                    g
-                    |
-                    h
-            """
-
-        And the ways
-            | nodes |
-            | abc   |
-            | cde   |
-            | efc   |
-            | cgh   |
-            | ei    |
-
-        And the relations
-            | type        | way:from | node:via | way:to | restriction   |
-            | restriction | abc      | c        | cgh    | no_right_turn |
-
-        When I route I should get
-            | from | to | route               |
-            | a    | h  | abc,cde,efc,cgh,cgh |
-
-    @restriction-way
-    Scenario: Car - prohibit turn
-        Given the node map
-            """
-            c
-            |
-            |   f
-            |   |
-            b---e
-            |   |
-            a   d
-            """
-
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | be    |
-            | de    |
-            | ef    |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction   |
-            | restriction | ab       | be      | de     | no_right_turn |
-
-        When I route I should get
-            | from | to | route             | turns                                                               | locations   |
-            | a    | d  | ab,be,ef,ef,de,de | depart,turn right,turn left,continue uturn,new name straight,arrive | a,b,e,f,e,d |
-            | a    | f  | ab,be,ef,ef       | depart,turn right,turn left,arrive                                  | a,b,e,f     |
-            | c    | d  | bc,be,de,de       | depart,turn left,turn right,arrive                                  | c,b,e,d     |
-            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |
-
-    @restriction @overlap
-    Scenario: Car - prohibit turn
-        Given the node map
-            """
-            c
-            |
-            |   f
-            |   |
-            b---e
-            |   |
-            |   d
-            |
-            a
-            """
-
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | be    |
-            | de    |
-            | ef    |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction   |
-            | restriction | ab       | be      | de     | no_right_turn |
-            | restriction | bc       | be      | ef     | no_left_turn  |
-
-        When I route I should get
-            | from | to | route             |
-            | a    | d  | ab,be,ef,ef,de,de |
-            | a    | f  | ab,be,ef,ef       |
-            | c    | d  | bc,be,de,de       |
-            | c    | f  | bc,be,de,de,ef,ef |
-
-    @restriction-way @overlap
-    Scenario: Two times same way
-        Given the node map
-            """
-                h   g
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-            a - b - c - - - - - - - - - - - - - - - - - - - f
-                |   | \                                     /
-                i - d - e - - - - - - - - - - - - - - - - -
-            """
-        # The long distances here are required to make other turns undesriable in comparison to the restricted turns.
-        # Otherwise they might just be picked without the actual turns being restricted
-
-        And the ways
-            | nodes | oneway |
-            | ab    | no     |
-            | bc    | no     |
-            | cd    | yes    |
-            | ce    | yes    |
-            | cf    | yes    |
-            | cg    | yes    |
-            | bh    | no     |
-            | fedib | yes    |
-
-       And the relations
-            | type        | way:from | way:via | way:to | restriction   |
-            | restriction | ab       | bc      | ce     | no_right_turn |
-            | restriction | ab       | bc      | cd     | no_right_turn |
-
-       When I route I should get
-            | from | to | route                |
-            | a    | i  | ab,bc,cf,fedib,fedib |
-
-
-    @restriction-way @overlap
-    Scenario: Car - prohibit turn
-        Given the node map
-            """
-            a   j
-            |   |
-            b---i
-            |   |
-            c---h
-            |   |
-            d---g
-            |   |
-            e   f
-            """
-
-        And the ways
-            | nodes | name   | oneway |
-            | ab    | left   | yes    |
-            | bc    | left   | yes    |
-            | cd    | left   | yes    |
-            | de    | left   | yes    |
-            | fg    | right  | yes    |
-            | gh    | right  | yes    |
-            | hi    | right  | yes    |
-            | ij    | right  | yes    |
-            | dg    | first  | no     |
-            | ch    | second | no     |
-            | bi    | third  | no     |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction   |
-            | restriction | ab       | bi      | ij     | no_u_turn     |
-            | restriction | bc       | ch      | hi     | no_u_turn     |
-            | restriction | fg       | dg      | de     | no_u_turn     |
-            | restriction | gh       | ch      | cd     | no_u_turn     |
-
-        When I route I should get
-            | from | to | route                  |
-            | a    | j  | left,first,right,right |
-            | f    | e  | right,third,left,left  |
-
-    @restriction
-    Scenario: Car - allow only turn
-        Given the node map
-            """
-            c
-            |
-            |   f
-            |   |
-            b---e
-            |   |
-            a   d
-            """
-
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | be    |
-            | de    |
-            | ef    |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction  |
-            | restriction | ab       | be      | ef     | only_left_on |
-
-        When I route I should get
-            | from | to | route       | turns | locations |
-            | a    | d  | ab,be,ef,ef,de,de | depart,turn right,turn left,continue uturn,new name straight,arrive | a,b,e,f,e,d |
-            | a    | f  | ab,be,ef,ef       | depart,turn right,turn left,arrive                                  | a,b,e,f     |
-            | c    | d  | bc,be,de,de       | depart,turn left,turn right,arrive                                  | c,b,e,d     |
-            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |
-
-    @restriction
-    Scenario: Car - allow only turn
-        Given the node map
-            """
-            c
-            |
-            |   f
-            |   |
-            b---e
-            |   |
-            a   d
-            """
-
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | be    |
-            | de    |
-            | ef    |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction   |
-            | restriction | ab       | be      | ed     | only_right_on |
-
-        When I route I should get
-            | from | to | route       |
-            | a    | d  | ab,be,de,de |
-
-    @restriction
-    Scenario: Multi Way restriction
-        Given the node map
-            """
-                  k   j
-                  |   |
-            h - - g - f - - e
-                  |   |
-                  |   |
-            a - - b - c - - d
-                  |   |
-                  l   i
-            """
-
-        And the ways
-            | nodes | name  | oneway |
-            | ab    | horiz | yes    |
-            | bc    | horiz | yes    |
-            | cd    | horiz | yes    |
-            | ef    | horiz | yes    |
-            | fg    | horiz | yes    |
-            | gh    | horiz | yes    |
-            | ic    | vert  | yes    |
-            | cf    | vert  | yes    |
-            | fj    | vert  | yes    |
-            | kg    | vert  | yes    |
-            | gb    | vert  | yes    |
-            | bl    | vert  | yes    |
-
-        And the relations
-            | type        | way:from | way:via  | way:to | restriction |
-            | restriction | ab       | bc,cf,fg | gh     | no_u_turn   |
-
-        When I route I should get
-            | from | to | route                  |
-            | a    | h  | horiz,vert,horiz,horiz |
-
-    @restriction
-    Scenario: Multi-Way overlapping single-way
-        Given the node map
-            """
-                    e
-                    |
-            a - b - c - d
-                |
-                f - g
-                |
-                h
-            """
-
-        And the ways
-            | nodes | name |
-            | ab    | abcd |
-            | bc    | abcd |
-            | cd    | abcd |
-            | hf    | hfb  |
-            | fb    | hfb  |
-            | gf    | gf   |
-            | ce    | ce   |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction    |
-            | restriction | ab       | bc      | ce     | only_left_turn |
-            | restriction | gf       | fb,bc   | cd     | only_u_turn    |
-
-        When I route I should get
-            | from | to | route                | turns                                            | locations |
-            | a    | d  | abcd,ce,ce,abcd,abcd | depart,turn left,continue uturn,turn left,arrive | a,c,e,c,d |
-            | a    | e  | abcd,ce,ce           | depart,turn left,arrive                          | a,c,e     |
-            | a    | f  | abcd,hfb,hfb         | depart,turn right,arrive                         | a,b,f     |
-            | g    | e  | gf,hfb,abcd,ce,ce    | depart,turn right,turn right,turn left,arrive    | g,f,b,c,e |
-            | g    | d  | gf,hfb,abcd,abcd     | depart,turn right,turn right,arrive              | g,f,b,d   |
-            | h    | e  | hfb,abcd,ce,ce       | depart,end of road right,turn left,arrive        | h,b,c,e   |
-            | h    | d  | hfb,abcd,abcd        | depart,end of road right,arrive                  | h,b,d     |
-
-
-    @restriction
-    Scenario: Car - prohibit turn, traffic lights
-        Given the node map
-            """
-            c
-            |
-            |   f
-            |   |
-            b---e
-            |   |
-            a   d
-            |   |
-            g   i
-            |   |
-            h   j
-            """
-
-        And the ways
-            | nodes | name |
-            | hgab  | ab   |
-            | bc    | bc   |
-            | be    | be   |
-            | jide  | de   |
-            | ef    | ef   |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction   |
-            | restriction | hgab     | be      | jide   | no_right_turn |
-
-        And the nodes
-            | node | highway         |
-            | g    | traffic_signals |
-            | i    | traffic_signals |
-
-
-        When I route I should get
-            | from | to | route             | turns                                                               | locations   |
-            | a    | d  | ab,be,ef,ef,de,de | depart,turn right,turn left,continue uturn,new name straight,arrive | a,b,e,f,e,d |
-            | a    | f  | ab,be,ef,ef       | depart,turn right,turn left,arrive                                  | a,b,e,f     |
-            | c    | d  | bc,be,de,de       | depart,turn left,turn right,arrive                                  | c,b,e,d     |
-            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |
-
-
-      @restriction @overlap @geometry
-      Scenario: Geometry
-        Given the node map
-            """
-            c
-            |
-            |   f
-            |   |
-            b-g-e
-            |   |
-            |   d
-            |
-            a
-            """
-
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | bge   |
-            | de    |
-            | ef    |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction   |
-            | restriction | ab       | bge     | de     | no_right_turn |
-            | restriction | bc       | bge     | ef     | no_left_turn  |
-
-        When I route I should get
-            | from | to | route              |
-            | a    | d  | ab,bge,ef,ef,de,de |
-            | a    | f  | ab,bge,ef,ef       |
-            | c    | d  | bc,bge,de,de       |
-            | c    | f  | bc,bge,de,de,ef,ef |
-
-      @restriction @overlap @geometry @traffic-signals
-      Scenario: Geometry
-        Given the node map
-            """
-            c
-            |
-            |   f
-            |   |
-            b-g-e
-            |   |
-            |   d
-            |
-            a
-            """
-
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | bge   |
-            | de    |
-            | ef    |
-
-        And the nodes
-            | node | highway         |
-            | g    | traffic_signals |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction   |
-            | restriction | ab       | bge     | de     | no_right_turn |
-            | restriction | bc       | bge     | ef     | no_left_turn  |
-
-        # this case is currently not handling the via-way restrictions and we need support for looking across traffic signals.
-        # It is mainly included to show limitations and to prove that we don't crash hard here
-        When I route I should get
-            | from | to | route              |
-            | a    | d  | ab,bge,ef,ef,de,de |
-            | a    | f  | ab,bge,ef,ef       |
-            | c    | d  | bc,bge,de,de       |
-            | c    | f  | bc,bge,de,de,ef,ef |
-
-      # don't crash hard on invalid restrictions
-      @restriction @invalid
-      Scenario: Geometry
-        Given the node map
-            """
-            c
-            |
-            |   f
-            |   |
-            b---e
-            |   |
-            |   d
-            |
-            a
-            """
-
-        And the ways
-            | nodes | oneway |
-            | ab    |        |
-            | bc    |        |
-            | be    | yes    |
-            | de    |        |
-            | ef    |        |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction   |
-            | restriction | de       | be      | ab     | no_left_turn  |
-
-        When I route I should get
-            | from | to | route       |
-            | a    | f  | ab,be,ef,ef |
-
-
-    @restriction @overlap @geometry
-    Scenario: Duplicated restriction
-        Given the node map
-            """
-            c
-            |
-            |   f
-            |   |
-            b-g-e
-            |   |
-            |   d
-            |
-            a
-            """
-
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | bge   |
-            | de    |
-            | ef    |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction  |
-            | restriction | bge      | ef     | e        | no_left_turn |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction   |
-            | restriction | ab       | bge     | de     | no_right_turn |
-            | restriction | bc       | bge     | ef     | no_left_turn  |
-
-        When I route I should get
-            | from | to | route              |
-            | a    | d  | ab,bc,bc,bge,de,de |
@@ -1,14 +0,0 @@
-@routing @car @surface
-Feature: Car - Surfaces
-
-    Background:
-        Given the profile "car"
-
-    Scenario: Car - Ways tagged service should reduce speed
-        Then routability should be
-            | highway  | service           | forw        | backw        | forw_rate  |
-            | service  | alley             | 15 km/h +-1 | 15 km/h +-1  | 2.1        |
-            | service  | emergency_access  |             |              |            |
-            | service  | driveway          | 15 km/h +-1 | 15 km/h +-1  | 2.1        |
-            | service  | drive-through     | 15 km/h +-1 | 15 km/h +-1  | 2.1        |
-            | service  | parking           | 15 km/h +-1 | 15 km/h +-1  | 2.1        |
@@ -6,11 +6,9 @@ Feature: Car - Handle ferryshuttle train routes

    Scenario: Car - Use a ferry route
        Given the node map
-            """
-            a b c
-                d
-                e f g h
-            """
+            | a | b | c |   |   |   |
+            |   |   | d |   |   |   |
+            |   |   | e | f | g | h |

        And the ways
            | nodes | highway | route         | bicycle |
@@ -1,78 +0,0 @@
-@routing @testbot @sidebias
-Feature: Testbot - side bias
-
-    Scenario: Left-hand bias
-        Given the profile file "car" initialized with
-        """
-        profile.left_hand_driving = true
-        profile.turn_bias = 1/1.075
-        """
-        Given the node map
-            """
-            a   b   c
-
-                d
-            """
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | bd    |
-
-        When I route I should get
-            | from | to | route    | time       |
-            | d    | a  | bd,ab,ab | 24s +-1    |
-            | d    | c  | bd,bc,bc | 27s +-1    |
-
-    Scenario: Right-hand bias
-        Given the profile file "car" initialized with
-        """
-        profile.left_hand_driving = true
-        profile.turn_bias = 1.075
-        """
-        And the node map
-            """
-            a   b   c
-
-                d
-            """
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | bd    |
-
-        When I route I should get
-            | from | to | route    | time       |
-            | d    | a  | bd,ab,ab | 27s +-1    |
-                                            # should be inverse of left hand bias
-            | d    | c  | bd,bc,bc | 24s +-1    |
-
-    Scenario: Roundabout exit counting for left sided driving
-        Given the profile file "testbot" initialized with
-        """
-        profile.left_hand_driving = true
-        profile.turn_bias = 1/1.075
-        """
-        And a grid size of 10 meters
-        And the node map
-            """
-                a
-                b
-            h g   c d
-                e
-                f
-            """
-        And the ways
-            | nodes  | junction   |
-            | ab     |            |
-            | cd     |            |
-            | ef     |            |
-            | gh     |            |
-            | bcegb  | roundabout |
-
-        When I route I should get
-           | waypoints | route    | turns                                         |
-           | a,d       | ab,cd,cd | depart,roundabout turn left exit-1,arrive     |
-           | a,f       | ab,ef,ef | depart,roundabout turn straight exit-2,arrive |
-           | a,h       | ab,gh,gh | depart,roundabout turn right exit-3,arrive    |
@@ -5,49 +5,20 @@ Feature: Car - speeds
        Given the profile "car"
        And a grid size of 1000 meters

-    # should more or less match default speeds in car profile, but may be different due to rounding errors
    Scenario: Car - speed of various way types
        Then routability should be
-            | highway        | oneway | bothw   |
-            | motorway       | no     | 89 km/h |
-            | motorway_link  | no     | 44 km/h |
-            | trunk          | no     | 85 km/h |
-            | trunk_link     | no     | 39 km/h |
-            | primary        | no     | 64 km/h |
-            | primary_link   | no     | 29 km/h |
-            | secondary      | no     | 55 km/h |
-            | secondary_link | no     | 24 km/h |
-            | tertiary       | no     | 39 km/h |
-            | tertiary_link  | no     | 20 km/h |
-            | unclassified   | no     | 24 km/h |
-            | residential    | no     | 24 km/h |
-            | living_street  | no     | 9 km/h  |
-            | service        | no     | 15 km/h |
-
-    # Alternating oneways scale rates but not speeds
-    Scenario: Car - scaled speeds for oneway=alternating
-        Then routability should be
-            | highway        | oneway      | junction   | forw    | backw   | #              |
-            | tertiary       |             |            | 39 km/h | 39 km/h |                |
-            | tertiary       | alternating |            | 39 km/h | 39 km/h |                |
-            | motorway       |             |            | 89 km/h |         | implied oneway |
-            | motorway       | alternating |            | 89 km/h |         | implied oneway |
-            | motorway       | reversible  |            |         |         | unroutable     |
-            | primary        |             | roundabout | 64 km/h |         | implied oneway |
-            | primary        | alternating | roundabout | 64 km/h |         | implied oneway |
-            | primary        | reversible  | roundabout |         |         | unroutable     |
-
-    Scenario: Car - Check roundoff errors
-        Then routability should be
-
-            | highway | maxspeed | forw    | backw    |
-            | primary |          | 64 km/h | 64 km/h  |
-            | primary | 60       | 47 km/h | 47 km/h  |
-            | primary | 60       | 47 km/h | 47 km/h  |
-            | primary | 60       | 47 km/h | 47 km/h  |
-
-    Scenario: Car - Side road penalties
-        Then routability should be
-
-            | highway | side_road | forw    | backw    | forw_rate | backw_rate |
-            | primary | yes       | 64 km/h | 64 km/h  | 14.4      | 14.4       |
+            | highway        | oneway | bothw        |
+            | motorway       | no     | 82 km/h      |
+            | motorway_link  | no     | 47 km/h      |
+            | trunk          | no     | 79 km/h +- 1 |
+            | trunk_link     | no     | 43 km/h +- 1 |
+            | primary        | no     | 63 km/h +- 1 |
+            | primary_link   | no     | 34 km/h      |
+            | secondary      | no     | 54 km/h +- 1 |
+            | secondary_link | no     | 31 km/h      |
+            | tertiary       | no     | 43 km/h      |
+            | tertiary_link  | no     | 26 km/h      |
+            | unclassified   | no     | 31 km/h      |
+            | residential    | no     | 31 km/h      |
+            | living_street  | no     | 18 km/h      |
+            | service        | no     | 23 km/h      |
@@ -1,37 +0,0 @@
-@routing @car @startpoint
-Feature: Car - Allowed start/end modes
-
-    Background:
-        Given the profile "car"
-
-    Scenario: Car - 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 | driving,driving |
-            | 2    | 1  | ab,ab | driving,driving |
-
-    Scenario: Car - 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 | driving,driving |
-            | 2    | 1  | ab,ab | driving,driving |
@@ -1,109 +0,0 @@
-@routing @basic @car
-Feature: Basic Routing
-
-    Background:
-        Given the profile "car"
-        Given a grid size of 500 meters
-
-    @smallest @via
-    Scenario: Summaries when routing on a simple network
-        Given the node map
-            """
-            b     f
-
-            c d   g
-
-            a   e
-            """
-
-        And the ways
-            | nodes | name   |
-            | acb   | road   |
-            | de    | 1 st   |
-            | cd    |        |
-            | dg    | blvd   |
-            | df    | street |
-
-        When I route I should get
-            | waypoints | route                               | summary                 |
-            | a,e       | road,,1 st,1 st                     | road, 1 st              |
-            # The via node `d` belongs to `cd`, `de`, `df`, `dg` and depending on the edge
-            # summary can be "road;street", "road, 1 st;1 st, street", "road, blvd;blvd, street"
-            # The test must be fixed by #2287
-            #| a,d,f     | road,,,street,street                | road;street             |
-            | a,e,f     | road,,1 st,1 st,1 st,street,street  | road, 1 st;1 st, street |
-
-     Scenario: Name Empty
-        Given the node map
-            """
-            a   b     c
-            """
-
-        And the ways
-            | nodes | name |
-            | ab    | road |
-            | bc    |      |
-
-        When I route I should get
-            | waypoints | route  | summary |
-            | a,c       | road,  | road    |
-
-     Scenario: Name Empty But Ref
-        Given the node map
-            """
-            a   b     c
-            """
-
-        And the ways
-            | nodes | name | ref |
-            | ab    | road |     |
-            | bc    |      | 101 |
-
-        When I route I should get
-            | waypoints | route  | summary   |
-            | a,c       | road,, | road, 101 |
-
-     Scenario: Only Refs
-        Given the node map
-            """
-            a   b     c
-            """
-
-        And the ways
-            | nodes | name | ref |
-            | ab    |      | 100 |
-            | bc    |      | 101 |
-
-        When I route I should get
-            | waypoints | route  | summary  |
-            | a,c       | ,      | 100, 101 |
-
-     Scenario: Single Ref
-        Given the node map
-            """
-            a   b     c
-            """
-
-        And the ways
-            | nodes | name | ref |
-            | ab    |      |     |
-            | bc    |      | 101 |
-
-        When I route I should get
-            | waypoints | route | summary |
-            | a,c       | ,,    | 101     |
-
-     Scenario: Nothing
-        Given the node map
-            """
-            a   b     c
-            """
-
-        And the ways
-            | nodes | name |
-            | ab    |      |
-            | bc    |      |
-
-        When I route I should get
-            | waypoints | route | summary |
-            | a,c       | ,     |         |
@@ -4,7 +4,7 @@ Feature: Car - Surfaces
    Background:
        Given the profile "car"

-    Scenario: Car - Routability of tracktype tags
+    Scenario: Car - Routeability of tracktype tags
        Then routability should be
            | highway | tracktype | bothw |
            | trunk   | grade1    | x     |
@@ -26,8 +26,8 @@ Feature: Car - Surfaces
            | trunk   | very_horrible | x     |
            | trunk   | impassable    |       |
            | trunk   | nonsense      | x     |
-
-    Scenario: Car - Routability of surface tags
+ 
+    Scenario: Car - Routabiliy of surface tags
        Then routability should be
            | highway | surface  | bothw |
            | trunk   | asphalt  | x     |
@@ -40,13 +40,13 @@ Feature: Car - Surfaces
            | highway  | access       | tracktype | smoothness | surface | forw | backw |
            | motorway |              |           |            |         | x    |       |
            | motorway | no           | grade1    | excellent  | asphalt |      |       |
-            | motorway | private      | grade1    | excellent  | asphalt | x    |       |
+            | motorway | private      | grade1    | excellent  | asphalt |      |       |
            | motorway | agricultural | grade1    | excellent  | asphalt |      |       |
            | motorway | forestry     | grade1    | excellent  | asphalt |      |       |
            | motorway | emergency    | grade1    | excellent  | asphalt |      |       |
            | primary  |              |           |            |         | x    | x     |
-            | primary  | private      | grade1    | excellent  | asphalt | x    | x     |
            | primary  | no           | grade1    | excellent  | asphalt |      |       |
+            | primary  | private      | grade1    | excellent  | asphalt |      |       |
            | primary  | agricultural | grade1    | excellent  | asphalt |      |       |
            | primary  | forestry     | grade1    | excellent  | asphalt |      |       |
            | primary  | emergency    | grade1    | excellent  | asphalt |      |       |
@@ -64,65 +64,64 @@ Feature: Car - Surfaces
    Scenario: Car - Surface should reduce speed
        Then routability should be
            | highway  | oneway | surface         | forw        | backw       |
-            | motorway | no     |                 | 90 km/h     | 90 km/h     |
-            | motorway | no     | asphalt         | 90 km/h     | 90 km/h +-1 |
-            | motorway | no     | concrete        | 90 km/h +-1 | 90 km/h +-1 |
-            | motorway | no     | concrete:plates | 90 km/h +-1 | 90 km/h +-1 |
-            | motorway | no     | concrete:lanes  | 90 km/h +-1 | 90 km/h +-1 |
-            | motorway | no     | paved           | 90 km/h +-1 | 90 km/h +-1 |
-            | motorway | no     | cement          | 80 km/h +-1 | 80 km/h +-1 |
-            | motorway | no     | compacted       | 80 km/h +-1 | 80 km/h +-1 |
-            | motorway | no     | fine_gravel     | 80 km/h +-1 | 80 km/h +-1 |
+            | motorway | no     |                 | 80 km/h +-1 | 80 km/h +-1 |
+            | motorway | no     | asphalt         | 80 km/h +-1 | 80 km/h +-1 |
+            | motorway | no     | concrete        | 80 km/h +-1 | 80 km/h +-1 |
+            | motorway | no     | concrete:plates | 80 km/h +-1 | 80 km/h +-1 |
+            | motorway | no     | concrete:lanes  | 80 km/h +-1 | 80 km/h +-1 |
+            | motorway | no     | paved           | 80 km/h +-1 | 80 km/h +-1 |
+            | motorway | no     | cement          | 72 km/h +-1 | 72 km/h +-1 |
+            | motorway | no     | compacted       | 72 km/h +-1 | 72 km/h +-1 |
+            | motorway | no     | fine_gravel     | 72 km/h +-1 | 72 km/h +-1 |
            | motorway | no     | paving_stones   | 60 km/h +-1 | 60 km/h +-1 |
            | motorway | no     | metal           | 60 km/h +-1 | 60 km/h +-1 |
            | motorway | no     | bricks          | 60 km/h +-1 | 60 km/h +-1 |
-            | motorway | no     | grass           | 40 km/h +-1 | 40 km/h +-1 |
-            | motorway | no     | wood            | 40 km/h +-1 | 40 km/h +-1 |
-            | motorway | no     | sett            | 40 km/h +-1 | 40 km/h +-1 |
-            | motorway | no     | grass_paver     | 40 km/h +-1 | 40 km/h +-1 |
-            | motorway | no     | gravel          | 40 km/h +-1 | 40 km/h +-1 |
-            | motorway | no     | unpaved         | 40 km/h +-1 | 40 km/h +-1 |
-            | motorway | no     | ground          | 40 km/h +-1 | 40 km/h +-1 |
-            | motorway | no     | dirt            | 40 km/h +-1 | 40 km/h +-1 |
-            | motorway | no     | pebblestone     | 40 km/h +-1 | 40 km/h +-1 |
-            | motorway | no     | tartan          | 40 km/h +-1 | 40 km/h +-1 |
-            | motorway | no     | cobblestone     | 30 km/h +-1 | 30 km/h +-1 |
-            | motorway | no     | clay            | 30 km/h +-1 | 30 km/h +-1 |
-            | motorway | no     | earth           | 20 km/h +-1 | 20 km/h +-1 |
-            | motorway | no     | stone           | 20 km/h +-1 | 20 km/h +-1 |
-            | motorway | no     | rocky           | 20 km/h +-1 | 20 km/h +-1 |
-            | motorway | no     | sand            | 20 km/h +-1 | 20 km/h +-1 |
-            | motorway | no     | mud             | 10 km/h +-1 | 10 km/h +-1 |
+            | motorway | no     | grass           | 42 km/h +-1 | 42 km/h +-1 |
+            | motorway | no     | wood            | 42 km/h +-1 | 42 km/h +-1 |
+            | motorway | no     | sett            | 42 km/h +-1 | 42 km/h +-1 |
+            | motorway | no     | grass_paver     | 42 km/h +-1 | 42 km/h +-1 |
+            | motorway | no     | gravel          | 42 km/h +-1 | 42 km/h +-1 |
+            | motorway | no     | unpaved         | 42 km/h +-1 | 42 km/h +-1 |
+            | motorway | no     | ground          | 42 km/h +-1 | 42 km/h +-1 |
+            | motorway | no     | dirt            | 42 km/h +-1 | 42 km/h +-1 |
+            | motorway | no     | pebblestone     | 42 km/h +-1 | 42 km/h +-1 |
+            | motorway | no     | tartan          | 42 km/h +-1 | 42 km/h +-1 |
+            | motorway | no     | cobblestone     | 34 km/h +-1 | 34 km/h +-1 |
+            | motorway | no     | clay            | 34 km/h +-1 | 34 km/h +-1 |
+            | motorway | no     | earth           | 26 km/h +-1 | 26 km/h +-1 |
+            | motorway | no     | stone           | 26 km/h +-1 | 26 km/h +-1 |
+            | motorway | no     | rocky           | 26 km/h +-1 | 26 km/h +-1 |
+            | motorway | no     | sand            | 26 km/h +-1 | 26 km/h +-1 |

    Scenario: Car - Tracktypes should reduce speed
        Then routability should be
            | highway  | oneway | tracktype | forw        | backw       |
-            | motorway | no     |           | 90 km/h     | 90 km/h     |
+            | motorway | no     |           | 80 km/h +-1 | 80 km/h +-1 |
            | motorway | no     | grade1    | 60 km/h +-1 | 60 km/h +-1 |
-            | motorway | no     | grade2    | 40 km/h +-1 | 40 km/h +-1 |
-            | motorway | no     | grade3    | 30 km/h +-1 | 30 km/h +-1 |
-            | motorway | no     | grade4    | 25 km/h +-1 | 25 km/h +-1 |
-            | motorway | no     | grade5    | 20 km/h +-1 | 20 km/h +-1 |
+            | motorway | no     | grade2    | 42 km/h +-1 | 42 km/h +-1 |
+            | motorway | no     | grade3    | 34 km/h +-1 | 34 km/h +-1 |
+            | motorway | no     | grade4    | 31 km/h +-1 | 31 km/h +-1 |
+            | motorway | no     | grade5    | 26 km/h +-1 | 26 km/h +-1 |

    Scenario: Car - Smoothness should reduce speed
        Then routability should be
            | highway  | oneway | smoothness    | forw        | backw       |
-            | motorway | no     |               | 90 km/h     | 90 km/h     |
-            | motorway | no     | intermediate  | 80 km/h     | 80 km/h     |
-            | motorway | no     | bad           | 40 km/h +-1 | 40 km/h +-1 |
-            | motorway | no     | very_bad      | 20 km/h +-1 | 20 km/h +-1 |
-            | motorway | no     | horrible      |  10 km/h +-1 |  10 km/h +-1 |
-            | motorway | no     | very_horrible |  5 km/h +-1 |  5 km/h +-1 |
+            | motorway | no     |               | 80 km/h +-1 | 80 km/h +-1 |
+            | motorway | no     | intermediate  | 72 km/h +-1 | 72 km/h +-1 |
+            | motorway | no     | bad           | 42 km/h +-1 | 42 km/h +-1 |
+            | motorway | no     | very_bad      | 26 km/h +-1 | 26 km/h +-1 |
+            | motorway | no     | horrible      | 18 km/h +-1 | 18 km/h +-1 |
+            | motorway | no     | very_horrible | 15 km/h +-1 | 15 km/h +-1 |

    Scenario: Car - Combination of surface tags should use lowest speed
        Then routability should be
-            | highway  | oneway | tracktype | surface | smoothness    | bothw   |
-            | motorway | no     |           |         |               | 90 km/h |
-            | service  | no     | grade1    | asphalt | excellent     | 15 km/h |
-            | motorway | no     | grade5    | asphalt | excellent     | 20 km/h |
-            | motorway | no     | grade1    | mud     | excellent     | 10 km/h |
-            | motorway | no     | grade1    | asphalt | very_horrible |  5 km/h |
-            | service  | no     | grade5    | mud     | very_horrible |  5 km/h |
+            | highway  | oneway | tracktype | surface | smoothness    | backw   | forw    |
+            | motorway | no     |           |         |               | 80 km/h | 80 km/h |
+            | service  | no     | grade1    | asphalt | excellent     | 23 km/h | 23 km/h |
+            | motorway | no     | grade5    | asphalt | excellent     | 26 km/h | 26 km/h |
+            | motorway | no     | grade1    | mud     | excellent     | 18 km/h | 18 km/h |
+            | motorway | no     | grade1    | asphalt | very_horrible | 15 km/h | 15 km/h |
+            | service  | no     | grade5    | mud     | very_horrible | 15 km/h | 15 km/h |

    Scenario: Car - Surfaces should not affect oneway direction
        Then routability should be
@@ -139,3 +138,4 @@ Feature: Car - Surfaces
            | primary | -1     | grade1    | excellent  | asphalt  |      | x     |
            | primary | -1     | grade5    | very_bad   | mud      |      | x     |
            | primary | -1     | nonsense  | nonsense   | nonsense |      | x     |
+    
@@ -1,93 +0,0 @@
-@routing @car @traffic_light
-Feature: Car - Handle traffic lights
-
-    Background:
-        Given the profile "car"
-
-    Scenario: Car - Encounters a traffic light
-        Given the node map
-            """
-            a-1-b-2-c
-
-            d-3-e-4-f
-
-            g-h-i   k-l-m
-              |       |
-              j       n
-
-            """
-
-        And the ways
-            | nodes | highway |
-            | abc   | primary |
-            | def   | primary |
-            | ghi   | primary |
-            | klm   | primary |
-            | hj    | primary |
-            | ln    | primary |
-
-        And the nodes
-            | node | highway         |
-            | e    | traffic_signals |
-            | l    | traffic_signals |
-
-        When I route I should get
-            | from | to | time   | # |
-            | 1    | 2  |  11.1s | no turn with no traffic light |
-            | 3    | 4  |  13.1s | no turn with traffic light    |
-            | g    | j  |  18.7s | turn with no traffic light    |
-            | k    | n  |  20.7s | turn with traffic light       |
-
-
-    Scenario: Tarrif Signal Geometry
-        Given the query options
-            | overview   | full      |
-            | geometries | polyline  |
-
-        Given the node map
-            """
-            a - b - c
-            """
-
-        And the ways
-            | nodes | highway |
-            | abc   | primary |
-
-        And the nodes
-            | node | highway         |
-            | b    | traffic_signals |
-
-        When I route I should get
-            | from | to | route   | geometry       |
-            | a    | c  | abc,abc | _ibE_ibE?gJ?gJ |
-
-    @traffic
-    Scenario: Traffic update on the edge with a traffic signal
-        Given the node map
-            """
-            a - b - c
-            """
-
-        And the ways
-          | nodes | highway |
-          | abc   | primary |
-
-
-        And the nodes
-            | node | highway         |
-            | b    | traffic_signals |
-
-        And the contract extra arguments "--segment-speed-file {speeds_file}"
-        And the customize extra arguments "--segment-speed-file {speeds_file}"
-        And the speed file
-        """
-        1,2,65
-        2,1,65
-        """
-        And the query options
-          | annotations | datasources,nodes,speed,duration,weight |
-
-        When I route I should get
-          | from | to | route   | speed   | weights | time  | distances | a:datasources | a:nodes | a:speed | a:duration |  a:weight |
-          | a    | c  | abc,abc | 59 km/h | 24.2,0  | 24.2s | 399.9m,0m |           1:0 |  1:2:3  |   18:18 |  11.1:11.1 | 11.1:11.1 |
-          | c    | a  | abc,abc | 59 km/h | 24.2,0  | 24.2s | 399.9m,0m |           0:1 |  3:2:1  |   18:18 |  11.1:11.1 | 11.1:11.1 |
@@ -0,0 +1,47 @@
+@routing @speed @traffic
+Feature: Traffic - speeds
+
+    Background: Use specific speeds
+        Given the node locations
+            | node | lat        | lon      |
+            | a    | 0.1        | 0.1      |
+            | b    | .05        | 0.1      |
+            | c    | 0.0        | 0.1      |
+            | d    | .05        | .03      |
+            | e    | .05        | .066     |
+            | f    | .075       | .066     |
+            | g    | .075       | 0.1      |
+        And the ways
+            | nodes | highway |
+            | ab    | primary |
+            | ad    | primary |
+            | bc    | primary |
+            | dc    | primary |
+            | de    | primary |
+            | eb    | primary |
+            | df    | primary |
+            | fb    | primary |
+        And the speed file
+        """
+        1,2,27
+        2,1,27
+        2,3,27
+        3,2,27
+        1,4,27
+        4,1,27
+        """
+
+    Scenario: Weighting based on speed file
+        Given the profile "testbot"
+        Given the extract extra arguments "--generate-edge-lookup"
+        Given the contract extra arguments "--segment-speed-file speeds.csv"
+        And I route I should get
+            | from | to | route    | speed   |
+            | a    | b  | ab,ab    | 27 km/h |
+            | a    | c  | ab,bc,bc | 27 km/h |
+            | b    | c  | bc,bc    | 27 km/h |
+            | a    | d  | ad,ad    | 27 km/h |
+            | d    | c  | dc,dc    | 36 km/h |
+            | g    | b  | ab,ab    | 27 km/h |
+            | a    | g  | ab,ab    | 27 km/h |
+
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel Patterson	17adeeecf5	Fix segfault when route includes very short segments.	2016-06-22 14:55:20 -07:00
Patrick Niklaus	edafb0a83c	[skip ci] Add breaking notice to changelog	2016-06-21 19:49:13 +02:00
Patrick Niklaus	f7cc89400a	Update the v5.2.4 changelog	2016-06-21 19:47:39 +02:00
Lauren Budorick	473e4e129c	Update tests to catch 0-subtraction error	2016-06-21 19:41:01 +02:00
Patrick Niklaus	2ac497c6b8	Fix fromTop and fromLeft calculation	2016-06-21 19:40:50 +02:00
Michael Krasnyk	defdc8cc4b	Fix omitting the last point's coordinates in the geometry field	2016-06-21 18:23:29 +02:00
Moritz Kobitzsch	4c5314676a	fix issues with roundabouts and intersections and sliproads	2016-06-21 18:23:06 +02:00
Moritz Kobitzsch	1da044f3e3	fix roundabout-handling when name changes	2016-06-17 11:19:27 -07:00
Patrick Niklaus	45516ef534	Enable travis builds for 5.2 branch	2016-06-14 14:36:41 +02:00