Add assetion fix to changelog

Try to kick start travis again
Enable Travis builds for this branch
2016-04-27 23:35:59 +02:00 · 2016-04-27 23:25:14 +02:00 · 2016-04-27 18:50:49 +02:00 · 2016-04-27 17:25:00 +02:00 · 2016-04-27 17:16:05 +02:00 · 2016-04-27 17:15:54 +02:00
1461 changed files with 17924 additions and 80541 deletions
@@ -2,89 +2,53 @@
 Language:        Cpp
 # BasedOnStyle:  LLVM
 AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
+ConstructorInitializerIndentWidth: 4
 AlignEscapedNewlinesLeft: false
-AlignOperands:   true
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: true
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
+AllowShortFunctionsOnASingleLine: true
 AlwaysBreakTemplateDeclarations: false
-BinPackArguments: false
-BinPackParameters: false
-BraceWrapping:   
-  AfterClass:      true
-  AfterControlStatement: true
-  AfterEnum:       true
-  AfterFunction:   true
-  AfterNamespace:  true
-  AfterObjCDeclaration: true
-  AfterStruct:     true
-  AfterUnion:      true
-  BeforeCatch:     true
-  BeforeElse:      true
-  IndentBraces:    true
+AlwaysBreakBeforeMultilineStrings: false
 BreakBeforeBinaryOperators: false
-BreakBeforeBraces: Allman
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
+BinPackParameters: false
 ColumnLimit:     100
-CommentPragmas:  '^ IWYU pragma:'
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: false
-DisableFormat:   false
+DerivePointerBinding: false
 ExperimentalAutoDetectBinPacking: false
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories:
-  - Regex:           '^<'
-    Priority:        3
-  - Regex:           '^"(osrm|util|engine|extract|contract)/'
-    Priority:        2
-  - Regex:           '.*'
-    Priority:        1
 IndentCaseLabels: false
-IndentWidth:     4
-IndentWrappedFunctionNames: false
-KeepEmptyLinesAtTheStartOfBlocks: true
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
 MaxEmptyLinesToKeep: 1
+KeepEmptyLinesAtTheStartOfBlocks: true
 NamespaceIndentation: None
-ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 1000
 PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Right
-ReflowComments:  true
-SortIncludes:    true
-SpaceAfterCStyleCast: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
+PointerBindsToType: false
 SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
+Cpp11BracedListStyle: true
 Standard:        Cpp11
+IndentWidth:     4
 TabWidth:        8
 UseTab:          Never
+BreakBeforeBraces: Allman
+IndentFunctionDeclarationAfterType: false
+SpacesInParentheses: false
+SpacesInAngles:  false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: true
+SpaceBeforeAssignmentOperators: true
+ContinuationIndentWidth: 4
+CommentPragmas:  '^ IWYU pragma:'
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+SpaceBeforeParens: ControlStatements
 ...

@@ -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,8 +1,3 @@
-# mason #
-#########
-/.mason
-/mason_packages
-
 # pre compiled dependencies #
 #############################
 osrm-deps
@@ -85,7 +80,6 @@ stxxl.errlog
 /test/profile.lua
 /test/cache
 /test/speeds.csv
-/test/penalties.csv
 /test/data/monaco.*
 node_modules

@@ -1,7 +1,7 @@
-language: cpp
+#language: cpp
+# This makes travis use the thin image which boots faster
+language: generic

-git:
-  depth: 10

 # sudo:required is needed for trusty images
 sudo: required
@@ -13,180 +13,154 @@ notifications:
 branches:
  only:
    - master
-
-cache:
-  ccache: true
-  apt: true
-  directories:
-    - test/cache
-
-env:
-  global:
-   - CCACHE_TEMPDIR=/tmp/.ccache-temp
-   - CCACHE_COMPRESS=1
-   - CASHER_TIME_OUT=599 # one second less than 10m to avoid 10m timeout error: https://github.com/Project-OSRM/osrm-backend/issues/2742
-   - JOBS=4
+    - "5.0"

 matrix:
  fast_finish: true

-  # We override the compiler names here to yield better ccache behavior, which uses this as key
  include:

    # Debug Builds
    - os: linux
-      compiler: "gcc-6-debug"
-      addons: &gcc6
+      compiler: gcc
+      addons: &gcc5
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
-      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' TARGET_ARCH='x86_64-asan' ENABLE_COVERAGE=ON ENABLE_SANITIZER=ON BUILD_COMPONENTS=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', 'pip']
+      env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Debug' COVERAGE=ON

    - os: linux
-      compiler: "clang-3.8-debug"
-      addons: &clang38
+      compiler: gcc
+      addons: &gcc48
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
-      env: CLANG_VERSION='3.8.1' CLANG_PACKAGE="clang++" BUILD_TYPE='Debug' RUN_CLANG_FORMAT=ON BUILD_COMPONENTS=ON CUCUMBER_TIMEOUT=60000
+          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='Debug'
+
+    - os: linux
+      compiler: clang
+      addons: &clang38
+        apt:
+          sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
+          packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Debug' RUN_CLANG_FORMAT=ON

    - os: osx
      osx_image: xcode7.3
      compiler: clang
-      env: CCOMPILER='clang' CXXCOMPILER='clang++' BUILD_TYPE='Debug' JOBS=1 CUCUMBER_TIMEOUT=60000
+      env: CCOMPILER='clang' CXXCOMPILER='clang++' BUILD_TYPE='Debug'

    # Release Builds
    - os: linux
-      compiler: "mason-release"
-      addons:
+      compiler: gcc
+      addons: &gcc5
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev', 'ccache']
-      env: BUILD_TYPE='Release' ENABLE_MASON=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']
+      env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release'

    - os: linux
-      compiler: "gcc-6-release"
-      addons: &gcc6
+      compiler: gcc
+      addons: &gcc48
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
-      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' BUILD_COMPONENTS=ON
+          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'

    - os: linux
-      compiler: "gcc-6-release-i686"
-      env: TARGET_ARCH='i686' CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release'
+      compiler: clang
+      addons: &clang38
+        apt:
+          sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
+          packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Release'

-      # Disabled because of CI slowness
-      #- os: linux
-      #- compiler: clang
-      #- addons: &clang38
-      #-   apt:
-      #-     sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
-      #-     packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
-      #- env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Release'
-
-      # Disabled because of CI slowness
-      #- os: osx
-      #- osx_image: xcode7.3
-      #- compiler: clang
-      #- env: CCOMPILER='clang' CXXCOMPILER='clang++' BUILD_TYPE='Release'
+    - 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
+      addons: &gcc5
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
-      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON BUILD_COMPONENTS=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']
+      env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON

-      # Disabled because CI slowness
-      #- os: linux
-      #- compiler: clang
-      #- addons: &clang38
-      #-   apt:
-      #-     sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
-      #-     packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
-      #- env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
+    - os: linux
+      compiler: clang
+      addons: &clang38
+        apt:
+          sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
+          packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON

 before_install:
-  - if [[ ! -z $TARGET_ARCH ]] ; then source ./scripts/travis/before_install.$TARGET_ARCH.sh ; fi
-  - if [[ $(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} || exit 1
-  - |
-    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_PACKAGE}/${CLANG_VERSION}.tar.gz"
-      travis_retry wget --quiet -O - ${CLANG_URL} | tar --strip-components=1 -xz -C ${DEPS_DIR} || exit 1
-    fi
-  - |
-    if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-      # implicit deps, but seem to be installed by default with recent images: libxml2 GDAL boost
-      brew install libzip libstxxl lua51 luabind tbb md5sha1sum ccache
-    fi
-  - ccache --max-size=256M  # limiting the cache's size to roughly the previous job's object sizes

 install:
+  - npm install
+  - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
+  - mkdir -p ${DEPS_DIR} && cd ${DEPS_DIR}
+  - |
+    if [[ -n "${COVERAGE}" ]]; then
+      pip install --user cpp-coveralls
+    fi
+  - |
+    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
+      CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.1-Linux-x86_64.tar.gz"
+      mkdir cmake && travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
+      export PATH=${DEPS_DIR}/cmake/bin:${PATH}
+    elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
+      # implicit deps, but seem to be installed by default with recent images: libxml2 GDAL boost
+      brew install cmake libzip libstxxl lua51 luabind tbb md5sha1sum
+    fi
+
+before_script:
+  - cd ${TRAVIS_BUILD_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} -DENABLE_MASON=${ENABLE_MASON:-OFF} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DENABLE_COVERAGE=${ENABLE_COVERAGE:-OFF} -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} -DBUILD_TOOLS=ON -DBUILD_COMPONENTS=${BUILD_COMPONENTS:-OFF} -DENABLE_CCACHE=ON
-  - echo "travis_fold:start:MAKE"
-  - make osrm-extract --jobs=3
-  - make --jobs=${JOBS}
-  - make tests --jobs=${JOBS}
-  - make benchmarks --jobs=${JOBS}
-  - echo "travis_fold:end:MAKE"
-  - ccache -s
+  - export OSRM_PORT=5000 OSRM_TIMEOUT=6000
+  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DCOVERAGE=${COVERAGE:-OFF} -DBUILD_TOOLS=1 -DENABLE_CCACHE=0
+
+script:
+  - make --jobs=2
+  - make tests --jobs=2
+  - make benchmarks
  - sudo make install
  - |
    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
      sudo ldconfig
    fi
-  - popd
-  - |
-    if [[ ${ENABLE_MASON:-OFF} == 'ON' ]]; then
-      # for mason builds we need to point the example
-      # at the clang++ installed by the CMakeLists.txt automatically
-      export CXX=$(./third_party/mason/mason prefix clang++ 3.8.1)/bin/clang++
-      export CC=$(./third_party/mason/mason prefix clang++ 3.8.1)/bin/clang
-    fi
-  - mkdir example/build && pushd example/build
-  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
-  - 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
-  - echo "travis_fold:end:BENCHMARK"
-  - ./example/build/osrm-example test/data/monaco.osrm
-  # All tests assume to be run from the build directory
-  - pushd build
-  - ./unit_tests/library-tests ../test/data/monaco.osrm
+  - echo "travis_fold:start:UNIT_TESTS"
  - ./unit_tests/extractor-tests
  - ./unit_tests/engine-tests
  - ./unit_tests/util-tests
  - ./unit_tests/server-tests
+  - echo "travis_fold:end:UNIT_TESTS"
  - popd
+  - echo "travis_fold:start:CUCUMBER"
  - npm test
+  - echo "travis_fold:end:CUCUMBER"
+  - echo "travis_fold:start:BENCHMARK"
+  - make -C test/data benchmark
+  - echo "travis_fold:end:BENCHMARK"
+  - ./build/unit_tests/library-tests test/data/monaco.osrm
+  - mkdir example/build && pushd example/build
+  - cmake ..
+  - make
+  - ./osrm-example ../../test/data/monaco.osrm
+  - popd

 after_success:
  - |
-    if [ -n "${RUN_CLANG_FORMAT}" ]; then
-      ./scripts/format.sh # we don't want to fail just yet
-    fi
-  - |
-    if [ -n "${ENABLE_COVERAGE}" ]; then
-      bash <(curl -s https://codecov.io/bash)
+    if [ -n "$RUN_CLANG_FORMAT" ]; then
+      ./scripts/format.sh || true # we don't want to fail just yet
    fi
+  - coveralls --build-root build --exclude unit_tests --exclude third_party --exclude node_modules --gcov-options '\-lp'
@@ -1,281 +1,8 @@
-# 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
-      - `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
-    - 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
-    - Debug Tiles
-      - Added support for turn penalties
-
-# 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
-  - Bugfixes:
-    - Fixed in issue that arised on roundabouts in combination with intermediate intersections and sliproads
-
-# 5.2.3
-  - Bugfixes:
-    - Fixed an issue with name changes in roundabouts that could result in crashes
-
-# 5.2.2
-  Changes from 5.2.1
-  - Bugfixes:
-    - Buffer overrun in tile plugin response handling
-
-# 5.2.1
-  Changes from 5.2.0
-  - Bugfixes:
-    - Removed debug statement that was spamming the console
-
-# 5.2.0
-  Changes from 5.2.0 RC2
-   - Bugfixes:
-     - Fixed crash when loading shared memory caused by invalid OSM IDs segment size.
-     - Various small instructions handling fixes
-
-   Changes from 5.1.0
-   - API:
-     - new parameter `annotations` for `route`, `trip` and `match` requests.  Returns additional data about each
-       coordinate along the selected/matched route line per `RouteLeg`:
-         - duration of each segment
-         - distance of each segment
-         - OSM node ids of all segment endpoints
-     - Introducing Intersections for Route Steps. This changes the API format in multiple ways.
-         - `bearing_before`/`bearing_after` of `StepManeuver` are now deprecated and will be removed in the next major release
-         - `location` of `StepManeuvers` is now deprecated and will be removed in the next major release
-         - every `RouteStep` now has property `intersections` containing a list of `Intersection` objects.
-     - Support for destination signs. New member `destinations` in `RouteStep`, based on `destination` and `destination:ref`
-     - Support for name pronunciations. New member `pronunciation` in `RouteStep`, based on `name:pronunciation`
-
-   - Profile changes:
-     - duration parser now accepts P[n]DT[n]H[n]M[n]S, P[n]W, PTHHMMSS and PTHH:MM:SS ISO8601 formats.
-     - `result.destinations` allows you to set a way's destinations
-     - `result.pronunciation` allows you to set way name pronunciations
-     - `highway=motorway_link` no longer implies `oneway` as per the OSM Wiki
-
-   - Infrastructure:
-     - BREAKING: Changed the on-disk encoding of the StaticRTree to reduce ramIndex file size. This breaks the **data format**
-     - BREAKING: Intersection Classification adds a new file to the mix (osrm.icd). This breaks the fileformat for older versions.
-     - Better support for osrm-routed binary upgrade on the fly [UNIX specific]:
-       - Open sockets with SO_REUSEPORT to allow multiple osrm-routed processes serving requests from the same port.
-       - Add SIGNAL_PARENT_WHEN_READY environment variable to enable osrm-routed signal its parent with USR1 when it's running and waiting for requests.
-     - Disable http access logging via DISABLE_ACCESS_LOGGING environment variable.
-
-   - Guidance:
-     - BREAKING: modifies the file format with new internal identifiers
-     - improved detection of turning streets, not reporting new-name in wrong situations
-     - improved handling of sliproads (emit turns instead of 'take the ramp')
-     - improved collapsing of instructions. Some 'new name' instructions will be suppressed if they are without alternative and the segment is short
-
-   - Bugfixes
-     - fixed broken summaries for very short routes
-
-# 5.2.0 RC2
-   Changes from 5.2.0 RC1
-
-   - Guidance:
-     - improved handling of sliproads (emit turns instead of 'take the ramp')
-     - improved collapsing of instructions. Some 'new name' instructions will be suppressed if they are without alternative and the segment is short
-     - BREAKING: modifies the file format with new internal identifiers
-
-   - API:
-     - paramater `annotate` was renamed to `annotations`.
-     - `annotation` as accidentally placed in `Route` instead of `RouteLeg`
-     - Support for destination signs. New member `destinations` in `RouteStep`, based on `destination` and `destination:ref`
-     - Support for name pronunciations. New member `pronunciation` in `RouteStep`, based on `name:pronunciation`
-     - Add `nodes` property to `annotation` in `RouteLeg` containing the ids of nodes covered by the route
-
-   - Profile changes:
-     - `result.destinations` allows you to set a way's destinations
-     - `result.pronunciation` allows you to set way name pronunciations
-     - `highway=motorway_link` no longer implies `oneway` as per the OSM Wiki
-
-   - Infrastructure
-     - BREAKING: Changed the on-disk encoding of the StaticRTree to reduce ramIndex file size. This breaks the **data format**
-
-   - Bugfixes
-     - fixed broken summaries for very short routes
-
-# 5.2.0 RC1
-   Changes from 5.1.0
-
-   - API:
-     - new parameter `annotate` for `route` and `match` requests.  Returns additional data about each
-       coordinate along the selected/matched route line.
-     - Introducing Intersections for Route Steps. This changes the API format in multiple ways.
-         - `bearing_before`/`bearing_after` of `StepManeuver` are now deprecated and will be removed in the next major release
-         - `location` of `StepManeuvers` is now deprecated and will be removed in the next major release
-         - every `RouteStep` now has property `intersections` containing a list of `Intersection` objects.
-
-   - Profile changes:
-     - duration parser now accepts P[n]DT[n]H[n]M[n]S, P[n]W, PTHHMMSS and PTHH:MM:SS ISO8601 formats.
-
-   - Infrastructure:
-     - Better support for osrm-routed binary upgrade on the fly [UNIX specific]:
-       - Open sockets with SO_REUSEPORT to allow multiple osrm-routed processes serving requests from the same port.
-       - Add SIGNAL_PARENT_WHEN_READY environment variable to enable osrm-routed signal its parent with USR1 when it's running and waiting for requests.
-     - BREAKING: Intersection Classification adds a new file to the mix (osrm.icd). This breaks the fileformat for older versions.
-     - Disable http access logging via DISABLE_ACCESS_LOGGING environment
-       variable.
-
-   - Guidance:
-     - improved detection of turning streets, not reporting new-name in wrong situations
-
-# 5.1.0
-   Changes with regard to 5.0.0
-
-   - API:
-     - added StepManeuver type `roundabout turn`. The type indicates a small roundabout that is treated as an intersection
-        (turn right at the roundabout for first exit, go straight at the roundabout...)
-     - added StepManeuver type `on ramp` and `off ramp` to distinguish between ramps that enter and exit a highway.
-     - reduced new name instructions for trivial changes
-     - combined multiple turns into a single instruction at segregated roads`
-
-   - Profile Changes:
-    - introduced a suffix_list / get_name_suffix_list to specify name suffices to be suppressed in name change announcements
-    - street names are now consistently assembled for the car, bike and walk profile as: "Name (Ref)" as in "Berlin (A5)"
-    - new `car.lua` dependency `lib/destination.lua`
-    - register a way's .nodes() function for use in the profile's way_function.
-
-   - Infrastructure
-    - BREAKING: reordered internal instruction types. This breaks the **data format**
-    - BREAKING: Changed the on-disk encoding of the StaticRTree for better performance. This breaks the **data format**
-
+# 5.0.1
   - Fixes:
-    - Issue #2310: post-processing for local paths, fixes #2310
-    - Issue #2309: local path looping, fixes #2309
-    - Issue #2356: Make hint values optional
-    - Issue #2349: Segmentation fault in some requests
-    - Issue #2335: map matching was using shortest path with uturns disabled
-    - Issue #2193: Fix syntax error position indicators in parameters queries
-    - Fix search with u-turn
-    - PhantomNode packing in MSVC now the same on other platforms
-    - Summary is now not malformed when including unnamed roads
-    - Emit new-name on when changing fron unanmed road to named road
+     - Issue #2309: Fixes local path looping, same coordinates crash
+     - Issue #2311: Fixes invalid assertion in loop unpacking
+     - Issue #2310: Local paths could falsely end up trying to remove the start step

 # 5.0.0
   Changes with regard 5.0.0 RC2:
@@ -1,5 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11)
-# we depend on 2.8.11 introducing target_include_directories
+cmake_minimum_required(VERSION 2.8.8)

 if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR AND NOT MSVC_IDE)
  message(FATAL_ERROR "In-source builds are not allowed.
@@ -7,62 +6,11 @@ Please create a directory and run cmake from there, passing the path to this sou
 This process created the file `CMakeCache.txt' and the directory `CMakeFiles'. Please delete them.")
 endif()

-option(ENABLE_MASON "Use mason for dependencies" OFF)
-option(ENABLE_CCACHE "Speed up incremental rebuilds via ccache" ON)
-option(BUILD_TOOLS "Build OSRM tools" OFF)
-option(BUILD_COMPONENTS "Build osrm-components" OFF)
-option(ENABLE_ASSERTIONS "Use assertions in release mode" OFF)
-option(ENABLE_COVERAGE "Build with coverage instrumentalisation" OFF)
-option(ENABLE_SANITIZER "Use memory sanitizer for Debug build" OFF)
-option(ENABLE_LTO "Use LTO if available" ON)
-option(ENABLE_FUZZING "Fuzz testing using LLVM's libFuzzer" OFF)
-option(ENABLE_GOLD_LINKER "Use GNU gold linker if available" ON)
-
-if(ENABLE_MASON)
-
-  # versions in use
-  set(MASON_CLANG_VERSION "3.8.1")
-  set(MASON_BOOST_VERSION "1.61.0")
-  set(MASON_STXXL_VERSION "1.4.1")
-  set(MASON_EXPAT_VERSION "2.1.1")
-  set(MASON_LUA_VERSION "5.2.4")
-  set(MASON_LUABIND_VERSION "e414c57bcb687bb3091b7c55bbff6947f052e46b")
-  set(MASON_BZIP2_VERSION "1.0.6")
-  set(MASON_TBB_VERSION "43_20150316")
-  set(MASON_CCACHE_VERSION "3.3.1")
-
-  message(STATUS "Enabling mason")
-  set(MASON_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/third_party/mason/mason)
-  include(${CMAKE_CURRENT_SOURCE_DIR}/third_party/mason/mason.cmake)
-  if(NOT CMAKE_CXX_COMPILER)
-    mason_use(clang++ VERSION ${MASON_CLANG_VERSION})
-    message(STATUS "Setting compiler to clang++ ${MASON_CLANG_VERSION} (via mason) ${MASON_PACKAGE_clang++_PREFIX}/bin/clang++")
-    set(CMAKE_CXX_COMPILER "${MASON_PACKAGE_clang++_PREFIX}/bin/clang++")
-    set(CMAKE_C_COMPILER "${MASON_PACKAGE_clang++_PREFIX}/bin/clang")
-  endif()
-endif()
-
 project(OSRM C CXX)
 set(OSRM_VERSION_MAJOR 5)
-set(OSRM_VERSION_MINOR 5)
+set(OSRM_VERSION_MINOR 0)
 set(OSRM_VERSION_PATCH 0)

-# these two functions build up custom variables:
-#   OSRM_INCLUDE_PATHS and OSRM_DEFINES
-# These variables we want to pass to
-# include_directories and add_definitions for both
-# this build and for sharing externally via pkg-config
-
-function(add_dependency_includes includes)
-  list(APPEND OSRM_INCLUDE_PATHS "${includes}")
-  set(OSRM_INCLUDE_PATHS "${OSRM_INCLUDE_PATHS}" PARENT_SCOPE)
-endfunction(add_dependency_includes)
-
-function(add_dependency_defines defines)
-  list(APPEND OSRM_DEFINES "${defines}")
-  set(OSRM_DEFINES "${OSRM_DEFINES}" PARENT_SCOPE)
-endfunction(add_dependency_defines)
-
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 include(CheckCXXCompilerFlag)
 include(FindPackageHandleStandardArgs)
@@ -74,13 +22,21 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
  set(bitness 64)
  message(STATUS "Building on a 64 bit system")
 else()
-  message(STATUS "Building on a 32 bit system")
+  message(WARNING "Building on a 32 bit system is unsupported")
 endif()

-if(WIN32 AND MSVC_VERSION LESS 1900)
-  message(FATAL_ERROR "Building with Microsoft compiler needs Latest Visual Studio 2015 (Community or better)")
+if(WIN32 AND MSVC_VERSION LESS 1800)
+  message(FATAL_ERROR "Building with Microsoft compiler needs Visual Studio 2013 or later (Express version works too)")
 endif()

+option(ENABLE_CCACHE "Speed up incremental rebuilds via ccache" ON)
+option(ENABLE_JSON_LOGGING "Adds additional JSON debug logging to the response" OFF)
+option(BUILD_TOOLS "Build OSRM tools" OFF)
+option(BUILD_COMPONENTS "Build osrm-components" ON)
+option(ENABLE_ASSERTIONS OFF)
+option(COVERAGE OFF)
+option(SANITIZER OFF)
+
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/)
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/)
 include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/)
@@ -92,13 +48,13 @@ add_custom_target(FingerPrintConfigure ALL ${CMAKE_COMMAND}
  COMMENT "Configuring revision fingerprint"
  VERBATIM)

-set(BOOST_COMPONENTS date_time chrono filesystem iostreams program_options regex system thread unit_test_framework)
+set(BOOST_COMPONENTS date_time filesystem iostreams program_options regex system thread)

 configure_file(
  ${CMAKE_CURRENT_SOURCE_DIR}/include/util/version.hpp.in
  ${CMAKE_CURRENT_BINARY_DIR}/include/util/version.hpp
 )
-file(GLOB UtilGlob src/util/*.cpp src/util/*/*.cpp)
+file(GLOB UtilGlob src/util/*.cpp)
 file(GLOB ExtractorGlob src/extractor/*.cpp src/extractor/*/*.cpp)
 file(GLOB ContractorGlob src/contractor/*.cpp)
 file(GLOB StorageGlob src/storage/*.cpp)
@@ -124,67 +80,28 @@ add_library(osrm_extract $<TARGET_OBJECTS:EXTRACTOR> $<TARGET_OBJECTS:UTIL>)
 add_library(osrm_contract $<TARGET_OBJECTS:CONTRACTOR> $<TARGET_OBJECTS:UTIL>)
 add_library(osrm_store $<TARGET_OBJECTS:STORAGE> $<TARGET_OBJECTS:UTIL>)

-if(ENABLE_GOLD_LINKER)
-    execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
-    if("${LD_VERSION}" MATCHES "GNU gold")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold -Wl,--disable-new-dtags")
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold -Wl,--disable-new-dtags")
-        message(STATUS "Using GNU gold as linker.")
-
-        # Issue 2785: check gold binutils version and don't use gc-sections for versions prior 2.25
-        string(REGEX REPLACE ".*\\(GNU Binutils[^\\)0-9]+([0-9]+\\.[0-9]+)[^\\)]*\\).*" "\\1" GOLD_BINUTILS_VERSION "${LD_VERSION}")
-        if ("${GOLD_BINUTILS_VERSION}" VERSION_LESS "2.26")
-          message(STATUS "Disabling gc-sections on gold binutils < 2.26, see: https://sourceware.org/bugzilla/show_bug.cgi?id=17639")
-          set(LD_AVOID_GC_SECTIONS TRUE)
-        endif()
-    else()
-        message(WARNING "GNU gold linker isn't available.")
-        set(ENABLE_GOLD_LINKER OFF)
-    endif()
-endif()
-
-# Explicitly set the build type to Release if no other type is specified
-# on the command line.  Without this, cmake defaults to an unoptimized,
-# non-debug build, which almost nobody wants.
-if(NOT CMAKE_BUILD_TYPE)
-  message(STATUS "No build type specified, defaulting to Release")
+# Check the release mode
+if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
  set(CMAKE_BUILD_TYPE Release)
 endif()
-
 if(CMAKE_BUILD_TYPE MATCHES Debug)
  message(STATUS "Configuring OSRM in debug mode")
-elseif(CMAKE_BUILD_TYPE MATCHES Release)
-  message(STATUS "Configuring OSRM in release mode")
-elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
-  message(STATUS "Configuring OSRM in release mode with debug flags")
-elseif(CMAKE_BUILD_TYPE MATCHES MinRelSize)
-  message(STATUS "Configuring OSRM in release mode with minimized size")
-else()
-  message(STATUS "Unrecognized build type - will use cmake defaults")
-endif()
-
-# Additional logic for the different build types
-if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
-  message(STATUS "Configuring debug mode flags")
  set(ENABLE_ASSERTIONS ON)
  if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-inline -fno-omit-frame-pointer")
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-      if (CMAKE_BUILD_TYPE MATCHES Debug)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og -ggdb")
-      else()
-        # Don't override the -O parameter for RelWithDebInfo, we want an optimized build
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb")
-      endif()
-    endif()
+
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-inline -fno-omit-frame-pointer")
+
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og -ggdb")
+  endif()
+
  endif()
 endif()
-
-if(CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES MinRelSize OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
-  message(STATUS "Configuring release mode optimizations")
+if(CMAKE_BUILD_TYPE MATCHES Release)
+  message(STATUS "Configuring OSRM in release mode")
  # Check if LTO is available
  check_cxx_compiler_flag("-flto" LTO_AVAILABLE)
-  if(ENABLE_LTO AND LTO_AVAILABLE)
+  if(LTO_AVAILABLE)
    set(OLD_CXX_FLAGS ${CMAKE_CXX_FLAGS})
    # GCC in addition allows parallelizing LTO
    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
@@ -218,27 +135,24 @@ if(CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES MinRelSize OR CM
  endif()
 endif()

-if (ENABLE_MASON AND (LTO_WORKS OR ENABLE_GOLD_LINKER))
-  message(WARNING "ENABLE_MASON and ENABLE_LTO/ENABLE_GOLD_LINKER may not work on all linux systems currently")
-  message(WARNING "For more details see: https://github.com/Project-OSRM/osrm-backend/issues/3202")
-endif()
-
 set(MAYBE_COVERAGE_LIBRARIES "")
-if (ENABLE_COVERAGE)
+if (COVERAGE)
  if (NOT CMAKE_BUILD_TYPE MATCHES "Debug")
-    message(ERROR "ENABLE_COVERAGE=ON only make sense with a Debug build")
+    message(ERROR "COVERAGE=ON only make sense with a Debug build")
  endif()
-  message(INFO "Enabling coverage")
-  set(MAYBE_COVERAGE_LIBRARIES "-lgcov")
+  set(MAYBE_COVERAGE_LIBRARIES "gcov")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs")
 endif()
-if (ENABLE_SANITIZER)
+if (SANITIZER)
+  if (NOT CMAKE_BUILD_TYPE MATCHES "Debug")
+    message(ERROR "SANITIZER=ON only make sense with a Debug build")
+  endif()
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
 endif()

 # Configuring compilers
 if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wuninitialized -Wunreachable-code -Wstrict-overflow=2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC -fcolor-diagnostics")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wuninitialized -Wunreachable-code -Wstrict-overflow=2 -D_FORTIFY_SOURCE=2 -fPIC -fcolor-diagnostics")
 elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
  set(COLOR_FLAG "-fdiagnostics-color=auto")
  check_cxx_compiler_flag("-fdiagnostics-color=auto" HAS_COLOR_FLAG)
@@ -246,9 +160,9 @@ elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
    set(COLOR_FLAG "")
  endif()
  # using GCC
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wuninitialized -Wunreachable-code -Wstrict-overflow=1 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${COLOR_FLAG} -fPIC")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wuninitialized -Wunreachable-code -Wstrict-overflow=1 -D_FORTIFY_SOURCE=2 ${COLOR_FLAG} -fPIC")
  if(WIN32) # using mingw
-    add_dependency_defines(-DWIN32)
+    add_definitions(-DWIN32)
    set(OPTIONAL_SOCKET_LIBS ws2_32 wsock32)
  endif()
 elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
@@ -256,13 +170,13 @@ elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-intel -wd10237 -Wall -ipo -fPIC")
 elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
  # using Visual Studio C++
-  set(BOOST_COMPONENTS ${BOOST_COMPONENTS} zlib)
-  add_dependency_defines(-DBOOST_LIB_DIAGNOSTIC)
-  add_dependency_defines(-D_CRT_SECURE_NO_WARNINGS)
-  add_dependency_defines(-DNOMINMAX) # avoid min and max macros that can break compilation
-  add_dependency_defines(-D_USE_MATH_DEFINES) #needed for M_PI with cmath.h
-  add_dependency_defines(-D_WIN32_WINNT=0x0501)
-  add_dependency_defines(-DXML_STATIC)
+  set(BOOST_COMPONENTS ${BOOST_COMPONENTS} date_time chrono zlib)
+  add_definitions(-DBOOST_LIB_DIAGNOSTIC)
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+  add_definitions(-DNOMINMAX) # avoid min and max macros that can break compilation
+  add_definitions(-D_USE_MATH_DEFINES) #needed for M_PI with cmath.h
+  add_definitions(-D_WIN32_WINNT=0x0501)
+  add_definitions(-DXML_STATIC)
  find_library(ws2_32_LIBRARY_PATH ws2_32)
  target_link_libraries(osrm-extract wsock32 ws2_32)
 endif()
@@ -272,7 +186,7 @@ execute_process(COMMAND ${CMAKE_CXX_COMPILER} "-Wl,--version" ERROR_QUIET OUTPUT
 # For ld.gold and ld.bfs (the GNU linkers) we optimize hard
 if("${LINKER_VERSION}" MATCHES "GNU gold" OR "${LINKER_VERSION}" MATCHES "GNU ld")
  message(STATUS "Setting linker optimizations")
-  if(NOT (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC" OR "${LD_AVOID_GC_SECTIONS}"))
+  if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
    # Tell compiler to put every function in separate section, linker can then match sections and functions
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections")
    # Tell linker to do dead code and data eminination during link time discarding sections
@@ -287,15 +201,13 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAGS}")
 set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAGS}")
 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")

-# Activate C++1y
+# Activate C++11
 if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ")
 endif()

 # Configuring other platform dependencies
 if(APPLE)
-  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10")
-  execute_process(COMMAND xcrun --sdk macosx --show-sdk-path OUTPUT_VARIABLE CMAKE_OSX_SYSROOT OUTPUT_STRIP_TRAILING_WHITESPACE)
  set(CMAKE_OSX_ARCHITECTURES "x86_64")
  message(STATUS "Set Architecture to x64 on OS X")
  exec_program(uname ARGS -v  OUTPUT_VARIABLE DARWIN_VERSION)
@@ -310,170 +222,47 @@ if(APPLE)
 endif()

 if(UNIX AND NOT APPLE)
-  set(MAYBE_RT_LIBRARY -lrt)
+  set(MAYBE_RT_LIBRARY rt)
 endif()

-# Disallow deprecated protozero APIs
-add_definitions(-DPROTOZERO_STRICT_API)
-
-find_package(Threads REQUIRED)
-
-# if mason is enabled no find_package calls are made
-# to ensure that we are only compiling and linking against
-# fully portable mason packages
-if(ENABLE_MASON)
-  message(STATUS "Installing dependencies via mason")
-
-  set(Boost_USE_STATIC_LIBS ON)
-  mason_use(boost VERSION ${MASON_BOOST_VERSION} HEADER_ONLY)
-  add_dependency_includes(${MASON_PACKAGE_boost_INCLUDE_DIRS})
-  mason_use(boost_libfilesystem VERSION ${MASON_BOOST_VERSION})
-  set(Boost_FILESYSTEM_LIBRARY ${MASON_PACKAGE_boost_libfilesystem_STATIC_LIBS})
-  mason_use(boost_libiostreams VERSION ${MASON_BOOST_VERSION})
-  set(Boost_IOSTREAMS_LIBRARY ${MASON_PACKAGE_boost_libiostreams_STATIC_LIBS})
-  mason_use(boost_libprogram_options VERSION ${MASON_BOOST_VERSION})
-  set(Boost_PROGRAM_OPTIONS_LIBRARY ${MASON_PACKAGE_boost_libprogram_options_STATIC_LIBS})
-  mason_use(boost_libregex VERSION ${MASON_BOOST_VERSION})
-  set(Boost_REGEX_LIBRARY ${MASON_PACKAGE_boost_libregex_STATIC_LIBS})
-  mason_use(boost_libtest VERSION ${MASON_BOOST_VERSION})
-  set(Boost_UNIT_TEST_FRAMEWORK_LIBRARY ${MASON_PACKAGE_boost_libtest_STATIC_LIBS})
-  mason_use(boost_libdate_time VERSION ${MASON_BOOST_VERSION})
-  set(Boost_DATE_TIME_LIBRARY ${MASON_PACKAGE_boost_libdate_time_STATIC_LIBS})
-  mason_use(boost_libthread VERSION ${MASON_BOOST_VERSION})
-  set(Boost_THREAD_LIBRARY ${MASON_PACKAGE_boost_libthread_STATIC_LIBS})
-  mason_use(boost_libsystem VERSION ${MASON_BOOST_VERSION})
-  set(Boost_SYSTEM_LIBRARY ${MASON_PACKAGE_boost_libsystem_STATIC_LIBS})
-
-  mason_use(stxxl VERSION ${MASON_STXXL_VERSION})
-  add_dependency_includes(${MASON_PACKAGE_stxxl_INCLUDE_DIRS})
-  set(STXXL_LIBRARY ${MASON_PACKAGE_stxxl_STATIC_LIBS})
-
-  mason_use(expat VERSION ${MASON_EXPAT_VERSION})
-  add_dependency_includes(${MASON_PACKAGE_expat_INCLUDE_DIRS})
-  set(EXPAT_LIBRARIES ${MASON_PACKAGE_expat_STATIC_LIBS})
-
-  mason_use(lua VERSION ${MASON_LUA_VERSION})
-  add_dependency_includes(${MASON_PACKAGE_lua_INCLUDE_DIRS})
-  set(USED_LUA_LIBRARIES ${MASON_PACKAGE_lua_STATIC_LIBS})
-
-  mason_use(luabind_lua524 VERSION ${MASON_LUABIND_VERSION})
-  add_dependency_includes(${MASON_PACKAGE_luabind_lua524_INCLUDE_DIRS})
-  set(LUABIND_LIBRARY ${MASON_PACKAGE_luabind_lua524_STATIC_LIBS})
-
-  mason_use(bzip2 VERSION ${MASON_BZIP2_VERSION})
-  add_dependency_includes(${MASON_PACKAGE_bzip2_INCLUDE_DIRS})
-  set(BZIP2_LIBRARIES ${MASON_PACKAGE_bzip2_STATIC_LIBS})
-
-  mason_use(tbb VERSION ${MASON_TBB_VERSION})
-  add_dependency_includes(${MASON_PACKAGE_tbb_INCLUDE_DIRS})
-  set(TBB_LIBRARIES ${MASON_PACKAGE_tbb_LDFLAGS})
-
-  if(NOT MASON_PACKAGE_tbb_LIBRARY_DIRS)
-    message(FATAL_ERROR "MASON_PACKAGE_tbb_LIBRARY_DIRS is empty, rpath will not work")
-  endif()
-  foreach(libpath ${MASON_PACKAGE_tbb_LIBRARY_DIRS})
-    if(UNIX AND NOT APPLE)
-       set(LINKER_FLAGS "-Wl,-rpath,${libpath}")
-    elseif(APPLE)
-       set(LINKER_FLAGS "-Wl,-rpath, -Wl,${libpath}")
-    endif()
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAGS}")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAGS}")
-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")
-    file(GLOB TBBGlob ${libpath}/*.*)
-    install(FILES ${TBBGlob} DESTINATION lib)
-  endforeach()
-
-  if(BUILD_COMPONENTS)
-    message(FATAL_ERROR "BUILD_COMPONENTS is not supported with ENABLE_MASON")
-  endif()
-
-  # current mason packages target -D_GLIBCXX_USE_CXX11_ABI=0
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
-
-  if(ENABLE_CCACHE)
-    mason_use(ccache VERSION ${MASON_CCACHE_VERSION})
-    message(STATUS "Setting ccache to ccache ${MASON_CCACHE_VERSION} (via mason) ${MASON_PACKAGE_ccache_PREFIX}/bin/ccache")
-    message(STATUS "Using ccache to speed up incremental builds")
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${MASON_PACKAGE_ccache_PREFIX}/bin/ccache)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ${MASON_PACKAGE_ccache_PREFIX}/bin/ccache)
-    set(ENV{CCACHE_CPP2} "true")
-  endif()
-
-else()
-
-  find_package(Boost 1.49.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
-  add_dependency_includes(${Boost_INCLUDE_DIRS})
-
-  find_package(TBB REQUIRED)
-  add_dependency_includes(${TBB_INCLUDE_DIR})
-  if(WIN32 AND CMAKE_BUILD_TYPE MATCHES Debug)
-    set(TBB_LIBRARIES ${TBB_DEBUG_LIBRARIES})
-  endif()
-  find_package(Luabind REQUIRED)
-  add_dependency_includes(${LUABIND_INCLUDE_DIR})
-  set(USED_LUA_LIBRARIES ${LUA_LIBRARY})
-  add_dependency_includes(${LUA_INCLUDE_DIR})
-
-  find_package(EXPAT REQUIRED)
-  add_dependency_includes(${EXPAT_INCLUDE_DIRS})
-
-  find_package(STXXL REQUIRED)
-  add_dependency_includes(${STXXL_INCLUDE_DIR})
-
-  find_package(BZip2 REQUIRED)
-  add_dependency_includes(${BZIP2_INCLUDE_DIR})
-
-  if(BUILD_COMPONENTS)
-    find_package(GDAL)
-  endif()
-
-  # add a target to generate API documentation with Doxygen
-  find_package(Doxygen)
-  if(DOXYGEN_FOUND)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
-  add_custom_target(doc
-  ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-  COMMENT "Generating API documentation with Doxygen" VERBATIM
-  )
-  endif()
-
-  # prefix compilation with ccache by default if available and on clang or gcc
-  if(ENABLE_CCACHE AND (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU"))
-    find_program(CCACHE_FOUND ccache)
-    if(CCACHE_FOUND)
-      message(STATUS "Using ccache to speed up incremental builds")
-      set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-      set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-      set(ENV{CCACHE_CPP2} "true")
-    endif()
-  endif()
-
-endif()
-
-# even with mason builds we want to link to system zlib
-# to ensure that osrm binaries play well with other binaries like nodejs
-find_package(ZLIB REQUIRED)
-add_dependency_includes(${ZLIB_INCLUDE_DIRS})
-
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/cmake")
 set(OSMIUM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include")
 find_package(Osmium REQUIRED COMPONENTS io)
-include_directories(SYSTEM ${OSMIUM_INCLUDE_DIR})
+include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS})

-if(NOT WIN32 AND NOT Boost_USE_STATIC_LIBS)
-  add_dependency_defines(-DBOOST_TEST_DYN_LINK)
+
+find_package(Boost 1.49.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
+if(NOT WIN32)
+  add_definitions(-DBOOST_TEST_DYN_LINK)
+endif()
+add_definitions(-DBOOST_SPIRIT_USE_PHOENIX_V3)
+add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE)
+add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED)
+include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+
+find_package(Threads REQUIRED)
+
+find_package(TBB REQUIRED)
+include_directories(SYSTEM ${TBB_INCLUDE_DIR})
+if(WIN32 AND CMAKE_BUILD_TYPE MATCHES Debug)
+  set(TBB_LIBRARIES ${TBB_DEBUG_LIBRARIES})
 endif()

+find_package(Luabind REQUIRED)
+include(check_luabind)
+include_directories(SYSTEM ${LUABIND_INCLUDE_DIR})

-if(NOT WIN32 AND NOT Boost_USE_STATIC_LIBS)
-  add_dependency_defines(-DBOOST_TEST_DYN_LINK)
+set(USED_LUA_LIBRARIES ${LUA_LIBRARY})
+if(LUAJIT_FOUND)
+  set(USED_LUA_LIBRARIES, LUAJIT_LIBRARIES)
 endif()
+include_directories(SYSTEM ${LUA_INCLUDE_DIR})

-add_dependency_defines(-DBOOST_SPIRIT_USE_PHOENIX_V3)
-add_dependency_defines(-DBOOST_RESULT_OF_USE_DECLTYPE)
-add_dependency_defines(-DBOOST_FILESYSTEM_NO_DEPRECATED)
+find_package(EXPAT REQUIRED)
+include_directories(SYSTEM ${EXPAT_INCLUDE_DIRS})
+
+find_package(STXXL REQUIRED)
+include_directories(SYSTEM ${STXXL_INCLUDE_DIR})

 set(OpenMP_FIND_QUIETLY ON)
 find_package(OpenMP)
@@ -482,32 +271,26 @@ if(OPENMP_FOUND)
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
 endif()

-add_definitions(${OSRM_DEFINES})
-include_directories(SYSTEM ${OSRM_INCLUDE_PATHS})
+find_package(BZip2 REQUIRED)
+include_directories(SYSTEM ${BZIP_INCLUDE_DIRS})

-set(BOOST_BASE_LIBRARIES
-   ${Boost_DATE_TIME_LIBRARY}
-   ${Boost_CHRONO_LIBRARY}
-   ${Boost_FILESYSTEM_LIBRARY}
-   ${Boost_IOSTREAMS_LIBRARY}
-   ${Boost_THREAD_LIBRARY}
-   ${Boost_SYSTEM_LIBRARY})
+find_package(ZLIB REQUIRED)
+include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS})

-set(BOOST_ENGINE_LIBRARIES
-  ${Boost_ZLIB_LIBRARY}
-  ${Boost_REGEX_LIBRARY}
-  ${BOOST_BASE_LIBRARIES})
+if (ENABLE_JSON_LOGGING)
+  message(STATUS "Enabling json logging")
+  add_definitions(-DENABLE_JSON_LOGGING)
+endif()

 # Binaries
-target_link_libraries(osrm-datastore osrm_store ${Boost_PROGRAM_OPTIONS_LIBRARY} ${BOOST_BASE_LIBRARIES})
-target_link_libraries(osrm-extract osrm_extract ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_REGEX_LIBRARY} ${BOOST_BASE_LIBRARIES})
-target_link_libraries(osrm-contract ${Boost_PROGRAM_OPTIONS_LIBRARY} ${BOOST_BASE_LIBRARIES} ${TBB_LIBRARIES} osrm_contract)
-target_link_libraries(osrm-routed osrm ${Boost_PROGRAM_OPTIONS_LIBRARY} ${BOOST_ENGINE_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} ${ZLIB_LIBRARY})
+target_link_libraries(osrm-datastore osrm_store ${Boost_LIBRARIES})
+target_link_libraries(osrm-extract osrm_extract ${Boost_LIBRARIES})
+target_link_libraries(osrm-contract osrm_contract ${Boost_LIBRARIES})
+target_link_libraries(osrm-routed osrm ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} ${ZLIB_LIBRARY})

 set(EXTRACTOR_LIBRARIES
    ${BZIP2_LIBRARIES}
-    ${Boost_REGEX_LIBRARY}
-    ${BOOST_BASE_LIBRARIES}
+    ${Boost_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
    ${EXPAT_LIBRARIES}
    ${LUABIND_LIBRARY}
@@ -518,7 +301,7 @@ set(EXTRACTOR_LIBRARIES
    ${ZLIB_LIBRARY}
    ${MAYBE_COVERAGE_LIBRARIES})
 set(CONTRACTOR_LIBRARIES
-    ${BOOST_BASE_LIBRARIES}
+    ${Boost_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
    ${LUABIND_LIBRARY}
    ${USED_LUA_LIBRARIES}
@@ -527,20 +310,20 @@ set(CONTRACTOR_LIBRARIES
    ${MAYBE_RT_LIBRARY}
    ${MAYBE_COVERAGE_LIBRARIES})
 set(ENGINE_LIBRARIES
-    ${BOOST_ENGINE_LIBRARIES}
+    ${Boost_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
+    ${STXXL_LIBRARY}
    ${TBB_LIBRARIES}
    ${MAYBE_RT_LIBRARY}
-    ${MAYBE_COVERAGE_LIBRARIES}
-    ${ZLIB_LIBRARY})
+    ${MAYBE_COVERAGE_LIBRARIES})
 set(STORAGE_LIBRARIES
-    ${BOOST_BASE_LIBRARIES}
+    ${Boost_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
    ${TBB_LIBRARIES}
    ${MAYBE_RT_LIBRARY}
    ${MAYBE_COVERAGE_LIBRARIES})
 set(UTIL_LIBRARIES
-    ${BOOST_BASE_LIBRARIES}
+    ${Boost_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
    ${STXXL_LIBRARY}
    ${TBB_LIBRARIES}
@@ -552,11 +335,12 @@ target_link_libraries(osrm_extract ${EXTRACTOR_LIBRARIES})
 target_link_libraries(osrm_store ${STORAGE_LIBRARIES})

 if(BUILD_COMPONENTS)
+  find_package(GDAL)
  if(GDAL_FOUND)
    add_executable(osrm-components src/tools/components.cpp $<TARGET_OBJECTS:UTIL>)
    target_link_libraries(osrm-components ${TBB_LIBRARIES})
    include_directories(SYSTEM ${GDAL_INCLUDE_DIR})
-    target_link_libraries(osrm-components ${GDAL_LIBRARIES} ${BOOST_BASE_LIBRARIES})
+    target_link_libraries(osrm-components ${GDAL_LIBRARIES} ${Boost_LIBRARIES})
    install(TARGETS osrm-components DESTINATION bin)
  else()
    message(WARNING "libgdal and/or development headers not found")
@@ -566,14 +350,14 @@ endif()
 if(BUILD_TOOLS)
  message(STATUS "Activating OSRM internal tools")
  add_executable(osrm-io-benchmark src/tools/io-benchmark.cpp $<TARGET_OBJECTS:UTIL>)
-  target_link_libraries(osrm-io-benchmark ${BOOST_BASE_LIBRARIES})
+  target_link_libraries(osrm-io-benchmark ${Boost_LIBRARIES})
  add_executable(osrm-unlock-all src/tools/unlock_all_mutexes.cpp $<TARGET_OBJECTS:UTIL>)
-  target_link_libraries(osrm-unlock-all ${BOOST_BASE_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+  target_link_libraries(osrm-unlock-all ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
  if(UNIX AND NOT APPLE)
    target_link_libraries(osrm-unlock-all rt)
  endif()
  add_executable(osrm-springclean src/tools/springclean.cpp $<TARGET_OBJECTS:UTIL>)
-  target_link_libraries(osrm-springclean ${BOOST_BASE_LIBRARIES})
+  target_link_libraries(osrm-springclean ${Boost_LIBRARIES})

  install(TARGETS osrm-io-benchmark DESTINATION bin)
  install(TARGETS osrm-unlock-all DESTINATION bin)
@@ -597,7 +381,7 @@ file(GLOB VariantGlob third_party/variant/*.hpp)
 file(GLOB LibraryGlob include/osrm/*.hpp)
 file(GLOB ParametersGlob include/engine/api/*_parameters.hpp)
 set(EngineHeader include/engine/status.hpp include/engine/engine_config.hpp include/engine/hint.hpp include/engine/bearing.hpp include/engine/phantom_node.hpp)
-set(UtilHeader include/util/coordinate.hpp include/util/json_container.hpp include/util/typedefs.hpp include/util/strong_typedef.hpp include/util/exception.hpp)
+set(UtilHeader include/util/coordinate.hpp include/util/json_container.hpp include/util/typedefs.hpp include/util/strong_typedef.hpp)
 set(ExtractorHeader include/extractor/extractor.hpp include/extractor/extractor_config.hpp include/extractor/travel_mode.hpp)
 set(ContractorHeader include/contractor/contractor.hpp include/contractor/contractor_config.hpp)
 set(StorageHeader include/storage/storage.hpp include/storage/storage_config.hpp)
@@ -618,26 +402,44 @@ install(TARGETS osrm_extract DESTINATION lib)
 install(TARGETS osrm_contract DESTINATION lib)
 install(TARGETS osrm_store DESTINATION lib)

+list(GET ENGINE_LIBRARIES 1 ENGINE_LIBRARY_FIRST)
 foreach(lib ${ENGINE_LIBRARIES})
-  set(ENGINE_LIBRARY_LISTING "${ENGINE_LIBRARY_LISTING} ${lib}")
+  get_filename_component(ENGINE_LIBRARY_PATH "${ENGINE_LIBRARY_FIRST}" PATH)
+  get_filename_component(ENGINE_LIBRARY_NAME "${lib}" NAME_WE)
+  string(REPLACE "lib" "" ENGINE_LIBRARY_NAME ${ENGINE_LIBRARY_NAME})
+  string(REPLACE "-l" "" ENGINE_LIBRARY_NAME ${ENGINE_LIBRARY_NAME})
+  set(ENGINE_LIBRARY_LISTING "${ENGINE_LIBRARY_LISTING} -L${ENGINE_LIBRARY_PATH} -l${ENGINE_LIBRARY_NAME}")
 endforeach()

+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig.in libosrm.pc @ONLY)
+install(FILES ${PROJECT_BINARY_DIR}/libosrm.pc DESTINATION lib/pkgconfig)
+
 if(BUILD_DEBIAN_PACKAGE)
  include(CPackDebianConfig)
  include(CPack)
 endif()

-function(JOIN VALUES GLUE OUTPUT)
-  string (REPLACE ";" "${GLUE}" _TMP_STR "${VALUES}")
-  set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
-endfunction()
+# add a target to generate API documentation with Doxygen
+find_package(Doxygen)
+if(DOXYGEN_FOUND)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
+add_custom_target(doc
+${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+COMMENT "Generating API documentation with Doxygen" VERBATIM
+)
+endif()

-# Set up variables, then write to pkgconfig file
-JOIN("${OSRM_DEFINES}" " " OSRM_DEFINES_STRING)
-JOIN("-I${OSRM_INCLUDE_PATHS}" " -I" OSRM_INCLUDE_PATHS_STRING)
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig.in libosrm.pc @ONLY)
-install(FILES ${PROJECT_BINARY_DIR}/libosrm.pc DESTINATION lib/pkgconfig)
+# prefix compilation with ccache by default if available and on clang or gcc
+if(ENABLE_CCACHE AND (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU"))
+  find_program(CCACHE_FOUND ccache)
+  if(CCACHE_FOUND)
+    message(STATUS "Using ccache to speed up incremental builds")
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+    set(ENV{CCACHE_CPP2} "true")
+  endif()
+endif()

 # uninstall target
 configure_file(
@@ -652,16 +454,3 @@ add_custom_target(uninstall
 # Modular build system: each directory registered here provides its own CMakeLists.txt
 add_subdirectory(unit_tests)
 add_subdirectory(src/benchmarks)
-
-if (ENABLE_FUZZING)
-  # Requires libosrm being built with sanitizers; make configurable and default to ubsan
-  set(FUZZ_SANITIZER "undefined" CACHE STRING "Sanitizer to be used for Fuzz testing")
-  set_property(CACHE FUZZ_SANITIZER PROPERTY STRINGS "undefined" "integer" "address" "memory" "thread" "leak")
-
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize-coverage=edge,indirect-calls,8bit-counters -fsanitize=address")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
-
-  message(STATUS "Using -fsanitize=${FUZZ_SANITIZER} for Fuzz testing")
-
-  add_subdirectory(fuzz)
-endif ()
@@ -1,55 +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`.
-
-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.
-
@@ -4,16 +4,13 @@ The Open Source Routing Machine is a high performance routing engine written in

 ## Current build status

-| 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) |
-
-## Contact
-
- IRC: server `irc.oftc.net`, channel: `#osrm` (see: `https://www.oftc.net`, and for a webchat: `https://webchat.oftc.net`)
- Mailinglist: `https://lists.openstreetmap.org/listinfo/osrm-talk`
+| build config |  branch | status |
+|:-------------|:--------|:------------|
+| Linux        | master  | [![Build Status](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=master)](https://travis-ci.org/Project-OSRM/osrm-backend) |
+| Linux        | develop | [![Build Status](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=develop)](https://travis-ci.org/Project-OSRM/osrm-backend) |
+| Windows      | master/develop | [![Build status](https://ci.appveyor.com/api/projects/status/4iuo3s9gxprmcjjh)](https://ci.appveyor.com/project/DennisOSRM/osrm-backend) |
+| LUAbind fork | master  | [![Build Status](https://travis-ci.org/DennisOSRM/luabind.png?branch=master)](https://travis-ci.org/DennisOSRM/luabind) |
+| Coverage     | develop | [![Coverage Status](https://coveralls.io/repos/github/Project-OSRM/osrm-backend/badge.svg?branch=develop)](https://coveralls.io/github/Project-OSRM/osrm-backend?branch=develop) |

 ## Building

@@ -23,46 +20,7 @@ To quickly try OSRM use our [free and daily updated online service](http://map.p

 ## Documentation

-### Full documentation
-
- [osrm-routed HTTP API documentation](docs/http.md)
- [libosrm API documentation](docs/libosrm.md)
-
-### Quick start
-
-Building OSRM assuming all dependencies are installed:
-
-```
-mkdir -p build
-cd build
-cmake .. -DCMAKE_BUILD_TYPE=Release
-cmake --build .
-sudo cmake --build . --target install
-```
-
-Loading preparing a dataset and starting the server:
-
-```
-osrm-extract data.osm.pbf -p profiles/car.lua
-osrm-contract data.osrm
-osrm-routed data.osrm
-```
-
-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&alternatives=true
-```
-
-### Running a request against the Demo Server
-
-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
-```
+See the Wiki's [server API documentation](https://github.com/Project-OSRM/osrm-backend/wiki/Server-api) as well as the [library API documentation](https://github.com/Project-OSRM/osrm-backend/wiki/Library-api)

 ## References in publications

@@ -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.0" && 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.0-rc2
-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
@@ -129,7 +129,7 @@ ECHO running server-tests.exe ...
 unit_tests\%Configuration%\server-tests.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR

-IF NOT "%APPVEYOR_REPO_BRANCH%"=="master" GOTO DONE
+IF NOT "%APPVEYOR_REPO_BRANCH%"=="develop" GOTO DONE
 ECHO ========= CREATING PACKAGES ==========

 CD %PROJECT_DIR%\build\%Configuration%
@@ -28,6 +28,7 @@ artifacts:
 branches:
  only:
    - master
+    - develop

 deploy:
  provider: FTP
@@ -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,188 +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}")
-    # 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()
@@ -3,34 +3,16 @@
 #  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>

-# First we try using EXACT but in some verison of
-# cmake this would also match patch versions
-FIND_PACKAGE(Lua 5.2 EXACT)
-IF (LUA_FOUND)
-    MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}")
-ELSE()
-  FIND_PACKAGE(Lua 5.1 EXACT)
-  IF (LUA_FOUND)
-    MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}")
-  ELSE()
-    # Now fall back to a lua verison without exact
-    # in case this cmake version also forces patch versions
-    FIND_PACKAGE(Lua 5.2)
-    IF (LUA_FOUND)
-        MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}")
-    ELSE()
-      FIND_PACKAGE(Lua 5.1)
-      IF (LUA_FOUND)
-        MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}")
-      ELSE()
-        MESSAGE(FATAL_ERROR "Lua 5.1 or 5.2 was not found.")
-      ENDIF()
-    ENDIF()
-  ENDIF()
+IF( NOT LUABIND_FIND_QUIETLY )
+    MESSAGE(STATUS "Looking for Luabind...")
 ENDIF()

-
 FIND_PATH(LUABIND_INCLUDE_DIR luabind.hpp
  HINTS
  $ENV{LUABIND_DIR}
@@ -280,5 +280,4 @@ if (TBB_FOUND)
 	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,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()
@@ -8,4 +8,4 @@ Version: v@OSRM_VERSION_MAJOR@.@OSRM_VERSION_MINOR@.@OSRM_VERSION_PATCH@
 Requires:
 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@
+Cflags: -I${includedir} -I${includedir}/osrm
@@ -1,7 +0,0 @@
-coverage:
-
-  ignore:
-    - unit_tests/.*
-    - third_party/.*
-
-comment: off
@@ -1,8 +1,10 @@
 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'
+    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,18 +1,19 @@
 FROM ubuntu:14.04

-RUN apt-get update -y && apt-get install -y  software-properties-common
-RUN add-apt-repository ppa:ubuntu-toolchain-r/test
-RUN apt-get update -y && apt-get install -y g++-5 libbz2-dev libstxxl-dev libstxxl1 libxml2-dev libzip-dev lua5.1 liblua5.1-0-dev libtbb-dev libgdal-dev libluabind-dev libboost-all-dev ccache
-RUN apt-get -y install curl cmake cmake-curses-gui git
+RUN apt-get update -y
+RUN apt-get install -y build-essential git-core python-pip python-software-properties software-properties-common

-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 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 ruby1.9
+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 useradd -ms /bin/bash mapbox
 USER mapbox
 ENV HOME /home/mapbox
 WORKDIR /home/mapbox
-
-RUN echo "source /opt/nvm/nvm.sh" > .bashrc
-RUN echo "source /home/mapbox/.bashrc" > .profile
@@ -8,4 +8,4 @@ docker run \
    -e "CXX=clang++" \
    -v `pwd`:/home/mapbox/osrm-backend \
    -t mapbox/osrm:linux \
-    /bin/bash -lc "osrm-backend/docker/test.sh"
+    osrm-backend/docker/test.sh
@@ -5,8 +5,7 @@ set -o pipefail

 docker run \
    -i \
-    -e "CXX=g++-5" \
-    -e "CC=gcc-5" \
+    -e "CXX=g++" \
    -v `pwd`:/home/mapbox/osrm-backend \
    -t mapbox/osrm:linux \
-    /bin/bash -lc "osrm-backend/docker/test.sh"
+    osrm-backend/docker/test.sh
@@ -4,8 +4,11 @@ set -e
 set -o pipefail

 export CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Release"
+export PATH=$PATH:/home/mapbox/.gem/ruby/1.9.1/bin:/home/mapbox/osrm-backend/vendor/bundle/ruby/1.9.1/bin

 cd /home/mapbox/osrm-backend
+gem install --user-install bundler
+bundle install --path vendor/bundle
 [ -d build ] && rm -rf build
 mkdir -p build
 cd build
@@ -13,9 +16,7 @@ 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
+./datastructure-tests
+./algorithm-tests
 cd ..
-npm test
+bundle exec cucumber -p verify
@@ -1,61 +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);`
-
-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,675 +0,0 @@
-## Environent 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.
-
-## HTTP API
-
-`osrm-routed` supports only `GET` requests of the form. If you your response size
-exceeds the limits of a simple URL encoding, consider using our [NodeJS bindings](https://github.com/Project-OSRM/node-osrm)
-or using the [C++ library directly](libosrm.md).
-
-### Request
-
-```
-http://{server}/{service}/{version}/{profile}/{coordinates}[.{format}]?option=value&option=value
-```
-
- `server`: location of the server. Example: `127.0.0.1:5000` (default)
- `service`: Name of the service to be used. Support are the following services:
-  
-    | Service     |           Description                                     |
-    |-------------|-----------------------------------------------------------|
-    | [`route`](#service-route)     | fastest path between given coordinates                   |
-    | [`nearest`](#service-nearest)   | returns the nearest street segment for a given coordinate |
-    | [`table`](#service-table)     | computes distance tables for given coordinates            |
-    | [`match`](#service-match)     | matches given coordinates to the road network             |
-    | [`trip`](#service-trip)      | Compute the fastest round trip between given coordinates |
-    | [`tile`](#service-tile)      | Return vector tiles containing debugging info             |
-  
- `version`: Version of the protocol implemented by the service.
- `profile`: Mode of transportation, is determined statically by the Lua profile that is used to prepare the data using `osrm-extract`.
- `coordinates`: String of format `{longitude},{latitude};{longitude},{latitude}[;{longitude},{latitude} ...]` or `polyline({polyline})`.
- `format`: Only `json` is supported at the moment. This parameter is optional and defaults to `json`.
-
-Passing any `option=value` is optional. `polyline` follows Google's polyline format with precision 5 and can be generated using [this package](https://www.npmjs.com/package/polyline).
-To pass parameters to each location some options support an array like encoding:
-
-```
-{option}={element};{element}[;{element} ... ]
-```
-
-The number of elements must match exactly the number of locations. If you don't want to pass a value but instead use the default you can pass an empty `element`.
-
-Example: 2nd location use the default value for `option`:
-
-```
-{option}={element};;{element}
-```
-
-## General options
-
-| Option     | Values                                                 | Description                                      |
-|------------|--------------------------------------------------------|--------------------------------------------------|
-|bearings    |`{bearing};{bearing}[;{bearing} ...]`                   |Limits the search to segments with given bearing in degrees towards true north in clockwise direction. |
-|radiuses    |`{radius};{radius}[;{radius} ...]`                      |Limits the search to given radius in meters.      |
-|hints       |`{hint};{hint}[;{hint} ...]`                            |Hint to derive position in street network.        |
-
-Where the elements follow the following format:
-
-| Element    | Values                                                 |
-|------------|--------------------------------------------------------|
-|bearing     |`{value},{range}` `integer 0 .. 360,integer 0 .. 180`  |
-|radius      |`double >= 0` or `unlimited` (default)                  |
-|hint        |Base64 `string`                                         |
-
-#### Examples
-
-Query on Berlin with three coordinates:
-
-```
-http://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219?overview=false
-```
-
-Using polyline:
-
-```
-http://router.project-osrm.org/route/v1/driving/polyline(ofp_Ik_vpAilAyu@te@g`E)?overview=false
-```
-
-### Response
-
-Every response object has a `code` field.
-
-```json
-{
-"code": {code},
-"message": {message}
-}
-```
-
-Where `code` is on one of the strings below or service dependent:
-
-| Type              | Description                                                                      |
-|-------------------|----------------------------------------------------------------------------------|
-| `Ok`              | Request could be processed as expected.                                          |
-| `InvalidUrl`      | URL string is invalid.                                                           |
-| `InvalidService`  | Service name is invalid.                                                         |
-| `InvalidVersion`  | Version is not found.                                                            |
-| `InvalidOptions`  | Options are invalid.                                                             |
-| `InvalidQuery`    | The query string is synctactically malformed.                                    |
-| `InvalidValue`    | The successfully parsed query parameters are invalid.                            |
-| `NoSegment`       | One of the supplied input coordinates could not snap to street segment.          |
-| `TooBig`          | The request size violates one of the service specific request size restrictions. |
-
-`message` is a **optional** human-readable error message. All other status types are service dependent.
-
-In case of an error the HTTP status code will be `400`. Otherwise the HTTP status code will be `200` and `code` will be `Ok`.
-
-## Service `nearest`
-
-Snaps a coordinate to the street network and returns the nearest n matches.
-
-### Request
-
-```
-http://{server}/nearest/v1/{profile}/{coordinates}.json?number={number}
-```
-
-Where `coordinates` only supports a single `{longitude},{latitude}` entry.
-
-In addition to the [general options](#general-options) the following options are supported for this service:
-
-|Option      |Values                        |Description                                         |
-|------------|------------------------------|----------------------------------------------------|
-|number      |`integer >= 1` (default `1`)  |Number of nearest segments that should be returned. |
-
-### Response
-
- `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
- `waypoints` array of `Waypoint` objects sorted by distance to the input coordinate. Each object has at least the following additional properties:
-  - `distance`: Distance in meters to the supplied input coordinate.
-
-### Examples
-
-Querying nearest three snapped locations of `13.388860,52.517037` with a bearing between `20° - 340°`.
-
-```
-http://router.project-osrm.org/nearest/v1/driving/13.388860,52.517037?number=3&bearings=0,20
-```
-
-## Service `route`
-
-### Request
-
-```
-http://{server}/route/v1/{profile}/{coordinates}?alternatives={true|false}&steps={true|false}&geometries={polyline|polyline6|geojson}&overview={full|simplified|false}&annotations={true|false}
-```
-
-In addition to the [general options](#general-options) the following options are supported for this service:
-
-|Option      |Values                                       |Description                                                                    |
-|------------|---------------------------------------------|-------------------------------------------------------------------------------|
-|alternatives|`true`, `false` (default)                    |Search for alternative routes and return as well.\*                            |
-|steps       |`true`, `false` (default)                    |Return route steps for each route leg                                          |
-|annotations |`true`, `false` (default)                    |Returns additional metadata for each coordinate along the route geometry.      |
-|geometries  |`polyline` (default), `polyline6`, `geojson` |Returned route geometry format (influences overview and per step)              |
-|overview    |`simplified` (default), `full`, `false`      |Add overview geometry either full, simplified according to highest zoom level it could be display on, or not at all.|
-|continue_straight |`default` (default), `true`, `false`   |Forces the route to keep going straight at waypoints and don't do a uturn even if it would be faster. Default value depends on the profile. |
-
-\* Please note that even if an alternative route is requested, a result cannot be guaranteed.
-
-### Response
-
- `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
- `waypoints`: Array of `Waypoint` objects representing all waypoints in order:
- `routes`: An array of `Route` objects, ordered by descending recommendation rank.
-
-In case of error the following `code`s are supported in addition to the general ones:
-
-| Type              | Description     |
-|-------------------|-----------------|
-| `NoRoute`         | No route found. |
-
-All other fields might be undefined.
-
-### Example
-
-Query on Berlin with three coordinates and no overview geometry returned:
-
-```
-http://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219?overview=false
-```
-
-## Service `table`
-### Request
-```
-http://{server}/table/v1/{profile}/{coordinates}?{sources}=[{elem}...];&destinations=[{elem}...]`
-```
-
-This computes duration tables for the given locations. Allows for both symmetric and asymmetric tables.
-
-### Coordinates
-
-In addition to the [general options](#general-options) the following options are supported for this service:
-
-|Option      |Values                                            |Description                                  |
-|------------|--------------------------------------------------|---------------------------------------------|
-|sources     |`{index};{index}[;{index} ...]` or `all` (default)|Use location with given index as source.     |
-|destinations|`{index};{index}[;{index} ...]` or `all` (default)|Use location with given index as destination.|
-
-Unlike other array encoded options, the length of `sources` and `destinations` can be **smaller or equal**
-to number of input locations;
-
-Example:
-
-```
-sources=0;5;7&destinations=5;1;4;2;3;6
-```
-
-|Element     |Values                       |
-|------------|-----------------------------|
-|index       |`0 <= integer < #locations`  |
-
-### Response
-
- `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
- `durations` array of arrays that stores the matrix in row-major order. `durations[i][j]` gives the travel time from
-  the i-th waypoint to the j-th waypoint. Values are given in seconds.
- `sources` array of `Waypoint` objects describing all sources in order
- `destinations` array of `Waypoint` objects describing all destinations in order
-
-In case of error the following `code`s are supported in addition to the general ones:
-
-| Type              | Description     |
-|-------------------|-----------------|
-| `NoTable`        | No route found. |
-
-All other fields might be undefined.
-
-#### Examples
-
-Returns a `3x3` matrix:
-```
-http://router.project-osrm.org/table/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219
-```
-
-Returns a `1x3` matrix:
-```
-http://router.project-osrm.org/table/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219?sources=0
-```
-
-Returns a asymmetric 3x2 matrix with from the polyline encoded locations `qikdcB}~dpXkkHz`:
-```
-http://router.project-osrm.org/table/v1/driving/polyline(egs_Iq_aqAppHzbHulFzeMe`EuvKpnCglA)?sources=0;1;3&destinations=2;4
-```
-
-## Service `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.
-
-### Request
-
-```
-http://{server}/match/v1/{profile}/{coordinates}?steps={true|false}&geometries={polyline|polyline6|geojson}&overview={simplified|full|false}&annotations={true|false}
-```
-
-In addition to the [general options](#general-options) the following options are supported for this service:
-
-
-|Option      |Values                                          |Description                                                                               |
-|------------|------------------------------------------------|------------------------------------------------------------------------------------------|
-|steps       |`true`, `false` (default)                       |Return route steps for each route                                                         |
-|geometries  |`polyline` (default), `polyline6`, `geojson`    |Returned route geometry format (influences overview and per step)                         |
-|annotations |`true`, `false` (default)                       |Returns additional metadata for each coordinate along the route geometry.                 |
-|overview    |`simplified` (default), `full`, `false`         |Add overview geometry either full, simplified according to highest zoom level it could be display on, or not at all.|
-|timestamps  |`{timestamp};{timestamp}[;{timestamp} ...]`     |Timestamp of the input location. Timestamps need to be monotonically increasing.          |
-|radiuses    |`{radius};{radius}[;{radius} ...]`              |Standard deviation of GPS precision used for map matching. If applicable use GPS accuracy.|
-
-|Parameter   |Values                        |
-|------------|------------------------------|
-|timestamp   |`integer` UNIX-like timestamp |
-|radius      |`double >= 0` (default 5m)    |
-
-### Response
- `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
- `tracepoints`: Array of `Waypoint` objects representing all points of the trace in order.
-  If the trace point was ommited by map matching because it is an outlier, the entry will be `null`.
-  Each `Waypoint` object has the following additional properties:
-  - `matchings_index`: Index to the `Route` object in `matchings` the sub-trace was matched to.
-  - `waypoint_index`: Index of the waypoint inside the matched route.
- `matchings`: An array of `Route` objects that assemble the trace. Each `Route` object has the following additional properties:
-  - `confidence`: Confidence of the matching. `float` value between 0 and 1. 1 is very confident that the matching is correct.
-
-In case of error the following `code`s are supported in addition to the general ones:
-
-| Type              | Description         |
-|-------------------|---------------------|
-| `NoMatch`         | No matchings found. |
-
-All other fields might be undefined.
-
-## Service `trip`
-
-The trip plugin solves the Traveling Salesman Problem using a greedy heuristic (farthest-insertion algorithm).
-The returned path does not have to be the fastest path, as TSP is NP-hard it is only an approximation.
-Note that if the input coordinates can not be joined by a single trip (e.g. the coordinates are on several disconnected islands)
-multiple trips for each connected component are returned.
-
-### Request
-
-```
-http://{server}/trip/v1/{profile}/{coordinates}?steps={true|false}&geometries={polyline|polyline6|geojson}&overview={simplified|full|false}&annotations={true|false}
-```
-
-In addition to the [general options](#general-options) the following options are supported for this service:
-
-|Option      |Values                                          |Description                                                                |
-|------------|------------------------------------------------|---------------------------------------------------------------------------|
-|steps       |`true`, `false` (default)                       |Return route instructions for each trip                                    |
-|annotations |`true`, `false` (default)                       |Returns additional metadata for each coordinate along the route geometry.  |
-|geometries  |`polyline` (default), `polyline6`, `geojson`    |Returned route geometry format (influences overview and per step)          |
-|overview    |`simplified` (default), `full`, `false`         |Add overview geometry either full, simplified according to highest zoom level it could be display on, or not at all.|
-
-### Response
-
- `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
- `waypoints`: Array of `Waypoint` objects representing all waypoints in input order. Each `Waypoint` object has the following additional properties:
-  - `trips_index`: Index to `trips` of the sub-trip the point was matched to.
-  - `waypoint_index`: Index of the point in the trip.
- `trips`: An array of `Route` objects that assemble the trace.
-
-In case of error the following `code`s are supported in addition to the general ones:
-
-| Type              | Description         |
-|-------------------|---------------------|
-| `NoTrips`         | No trips found.     |
-
-All other fields might be undefined.
-
-## Result objects
-
-### Route
-
-Represents a route through (potentially multiple) waypoints.
-
-#### Properties
-
- `distance`: The distance traveled by the route, in `float` meters.
- `duration`: The estimated travel time, in `float` number of seconds.
- `geometry`: The whole geometry of the route value depending on `overview` parameter, format depending on the `geometries` parameter. See `RouteStep`'s `geometry` field for a parameter documentation.
-  
-  | overview   | Description                 |
-  |------------|-----------------------------|
-  | simplified | Geometry is simplified according to the highest zoom level it can still be displayed on full. |
-  | full       | Geometry is not simplified. |
-  | false      | Geometry is not added.      |
-  
- `legs`: The legs between the given waypoints, an array of `RouteLeg` objects.
-
-#### Example
-
-Three input coordinates, `geometry=geojson`, `steps=false`:
-
-```json
-{
-  "distance": 90.0,
-  "duration": 300.0,
-  "geometry": {"type": "LineString", "coordinates": [[120.0, 10.0], [120.1, 10.0], [120.2, 10.0], [120.3, 10.0]]},
-  "legs": [
-    {
-      "distance": 30.0,
-      "duration": 100.0,
-      "steps": []
-    },
-    {
-      "distance": 60.0,
-      "duration": 200.0,
-      "steps": []
-    }
-  ]
-}
-```
-
-### RouteLeg
-
-Represents a route between two waypoints.
-
-#### Properties
-
- `distance`: The distance traveled by this route leg, in `float` meters.
- `duration`: The estimated travel time, in `float` number of seconds.
- `summary`: Summary of the route taken as `string`. Depends on the `steps` parameter:
-   
-   | steps        |                                                                       |
-   |--------------|-----------------------------------------------------------------------|
-   | true         | Names of the two major roads used. Can be empty if route is too short.|
-   | false        | empty `string`                                                        |
-
- `steps`: Depends on the `steps` parameter.
-   
-   | steps        |                                                                       |
-   |--------------|-----------------------------------------------------------------------|
-   | true         | array of `RouteStep` objects describing the turn-by-turn instructions |
-   | false        | empty array                                                           |
-
- `annotation`: Additional details about each coordinate along the route geometry:
-
-   | annotations  |                                                                       |
-   |--------------|-----------------------------------------------------------------------|
-   | true         | An `Annotation` object containing node ids, durations and distances   |
-   | false        | `undefined`                                                           |
-
-#### Example
-
-With `steps=false` and `annotations=true`:
-
-```json
-{
-  "distance": 30.0,
-  "duration": 100.0,
-  "steps": [],
-  "annotation": {
-    "distance": [5,5,10,5,5],
-    "duration": [15,15,40,15,15],
-    "datasources": [1,0,0,0,1],
-    "nodes": [49772551,49772552,49786799,49786800,49786801,49786802]
-  }
-}
-```
-
-### Annotation
-
-Annotation of the whole route leg with fine-grained information about each segment or node id.
-
-#### Properties
-
- `distance`: The distance, in metres, between each pair of coordinates
- `duration`: The duration between each pair of coordinates, in seconds
- `datasources`: The index of the datasource for the speed between each pair of coordinates. `0` is the default profile, other values are supplied via `--segment-speed-file` to `osrm-contract`
- `nodes`: The OSM node ID for each coordinate along the route, excluding the first/last user-supplied coordinates
-
-#### Example
-
-```json
-{
-  "distance": [5,5,10,5,5],
-  "duration": [15,15,40,15,15],
-  "datasources": [1,0,0,0,1],
-  "nodes": [49772551,49772552,49786799,49786800,49786801,49786802]
-}
-```
-
-
-### 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.
-
-#### Properties
-
- `distance`: The distance of travel from the maneuver to the subsequent step, in `float` meters.
- `duration`: The estimated travel time, in `float` number of seconds.
- `geometry`: The unsimplified geometry of the route segment, depending on the `geometries` parameter.
-  
-  | geometries |                                                                    |
-  |------------|--------------------------------------------------------------------|
-  | polyline   | [polyline](https://www.npmjs.com/package/polyline) with precision 5 in [latitude,longitude] encoding |
-  | polyline6  | [polyline](https://www.npmjs.com/package/polyline) with precision 6 in [latitude,longitude] encoding |
-  | geojson    | [GeoJSON `LineString`](http://geojson.org/geojson-spec.html#linestring) or [GeoJSON `Point`](http://geojson.org/geojson-spec.html#point) if it is only one coordinate (not wrapped by a GeoJSON feature)|
-  
- `name`: The name of the way along which travel proceeds.
- `ref`: A reference number or code for the way. Optionally included, if ref data is available for the given way.
- `pronunciation`: The pronunciation hint of the way name. Will be `undefined` if there is no pronunciation hit.
- `destinations`: The destinations of the way. Will be `undefined` if there are no destinations.
- `mode`: A string signifying the mode of transportation.
- `maneuver`: A `StepManeuver` object representing the maneuver.
- `intersections`: A list of `Intersection` objects that are passed along the segment, the very first belonging to the StepManeuver
-
-#### Example
-
-```
-{
- "distance":152.3,
- "duration":15.6,
- "name":"Lortzingstraße",
- "maneuver":{
-     "type":"turn",
-     "modifier":"right",
-     },
- "geometry":"{lu_IypwpAVrAvAdI",
- "mode":"driving",
- "intersections":[
-    {"location":[13.39677,52.54366],
-    "in":3,
-    "out":2,
-    "bearings":[10,92,184,270],
-    "entry":["true","true","true","false"],
-    "lanes":[
-         {"indications":["left","straight"], "valid":"false"},
-         {"indications":["right"], "valid":"true"}
-    ]},
-    {"location":[13.394718,52.543096],
-    "in":0,
-    "out":1,
-    "bearings":[60,240,330],
-    "entry":["false","true","true"]
-    "lanes":[
-         {"indications":["straight"], "valid":"true"},
-         {"indications":["right"], "valid":"false"}
-     ]}
-]}
-```
-
-### StepManeuver
-
-#### Properties
-
- `location`: A `[longitude, latitude]` pair describing the location of the turn.
- `bearing_before`: The clockwise angle from true north to the
-  direction of travel immediately before the maneuver.
- `bearing_after`: The clockwise angle from true north to the
-  direction of travel immediately after the maneuver.
- `type` A string indicating the type of maneuver. **new identifiers might be introduced without API change**
-   Types  unknown to the client should be handled like the `turn` type, the existance of correct `modifier` values is guranteed.
-  
-  | `type`           | Description                                                  |
-  |------------------|--------------------------------------------------------------|
-  | `turn`           | a basic turn into direction of the `modifier`                |
-  | `new name`       | no turn is taken/possible, but the road name changes. The road can take a turn itself, following `modifier`.                  |
-  | `depart`         | indicates the departure of the leg                           |
-  | `arrive`         | indicates the destination of the leg                         |
-  | `merge`          | merge onto a street (e.g. getting on the highway from a ramp, the `modifier specifies the direction of the merge`) |
-  | `ramp`           | **Deprecated**. Replaced by `on_ramp` and `off_ramp`.        |
-  | `on ramp`        | take a ramp to enter a highway (direction given my `modifier`) |
-  | `off ramp`       | take a ramp to exit a highway (direction given my `modifier`)  |
-  | `fork`           | take the left/right side at a fork depending on `modifier`   |
-  | `end of road`    | road ends in a T intersection turn in direction of `modifier`|
-  | `use lane`       | going straight on a specific lane                            |
-  | `continue`       | Turn in direction of `modifier` to stay on the same road     |
-  | `roundabout`     | traverse roundabout, has additional field `exit` with NR if the roundabout is left. `the modifier specifies the direction of entering the roundabout` |
-  | `rotary`         | a larger version of a roundabout, can offer `rotary_name/rotary_pronunciation` in addition to the `exit` parameter.  |
-  | `roundabout turn`| Describes a turn at a small roundabout that should be treated as normal turn. The `modifier` indicates the turn direciton. Example instruction: `At the roundabout turn left`. |
-  | `notification`   | not an actual turn but a change in the driving conditions. For example the travel mode.  If the road takes a turn itself, the `modifier` describes the direction |
-
-  Please note that even though there are `new name` and `notification` instructions, the `mode` and `name` can change
-  between all instructions. They only offer a fallback in case nothing else is to report.
-
- `modifier` An optional `string` indicating the direction change of the maneuver.
-  
-  | `modifier`        | Description                               |
-  |-------------------|-------------------------------------------|
-  | `uturn`           | indicates  reversal of direction          |
-  | `sharp right`     | a sharp right turn                        |
-  | `right`           | a normal turn to the right                |
-  | `slight right`    | a slight turn to the right                |
-  | `straight`        | no relevant change in direction           |
-  | `slight left`     | a slight turn to the left                 |
-  | `left`            | a normal turn to the left                 |
-  | `sharp left`      | a sharp turn to the left                  |
-  
-  The list of turns without a modifier is limited to: `depart/arrive`. If the source/target location is close enough to the `depart/arrive` location, no modifier will be given.
-  
-  The meaning depends on the `type` field.
-  
-  | `type`                 | Description                                                                                                               |
-  |------------------------|---------------------------------------------------------------------------------------------------------------------------|
-  | `turn`                 | `modifier` indicates the change in direction accomplished through the turn                                                |
-  | `depart`/`arrive`      | `modifier` indicates the position of departure point and arrival point in relation to the current direction of travel      |
-  
- `exit` An optional `integer` indicating number of the exit to take. The field exists for the following `type` field:
-  
-  | `type`                 | Description                                                                                                               |
-  |------------------------|---------------------------------------------------------------------------------------------------------------------------|
-  | `roundabout`/`rotary`         | Number of the roundabout exit to take. If exit is `undefined` the destination is on the roundabout.                       |
-  | else                   | Indicates the number of intersections passed until the turn. Example instruction: `at the fourth intersection, turn left` |
-
-
-New properties (potentially depending on `type`) may be introduced in the future without an API version change.
-
-### Lane
-
-A `Lane` represents a turn lane at the corresponding turn location.
-
-#### Properties
-
- `indications`: a indication (e.g. marking on the road) specifying the turn lane. A road can have multiple indications (e.g. an arrow pointing straight and left). The indications are given in an array, each containing one of the following types. Further indications might be added on without an API version change.
-  
-  | `value`                | Description                                                                                                               |
-  |------------------------|---------------------------------------------------------------------------------------------------------------------------|
-  | `none`                 | No dedicated indication is shown.                                                                                         |
-  | `uturn`                | An indication signaling the possibility to reverse (i.e. fully bend arrow).                                               |
-  | `sharp right`          | An indication indicating a sharp right turn (i.e. strongly bend arrow).                                                   |
-  | `right`                | An indication indicating a right turn (i.e. bend arrow).                                                                  |
-  | `slight right`         | An indication indicating a slight right turn (i.e. slightly bend arrow).                                                  |
-  | `straight`             | No dedicated indication is shown (i.e. straight arrow).                                                                   |
-  | `slight left`          | An indication indicating a slight left turn (i.e. slightly bend arrow).                                                   |
-  | `left`                 | An indication indicating a left turn (i.e. bend arrow).                                                                   |
-  | `sharp left`           | An indication indicating a sharp left turn (i.e. strongly bend arrow).                                                    |
-  
- `valid`: a boolean flag indicating whether the lane is a valid choice in the current maneuver
-
-#### Example
-
-```json
-{
-    "indications": ["left", "straight"],
-    "valid": "false"
-}
- ```
-
-### Intersection
-
-An intersection gives a full representation of any cross-way the path passes bay. For every step, the very first intersection (`intersections[0]`) corresponds to the
-location of the StepManeuver. Further intersections are listed for every cross-way until the next turn instruction.
-
-#### Properties
-
- `location`: A `[longitude, latitude]` pair describing the location of the turn.
- `bearings`: A list of bearing values (e.g. [0,90,180,270]) that are available at the intersection. The bearings describe all available roads at the intersection.
- `entry`: A list of entry flags, corresponding in a 1:1 relationship to the bearings. A value of `true` indicates that the respective road could be entered on a valid route.
-  `false` indicates that the turn onto the respective road would violate a restriction.
- `in`: index into bearings/entry array. Used to calculate the bearing just before the turn. Namely, the clockwise angle from true north to the
-  direction of travel immediately before the maneuver/passing the intersection. Bearings are given relative to the intersection. To get the bearing
-  in the direction of driving, the bearing has to be rotated by a value of 180. The value is not supplied for `depart` maneuvers.
- `out`: index into the bearings/entry array. Used to extract the bearing just after the turn. Namely, The clockwise angle from true north to the
-  direction of travel immediately after the maneuver/passing the intersection. The value is not supplied for `arrive` maneuvers.
- `lanes`: Array of `Lane` objects that denote the available turn lanes at the intersection. If no lane information is available for an intersection, the `lanes` property will not be present.
-
-#### Example
-```
-{
-    "location":[13.394718,52.543096],
-    "in":0,
-    "out":2,
-    "bearings":[60,150,240,330],
-    "entry":["false","true","true","true"]
-    "lanes":{
-        "indications": ["left", "straight"],
-        "valid": "false"
-    }
-                                                                                                                               ]}
-}
-```
-
-### Waypoint
-
-Object used to describe waypoint on a route.
-
-#### Properties
-
- `name` Name of the street the coordinate snapped to
- `location` Array that contains the `[longitude, latitude]` pair of the snapped coordinate
- `hint` Unique internal identifier of the segment (ephemeral, not constant over data updates)
-   This can be used on subsequent request to significantly speed up the query and to connect multiple services.
-   E.g. you can use the `hint` value obtained by the `nearest` query as `hint` values for `route` inputs.
-
-## Service `tile`
-
-This generates [Mapbox Vector Tiles](https://www.mapbox.com/developers/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.
-
-### Request
-```
-http://{server}/tile/v1/{profile}/tile({x},{y},{zoom}).mvt
-```
-
-The `x`, `y`, and `zoom` values are the same as described at 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/).
-
-### Response
-
-The response object is either a binary encoded blob with a `Content-Type` of `application/x-protobuf`, or a `404` error.  Note that OSRM is hard-coded to only return tiles from zoom level 12 and higher (to avoid accidentally returning extremely large vector tiles).
-
-Vector tiles contain just a single layer named `speeds`.  Within that layer, features can have `speed` (int) and `is_small` (boolean) attributes.
@@ -1,26 +0,0 @@
-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:
-
- [`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.
-
- [`Status`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/status.hpp) - this is a type wrapping `Error` or `Ok` for indicating error or success, respectively.
-
- [`TableParameters`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/api/table_parameters.hpp) - this is an example of parameter types the Routing Machine functions expect. In this case `Table` expects its own parameters as `TableParameters`. You can see it wrapping two vectors, sources and destinations --- these are indices into your coordinates for the table service to construct a matrix from (empty sources or destinations means: use all of them). If you ask yourself where coordinates come from, you can see `TableParameters` inheriting from `BaseParameters`.
-
- [`BaseParameter`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/api/base_parameters.hpp) - this most importantly holds coordinates (and a few other optional properties that you don't need for basic usage); the specific parameter types inherit from `BaseParameters` to get these member attributes. That means your `TableParameters` type has `coordinates`, `sources` and `destination` member attributes (and a few other that we ignore for now).
-
- [`Coordinate`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/util/coordinate.hpp) - this is a wrapper around a (longitude, latitude) pair. We really don't care about (lon,lat) vs (lat, lon) but we don't want you to accidentally mix them up, so both latitude and longitude are strictly typed wrappers around integers (fixed notation such as `13423240`) and floating points (floating notation such as `13.42324`).
-
- [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) (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]].
-
------------------------------------------------------------------------------------------------------------------
-
-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,47 +0,0 @@
-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 several different profiles, including car, bicycle and foot.
-
-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 -p ../profiles/car.lua planet-latest.osm.pbf`
-
-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))
-
-## lua scripts?
-
-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 a profile
-
-You can understand these lua scripts enough to make interesting modifications, without needing to get to grips with how they work completely.
-
-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.
-
-As you scroll down the file you'll see local variables, and then local functions, and finally...
-
-`way_function` and `node_function` are the important functions which are called when extracting OpenStreetMap data with `osrm-extract`.
-
-## way_function
-
-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.
-
-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)
-
-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.
-
-## Guidance
-
-The guidance parameters in profiles are currently a work in progress. They can and will change.
-Please be aware of this when using guidance configuration possibilities.
-
-### Road Classification
-
-Guidance uses road classes to decide on when/if to emit specific instructions and to discover which road is obvious when following a route.
-Classification uses three flags and a priority-category.
-The flags indicate whether a road is a motorway (required for on/off ramps), a link type (the ramps itself, if also a motorway) and whether a road may be omittted in considerations (is considered purely for connectivity).
-The priority-category influences the decision which road is considered the obvious choice and which roads can be seen as fork.
-Forks can be emitted between roads of similar priority category only. Obvious choices follow a major priority road, if the priority difference is large.
@@ -1,50 +0,0 @@
-# Releasing a new OSRM version
-
-We are using http://semver.org/ for versioning with major, minor and patch versions.
-
-## Guarantees
-
-We are giving the following guarantees between versions:
-
-### Major version change
-
- There are no guarantees about compatiblity of APIs or datasets
- Breaking changes will be noted as `BREAKING` in the changelog
-
-### Minor version change
-
-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.
-
- Forward-compatible HTTP API
- Forward-compatible C++ library API
- Forward-compatible node-osrm API
- No compatiblity between OSRM datasets (needs new processing)
-
-### Patch version change
-
- No change of query parameters or response formats
- Compatible HTTP API
- Compatible C++ library API
- Compatible node-osrm API
- Compatible OSRM datasets
-
-## 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
- No minor or major version will be released without a code-equal release candidates
- For quality assurance, release candidates will be run on the demo server for 24 hours before releaseing the version proper
- Patch versions may be released without a release candidate
- We may backport fixes to older versions and release them as patch versions
-
-## Releasing a version
-
-1. Check out the appropriate release branch `x.y`
-2. Make sure all tests are passing (e.g. Travis CI gives you a :thumbs_up:)
-3. Make sure `CHANGELOG.md` is up to date.
-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`
-8. Proceede with the `node-osrm` release as [outlined in the repository](https://github.com/Project-OSRM/node-osrm/blob/master/docs/releasing.md).
-9. If not a release-candidate: Write a mailing-list post to osrm-talk@openstreetmap.org to announce the release
-
@@ -1,311 +0,0 @@
-# Testsuite
-
-OSRM comes with a testsuite containing both unit-tests using the Boost library and cucucmber.js for scenario driven testing.
-
-## Unit Tests
-
-For a general introduction on Boost.Test have a look at [its docs](http://www.boost.org/doc/libs/1_60_0/libs/test/doc/html/index.html).
-
-### Separate Test Binaries
-
-Unit tests should be registered according to the sub-project they're in.
-If you want to write tests for utility functions, add them to the utility test binary.
-See `CMakeLists.txt` in the unit test directory for how to register new unit tests.
-
-### Using Boost.Test Primitives
-
-There is a difference between only reporting a failed condition and aborting the test right at a failed condition.
-Have a look at [`BOOST_CHECK` vs `BOOST_REQUIRE`](http://www.boost.org/doc/libs/1_60_0/libs/test/doc/html/boost_test/utf_reference/testing_tool_ref/assertion_boost_level.html).
-Instead of manually checking e.g. for equality, less than, if a function throws etc. use their [corresponding Boost.Test primitives](http://www.boost.org/doc/libs/1_60_0/libs/test/doc/html/boost_test/utf_reference/testing_tool_ref.html).
-
-If you use `BOOST_CHECK_EQUAL` you have to implement `operator<<` for your type so that Boost.Test can print mismatches.
-If you do not want to do this, define `BOOST_TEST_DONT_PRINT_LOG_VALUE` (and undef it after the check call) or sidestep it with `BOOST_CHECK(fst == snd);`.
-
-### Test Fixture
-
-If you need to test features on a real dataset (think about this twice: prefer cucumber and dataset-independent tests for their reproducibility and minimality), there is a fixed dataset in `test/data`.
-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.
-
-
-## Cucumber
-
-For a general introduction on cucumber in our testsuite, have a look at [the wiki](https://github.com/Project-OSRM/osrm-backend/wiki/Cucumber-Test-Suite).
-
-This documentation aims to supply a guideline on how to write cucumber tests that test new features introduced into osrm.
-
-### Test the feature
-
-It is often tempting to reduce the test to a path and accompanying instructions. Instructions can and will change over the course of improving guidance.
-
-Instructions should only be used when writing a feature located in `features/guidance`. All other features should avoid using instructions at all.
-
-### Write Tests to Scale
-
-OSRM is a navigation engine. Tests should always consider this background. 
-
-An important implication is the grid size. If tests use a very small grid size, you run into the chance of instructions being omitted.
-For example:
-
-```
-Background:
-    Given the profile "car"
-    Given a grid size of 10 meters
-
-Scenario: Testbot - Straight Road
-    Given the node map
-        """
-        a b c d
-        """
-
-    And the ways
-        | nodes | highway |
-        | ab    | primary |
-        | bc    | primary |
-        | cd    | primary |
-
-    When I route I should get
-        | from | to | route       |
-        | a    | d  | ab,bc,cd,cd |
-
-```
-
-In a navigation engine, the instructions
-
- - depart east on ab
- - in 10 meters the road name changes to bc
- - in 10 meters the road name changes to cd
- - you arrived at cd
- 
-would be impossible to announce and not helpful at all.
-Since no actual choices exist, the route you get could result in `ab,cd` and simply say `depart` and `arrive`.
-
-To prevent such surprises, always consider the availability of other roads and use grid sizes/road lengths that correspond to actually reasonable scenarios in a road network.
-
-### Use names
-
-If you specify many nodes in close succession to present a specific road geometry, consider using `name` to indicate to OSRM that the segment is a single road.
-
-```
-Background:
-    Given the profile "car"
-    Given a grid size of 10 meters
-
-Scenario: Testbot - Straight Road
-    Given the node map
-        """
-        a b c d
-        """
-
-    And the ways
-        | nodes | highway | name |
-        | ab    | primary | road |
-        | bc    | primary | road |
-        | cd    | primary | road |
-
-    When I route I should get
-        | from | to | route     | turns         |
-        | a    | d  | road,road | depart,arrive |
-
-```
-
-Guidance guarantees only essential maneuvers. You will always see `depart` and `arrive` as well as all turns that are not obvious.
-
-So the following scenario does not change the instructions
-
-```
-Background:
-    Given the profile "car"
-    Given a grid size of 10 meters
-
-Scenario: Testbot - Straight Road
-    Given the node map
-        """
-        a b
-        d c
-        """
-
-    And the ways
-        | nodes | highway | name |
-        | ab    | primary | road |
-        | bc    | primary | road |
-        | cd    | primary | road |
-
-    When I route I should get
-        | from | to | route     | turns         |
-        | a    | d  | road,road | depart,arrive |
-```
-
-but if we modify it to
-
-```
-Background:
-    Given the profile "car"
-    Given a grid size of 10 meters
-
-Scenario: Testbot - Straight Road
-    Given the node map
-        """
-        a b e
-        d c
-        """
-
-    And the ways
-        | nodes | highway | name |
-        | ab    | primary | road |
-        | bc    | primary | road |
-        | cd    | primary | road |
-        | be    | primary | turn |
-
-    When I route I should get
-        | from | to | route          | turns                        |
-        | a    | d  | road,road,road | depart,continue right,arrive |
-```
-
-### Test all directions
-
-Modelling a road as roundabout has an implied oneway tag associated with it. In the following case, we can route from `a` to `d` but not from `d` to `a`.
-To discover those errors, make sure to check for all allowed directions.
-
-```
-Scenario: Enter and Exit mini roundabout with sharp angle   # features/guidance/mini-roundabout.feature:37
-    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
-        """
-    And the ways                                              # features/step_definitions/data.js:128
-        | nodes | highway         | name |
-        | ab    | tertiary        | MySt |
-        | bc    | roundabout      |      |
-        | cd    | tertiary        | MySt |
-    When I route I should get                                 # features/step_definitions/routing.js:4
-        | from | to | route     | turns         | #                                               |
-        | a    | d  | MySt,MySt | depart,arrive | # suppress multiple enter/exit mini roundabouts |
-        | d    | a  | MySt,MySt | depart,arrive | # suppress multiple enter/exit mini roundabouts |
-    Tables were not identical:
-        |  from |     to |     route     |     turns         |     #
-        |     a |      d |     MySt,MySt |     depart,arrive |     # suppress multiple enter/exit mini roundabouts |
-        | (-) d |  (-) a | (-) MySt,MySt | (-) depart,arrive | (-) # suppress multiple enter/exit mini roundabouts |
-        | (+) d |  (+) a | (+)           | (+)               | (+) # suppress multiple enter/exit mini roundabouts |
-```
-
-### Prevent Randomness
-
-Some features in OSRM can result in strange experiences during testcases. To prevent some of these issues, follow the guidelines below.
-
-#### Use Waypoints
-
-Using grid nodes as waypoints offers the chance of unwanted side effects.
-OSRM converts the grid into a so called edge-based graph.
-
-```
-Scenario: Testbot - Intersection
-    Given the node map
-        """
-          e
-        b a d
-          c
-        """
-
-    And the ways
-        | nodes | highway | oneway |
-        | ab    | primary | yes    |
-        | ac    | primary | yes    |
-        | ad    | primary | yes    |
-        | ae    | primary | yes    |
-```
-Selecting `a` as a `waypoint` results in four possible starting locations. Which one of the routes `a,b`, `a,c`, `a,d`, or `a,e` is found is pure chance and depends on the order in the static `r-tree`.
-
-To guarantee discovery, use:
-
-```
-Scenario: Testbot - Intersection
-    Given the node map
-        """
-            e
-            4
-        b 1 a 3 d
-            2
-            c
-        """
-
-    And the ways
-        | nodes | highway | oneway |
-        | ab    | primary | yes    |
-        | ac    | primary | yes    |
-        | ad    | primary | yes    |
-        | ae    | primary | yes    |
-```
-And use `1`,`2`,`3`, and `4` as starting waypoints. The routes `1,b`, `2,c`, `3,d`, and `4,e` can all be discovered.
-
-#### Allow For Small Offsets
-
-Whenever you are independent of the start location (see use waypoints), the waypoint chosen as start/end location can still influence distances/durations.
-
-If you are testing for a duration metric, allow for a tiny offset to ensure a passing test in the presence of rounding/snapping issues.
-
-#### 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.
@@ -6,13 +6,10 @@ Please create a directory and run cmake from there, passing the path to this sou
 This process created the file `CMakeCache.txt' and the directory `CMakeFiles'. Please delete them.")
 endif()

-if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
-  set(CMAKE_BUILD_TYPE Release)
-endif()
-
 project(osrm-example C CXX)

 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ")

 set(bitness 32)
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -22,15 +19,15 @@ else()
  message(WARNING "Building on a 32 bit system is unsupported")
 endif()

-if(WIN32 AND MSVC_VERSION LESS 1900)
-  message(FATAL_ERROR "Building with Microsoft compiler needs Latest Visual Studio 2015 (Community or better)")
+if(WIN32 AND MSVC_VERSION LESS 1800)
+  message(FATAL_ERROR "Building with Microsoft compiler needs Visual Studio 2013 or later (Express version works too)")
 endif()

-link_directories(${LibOSRM_LIBRARY_DIRS})
 add_executable(osrm-example example.cpp)

 find_package(LibOSRM REQUIRED)
+find_package(Boost 1.49.0 COMPONENTS filesystem system thread REQUIRED)
+
+target_link_libraries(osrm-example ${LibOSRM_LIBRARIES} ${Boost_LIBRARIES})
+include_directories(SYSTEM ${LibOSRM_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})

-target_link_libraries(osrm-example ${LibOSRM_LIBRARIES} ${LibOSRM_DEPENDENT_LIBRARIES})
-include_directories(SYSTEM ${LibOSRM_INCLUDE_DIRS})
-set(CMAKE_CXX_FLAGS ${LibOSRM_CXXFLAGS})
@@ -1,24 +1,13 @@
 # - Try to find LibOSRM
 # Once done this will define
 #  LibOSRM_FOUND - System has LibOSRM
-#  LibOSRM_LIBRARIES - The libraries and ldflags needed to use LibOSRM
-#  LibOSRM_DEPENDENT_LIBRARIES - The libraries and ldflags need to link LibOSRM dependencies
-#  LibOSRM_LIBRARY_DIRS - The libraries paths needed to find LibOSRM
-#  LibOSRM_CXXFLAGS - Compiler switches required for using LibOSRM
+#  LibOSRM_INCLUDE_DIRS - The LibOSRM include directories
+#  LibOSRM_LIBRARIES - The libraries needed to use LibOSRM
+#  LibOSRM_DEFINITIONS - Compiler switches required for using LibOSRM

 find_package(PkgConfig)
-pkg_search_module(PC_LibOSRM QUIET libosrm)
-
-function(JOIN VALUES GLUE OUTPUT)
-  string (REPLACE ";" "${GLUE}" _TMP_STR "${VALUES}")
-  set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
-endfunction()
-
-list(REMOVE_ITEM PC_LibOSRM_CFLAGS " ")
-JOIN("${PC_LibOSRM_CFLAGS}" " " output)
-
-set(LibOSRM_CXXFLAGS ${output})
-set(LibOSRM_LIBRARY_DIRS ${PC_LibOSRM_LIBRARY_DIRS})
+pkg_check_modules(PC_LibOSRM QUIET libosrm)
+set(LibOSRM_DEFINITIONS ${PC_LibOSRM_CFLAGS_OTHER})

 find_path(LibOSRM_INCLUDE_DIR osrm/osrm.hpp
  PATH_SUFFIXES osrm include/osrm include
@@ -30,6 +19,8 @@ find_path(LibOSRM_INCLUDE_DIR osrm/osrm.hpp
  /opt/local
  /opt)

+set(LibOSRM_INCLUDE_DIRS ${LibOSRM_INCLUDE_DIR} ${LibOSRM_INCLUDE_DIR}/osrm)
+
 find_library(TEST_LibOSRM_STATIC_LIBRARY Names osrm.lib libosrm.a
  PATH_SUFFIXES osrm lib/osrm lib
  HINTS ${PC_LibOSRM_LIBDIR} ${PC_LibOSRM_LIBRARY_DIRS}
@@ -39,7 +30,7 @@ find_library(TEST_LibOSRM_STATIC_LIBRARY Names osrm.lib libosrm.a
  /usr
  /opt/local
  /opt)
-find_library(TEST_LibOSRM_DYNAMIC_LIBRARY Names libosrm.dylib libosrm.so
+find_library(TEST_LibOSRM_DYNAMIC_LIBRARY Names osrm.dynlib libosrm.so
  PATH_SUFFIXES osrm lib/osrm lib
  HINTS ${PC_LibOSRM_LIBDIR} ${PC_LibOSRM_LIBRARY_DIRS}
  ~/Library/Frameworks
@@ -49,15 +40,26 @@ find_library(TEST_LibOSRM_DYNAMIC_LIBRARY Names libosrm.dylib libosrm.so
  /opt/local
  /opt)

-set(LibOSRM_DEPENDENT_LIBRARIES ${PC_LibOSRM_STATIC_LDFLAGS})
-set(LibOSRM_LIBRARIES ${PC_LibOSRM_LDFLAGS})
+if (NOT ("${TEST_LibOSRM_STATIC_LIBRARY}" STREQUAL "TEST_LibOSRM_STATIC_LIBRARY-NOTFOUND"))
+  if ("${PC_LibOSRM_STATIC_LIBRARIES}" STREQUAL "")
+    set(LibOSRM_STATIC_LIBRARIES ${TEST_LibOSRM_STATIC_LIBRARY})
+  else()
+    set(LibOSRM_STATIC_LIBRARIES ${PC_LibOSRM_STATIC_LIBRARIES})
+  endif()
+  set(LibOSRM_LIBRARIES ${LibOSRM_STATIC_LIBRARIES})
+endif()
+
+if (NOT ("${TEST_LibOSRM_DYNAMIC_LIBRARY}" STREQUAL "TEST_LibOSRM_DYNAMIC_LIBRARY-NOTFOUND"))
+  if ("${PC_LibOSRM_LIBRARIES}" STREQUAL "")
+    set(LibOSRM_DYNAMIC_LIBRARIES ${TEST_LibOSRM_DYNAMIC_LIBRARY})
+  else()
+    set(LibOSRM_DYNAMIC_LIBRARIES ${PC_LibOSRM_LIBRARIES})
+  endif()
+  set(LibOSRM_LIBRARIES ${LibOSRM_DYNAMIC_LIBRARIES})
+endif()

 include(FindPackageHandleStandardArgs)
 # handle the QUIETLY and REQUIRED arguments and set LIBOSRM_FOUND to TRUE
 # if all listed variables are TRUE
 find_package_handle_standard_args(LibOSRM DEFAULT_MSG
-                                LibOSRM_LIBRARY_DIRS
-                                LibOSRM_CXXFLAGS
-                                LibOSRM_LIBRARIES
-                                LibOSRM_DEPENDENT_LIBRARIES
-                                LibOSRM_INCLUDE_DIR)
+                                LibOSRM_LIBRARIES LibOSRM_INCLUDE_DIR)
@@ -1,24 +1,24 @@
-#include "osrm/match_parameters.hpp"
-#include "osrm/nearest_parameters.hpp"
 #include "osrm/route_parameters.hpp"
 #include "osrm/table_parameters.hpp"
+#include "osrm/nearest_parameters.hpp"
 #include "osrm/trip_parameters.hpp"
+#include "osrm/match_parameters.hpp"

 #include "osrm/coordinate.hpp"
 #include "osrm/engine_config.hpp"
 #include "osrm/json_container.hpp"

-#include "osrm/osrm.hpp"
 #include "osrm/status.hpp"
+#include "osrm/osrm.hpp"

-#include <exception>
-#include <iostream>
 #include <string>
 #include <utility>
+#include <iostream>
+#include <exception>

 #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;
@@ -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;
+}
@@ -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 |
@@ -87,10 +81,8 @@ Feature: Bike - Squares and other areas
    @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  |
@@ -6,11 +6,9 @@ Feature: Bicycle - Handle cycling

    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 |
@@ -31,11 +29,9 @@ Feature: Bicycle - Handle 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 |
@@ -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      |
@@ -33,12 +31,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      |
@@ -61,11 +57,9 @@ Feature: Bike - Destination only, no passing through

    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      |
@@ -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 |
@@ -31,12 +29,10 @@ Feature: Bike - Handle ferry routes

    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 |
@@ -52,10 +48,8 @@ Feature: Bike - Handle ferry routes

    Scenario: Bike - Ferry duration, multiple nodes
        Given the node map
-            """
-            x         y
-              a b c d
-            """
+            | x |   |   |   |   | y |
+            |   | a | b | c | d |   |

        And the ways
            | nodes | highway | route | bicycle | duration |
@@ -7,15 +7,15 @@ Feature: Bike - Max speed restrictions

    Scenario: Bicycle - Respect maxspeeds when lower that way type speed
        Then routability should be
-            | highway     | maxspeed | bothw        |
-            | residential |          | 15 km/h +- 1 |
-            | residential | 10       | 10 km/h +- 1 |
+            | highway     | maxspeed | bothw   |
+            | residential |          | 15 km/h |
+            | residential | 10       | 10 km/h |

    Scenario: Bicycle - Ignore maxspeed when higher than way speed
        Then routability should be
-            | highway     | maxspeed | bothw        |
-            | residential |          | 15 km/h +- 1 |
-            | residential | 80       | 15 km/h      |
+            | highway     | maxspeed | bothw   |
+            | residential |          | 15 km/h |
+            | residential | 80       | 15 km/h |

    @todo
    Scenario: Bicycle - Maxspeed formats
@@ -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 |
@@ -63,14 +61,14 @@ Feature: Bike - Max speed restrictions
            | snail | 720s ~10% |

        Then routability should be
-            | maxspeed | maxspeed:forward | maxspeed:backward | forw         | backw        |
-            |          |                  |                   | 15 km/h +- 1 | 15 km/h +- 1 |
-            | 10       |                  |                   | 10 km/h +- 1 | 10 km/h +- 1 |
-            |          | 10               |                   | 10 km/h +- 1 | 15 km/h +- 1 |
-            |          |                  | 10                | 15 km/h      | 10 km/h +- 1 |
-            | 2        | 10               |                   | 10 km/h +- 1 | 2 km/h       |
-            | 2        |                  | 10                | 2 km/h       | 10 km/h +- 1 |
-            | 2        | 5                | 10                | 5 km/h       | 10 km/h +- 1 |
+            | maxspeed | maxspeed:forward | maxspeed:backward | forw    | backw   |
+            |          |                  |                   | 15 km/h | 15 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 |
@@ -28,10 +26,8 @@ Feature: Bike - Mode flag

     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 |
@@ -50,19 +46,14 @@ Feature: Bike - Mode flag

     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                                |
@@ -75,10 +66,8 @@ Feature: Bike - Mode flag

     Scenario: Bike - Mode when pushing on pedestrain streets
     	Given the node map
-     	 """
-     	 a b
-     	   c d
-     	 """
+     	 | a | b |   |
+     	 |   | c | d |

     	And the ways
     	 | nodes | highway    |
@@ -97,10 +86,8 @@ Feature: Bike - Mode flag

     Scenario: Bike - Mode when pushing on pedestrain areas
     	Given the node map
-     	 """
-     	 a b
-     	   c d f
-     	 """
+     	 | a | b |   |   |
+     	 |   | c | d | f |

     	And the ways
     	 | nodes | highway    | area |
@@ -119,10 +106,8 @@ Feature: Bike - Mode flag

     Scenario: Bike - Mode when pushing on steps
     	Given the node map
-     	 """
-     	 a b
-     	   c d f
-     	 """
+     	 | a | b |   |   |
+     	 |   | c | d | f |

     	And the ways
    	 | nodes | highway |
@@ -141,10 +126,8 @@ Feature: Bike - Mode flag

     Scenario: Bike - Mode when bicycle=dismount
     	Given the node map
-     	 """
-     	 a b
-     	   c d f
-     	 """
+     	 | a | b |   |   |
+     	 |   | c | d | f |

     	And the ways
    	 | nodes | highway | bicycle  |
@@ -163,9 +146,7 @@ Feature: Bike - Mode flag

    Scenario: Bicycle - Modes when starting on forward oneway
        Given the node map
-         """
-         a b
-         """
+         | a | b |

        And the ways
         | nodes | oneway |
@@ -178,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,26 +6,22 @@ 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 |
-            | ab    | My Way   | A6  |
-            | bc    | Your Way | A7  |
+            | nodes | name     |
+            | ab    | My Way   |
+            | bc    | Your Way |

        When I route I should get
-            | from | to | route                                   | ref      |
-            | a    | c  | My Way,Your Way,Your Way                | A6,A7,A7 |
+            | from | to | route                    |
+            | a    | c  | My Way,Your Way,Your Way |

    @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} |
@@ -18,10 +18,8 @@ Feature: Bike - Oneway streets

    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 |
@@ -29,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       |
@@ -52,22 +48,22 @@ Feature: Bike - Oneway streets

    Scenario: Bike - Implied oneways
        Then routability should be
-            | 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    |       |                       |
+            | highway       | foot | bicycle | junction   | forw | backw |
+            |               | no   |         |            | x    | x     |
+            |               | no   |         | roundabout | x    |       |
+            | motorway      | no   | yes     |            | x    |       |
+            | motorway_link | no   | yes     |            | x    |       |
+            | 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     | x    | x     |
-            | primary         | no   | roundabout | yes    | x    |       |
-            | motorway_link   | no   |            | -1     |      |       |
-            | trunk_link      | no   |            | -1     |      |       |
-            | primary         | no   | roundabout | -1     |      | x     |
+            | 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
@@ -119,9 +115,7 @@ Feature: Bike - Oneway streets

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

        And the ways
            | nodes | oneway |
@@ -35,11 +35,9 @@ Feature: Bike - Accessability of different way types
    @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    |
@@ -65,7 +63,6 @@ Feature: Bike - Accessability of different way types
            | 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 |
@@ -90,18 +87,14 @@ 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                                   |
@@ -112,10 +105,8 @@ Feature: Bike - Accessability of different way types

    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 |
@@ -6,37 +6,31 @@ Feature: Bike - Way ref

    Scenario: Bike - Way with both name and ref
        Given the node map
-            """
-            a b
-            """
+            | a | b |

        And the ways
            | nodes | name         | ref |
            | ab    | Utopia Drive | E7  |

        When I route I should get
-            | from | to | route                               | ref   |
-            | a    | b  | Utopia Drive,Utopia Drive           | E7,E7 |
+            | from | to | route                               |
+            | a    | b  | Utopia Drive / E7,Utopia Drive / E7 |

    Scenario: Bike - Way with only ref
        Given the node map
-            """
-            a b
-            """
+            | a | b |

        And the ways
            | nodes | name | ref |
            | ab    |      | E7  |

        When I route I should get
-            | from | to | route | ref   |
-            | a    | b  | ,     | E7,E7 |
+            | from | to | route |
+            | a    | b  | E7,E7 |

    Scenario: Bike - Way with only name
        Given the node map
-            """
-            a b
-            """
+            | a | b |

        And the ways
            | nodes | name         |
@@ -9,11 +9,9 @@ Feature: Bike - Turn restrictions
    @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,11 +33,9 @@ Feature: Bike - Turn restrictions
    @no_turning
    Scenario: Bike - No right turn
        Given the node map
-            """
-              n
-            w j e
-              s
-            """
+            |   | n |   |
+            | w | j | e |
+            |   | s |   |

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

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

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

        And the ways
            | nodes | oneway | foot |
@@ -139,11 +129,9 @@ Feature: Bike - Turn restrictions
    @only_turning
    Scenario: Bike - Only right turn
        Given the node map
-            """
-              n
-            w j e
-              s
-            """
+            |   | n |   |
+            | w | j | e |
+            |   | s |   |

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

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

        And the ways
            | nodes | oneway | foot |
@@ -217,11 +201,9 @@ Feature: Bike - Turn restrictions
    @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 |
@@ -249,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 |
@@ -273,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 |
@@ -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 |
@@ -7,52 +7,34 @@ 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 s |
-            | cycleway | dirt                  | 120 s |
-            | cycleway | earth                 | 120 s |
-            | cycleway | grass                 | 120 s |
-            | cycleway | mud                   | 240 s |
-            | cycleway | sand                  | 240 s |
+            | 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  |
@@ -7,11 +7,9 @@ Feature: Turn Penalties
    Scenario: Bike - turns should incur a delay that depend on the angle

        Given the node map
-            """
-            c d e
-            b j f
-            a s g
-            """
+            | c | d | e |
+            | b | j | f |
+            | a | s | g |

        And the ways
            | nodes |
@@ -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     |
@@ -148,44 +148,3 @@ Feature: Car - Restricted access
            | primary |      |         | no  |           | x     |
            | runway  |      |         |     | yes       |       |
            | primary |      |         |     | no        | x     |
-
-    Scenario: Car - only designated HOV ways are ignored by default
-        Then routability should be
-            | highway | hov        | bothw |
-            | primary | designated |       |
-            | primary | yes        | x     |
-            | primary | no         | x     |
-
-    Scenario: Car - a way with all lanes HOV-designated is inaccessible by default (similar to hov=designated)
-        Then routability should be
-            | highway | hov:lanes:forward      | hov:lanes:backward     | hov:lanes              | oneway | forw | backw |
-            | primary | designated             | designated             |                        |        |      |       |
-            | primary |                        | designated             |                        |        | x    |       |
-            | primary | designated             |                        |                        |        |      | x     |
-            | primary | designated\|designated | designated\|designated |                        |        |      |       |
-            | primary | designated\|no         | designated\|no         |                        |        | x    | x     |
-            | primary | yes\|no                | yes\|no                |                        |        | x    | x     |
-            | primary |                        |                        |                        |        | x    | x     |
-            | primary | designated             |                        |                        | -1     |      |       |
-            | primary |                        | designated             |                        | -1     |      | x     |
-            | primary |                        |                        | designated             | yes    |      |       |
-            | primary |                        |                        | designated             | -1     |      |       |
-            | primary |                        |                        | designated\|           | yes    | x    |       |
-            | primary |                        |                        | designated\|           | -1     |      | x     |
-            | primary |                        |                        | designated\|designated | yes    |      |       |
-            | primary |                        |                        | designated\|designated | -1     |      |       |
-            | primary |                        |                        | designated\|yes        | yes    | x    |       |
-            | primary |                        |                        | designated\|no         | -1     |      | x     |
-
-     Scenario: Car - these toll roads always work
-        Then routability should be
-            | highway | toll        | bothw |
-            | primary | no          | x     |
-            | primary | snowmobile  | x     |
-
-     # To test this we need issue #2781
-     @todo
-     Scenario: Car - only toll=yes ways are ignored by default
-        Then routability should be
-            | highway | toll        | bothw |
-            | primary | yes         |       |
@@ -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 |


@@ -6,11 +6,9 @@ Feature: Car - Handle driving

    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 |
@@ -19,23 +17,21 @@ Feature: Car - Handle driving
            | 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    | c  | cde,cde         | driving,driving          |
            | e    | b  | cde,abc,abc     | driving,driving,driving         |
            | e    | a  | cde,abc,abc     | driving,driving,driving         |
-            | c    | e  | cde,cde         | driving,driving                 |
+            | c    | 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 |
@@ -44,8 +40,8 @@ Feature: Car - Handle driving
            | efg   | primary |         |          |

        When I route I should get
-            | from | to | route           | modes                           | speed  |
-            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving | 6 km/h |
-            | b    | f  | abc,cde,efg,efg | driving,driving,driving,driving | 4 km/h |
-            | c    | e  | cde,cde         | driving,driving                 | 2 km/h |
-            | e    | c  | cde,cde         | driving,driving                 | 2 km/h |
+            | from | to | route           | modes                                  | speed  |
+            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving | 7 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 |
@@ -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      |
@@ -33,12 +31,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      |
@@ -61,11 +57,9 @@ Feature: Car - Destination only, no passing through

    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      |
@@ -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 |
@@ -31,11 +29,9 @@ Feature: Car - Handle ferry routes

    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 |
@@ -45,18 +41,16 @@ Feature: Car - Handle ferry routes

        When I route I should get
            | from | to | route           | modes                         | speed   |
-            | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving | 23 km/h |
-            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 18 km/h |
-            | c    | e  | cde,cde         | ferry,ferry                   | 11 km/h |
-            | e    | c  | cde,cde         | ferry,ferry                   | 11 km/h |
+            | 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 |
@@ -66,7 +60,7 @@ Feature: Car - Handle ferry routes

        When I route I should get
            | from | to | route           | modes                         | speed   |
-            | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving | 23 km/h |
-            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 18 km/h |
-            | c    | e  | cde,cde         | ferry,ferry                   | 11 km/h |
-            | e    | c  | cde,cde         | ferry,ferry                   | 11 km/h |
+            | 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 |
@@ -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         |
@@ -8,9 +8,7 @@ OSRM will use 4/5 of the projected free-flow 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,19 +20,17 @@ 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 | 68 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 |
@@ -43,23 +39,23 @@ OSRM will use 4/5 of the projected free-flow speed.
            | cd    | living_street | FR:urban |

        When I route I should get
-            | from | to | route | speed   |
-            | a    | b  | ab,ab | 20 km/h |
-            | b    | c  | bc,bc | 72 km/h |
-            | c    | d  | cd,cd | 40 km/h |
+            | 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
        Given a grid size of 100 meters

        Then routability should be
            | highway | maxspeed | maxspeed:forward | maxspeed:backward | forw    | backw   |
-            | primary |          |                  |                   | 52 km/h | 52 km/h |
-            | primary | 60       |                  |                   | 48 km/h | 48 km/h |
-            | primary |          | 60               |                   | 48 km/h | 48 km/h +- 5 |
-            | primary |          |                  | 60                | 52 km/h | 52 km/h +- 5 |
-            | 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 |          |                  |                   | 65 km/h | 65 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
@@ -82,44 +78,44 @@ OSRM will use 4/5 of the projected free-flow speed.
        Then routability should be

            | highway | maxspeed | width | maxspeed:forward | maxspeed:backward | forw    | backw   |
-            | primary |          |       |                  |                   | 52 km/h | 52 km/h |
+            | primary |          |       |                  |                   | 63 km/h | 63 km/h |
            | primary |          |   3   |                  |                   | 32 km/h | 32 km/h |
-            | primary | 60       |       |                  |                   | 47 km/h | 47 km/h |
-            | primary | 60       |   3   |                  |                   | 29 km/h | 29 km/h |
-            | primary |          |       | 60               |                   | 47 km/h | 52 km/h |
-            | primary |          |   3   | 60               |                   | 29 km/h | 32 km/h |
-            | primary |          |       |                  | 60                | 52 km/h | 47 km/h |
-            | primary |          |   3   |                  | 60                | 32 km/h | 29 km/h |
-            | primary | 15       |       | 60               |                   | 47 km/h | 12 km/h |
-            | primary | 15       |   3   | 60               |                   | 29 km/h |  7 km/h |
-            | primary | 15       |       |                  | 60                | 12 km/h | 47 km/h |
-            | primary | 15       |   3   |                  | 60                |  7 km/h | 29 km/h |
-            | primary | 15       |       | 30               | 60                | 23 km/h | 47 km/h |
-            | primary | 15       |   3   | 30               | 60                | 14 km/h | 29 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   |
-            | primary |          |       |                  |                   | 52 km/h | 52 km/h |
+            | primary |          |       |                  |                   | 63 km/h | 63 km/h |
            | primary |          |   1   |                  |                   | 32 km/h | 32 km/h |
-            | primary | 60       |       |                  |                   | 47 km/h | 47 km/h |
-            | primary | 60       |   1   |                  |                   | 29 km/h | 29 km/h |
-            | primary |          |       | 60               |                   | 47 km/h | 52 km/h |
-            | primary |          |   1   | 60               |                   | 29 km/h | 32 km/h |
-            | primary |          |       |                  | 60                | 52 km/h | 47 km/h |
-            | primary |          |   1   |                  | 60                | 32 km/h | 29 km/h |
-            | primary | 15       |       | 60               |                   | 47 km/h | 12 km/h |
-            | primary | 15       |   1   | 60               |                   | 29 km/h |  7 km/h |
-            | primary | 15       |       |                  | 60                | 12 km/h | 47 km/h |
-            | primary | 15       |   1   |                  | 60                |  7 km/h | 29 km/h |
-            | primary | 15       |       | 30               | 60                | 23 km/h | 47 km/h |
-            | primary | 15       |   1   | 30               | 60                | 14 km/h | 29 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 incure a penalty for two-way streets
        Then routability should be
            | highway | maxspeed | lanes  | oneway | forw    | backw   |
-            | primary |   30     |   1    | yes    | 23 km/h |         |
-            | primary |   30     |   1    | -1     |         | 23 km/h |
+            | 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    |        | 23 km/h | 23 km/h |
+            | primary |   30     |   2    |        | 34 km/h | 34 km/h |
@@ -5,10 +5,8 @@ Feature: Car - Mode flag

    Scenario: Car - Mode when using a ferry
        Given the node map
-            """
-            a b
-              c d
-            """
+            | a | b |   |
+            |   | c | d |

        And the ways
            | nodes | highway | route | duration |
@@ -27,9 +25,7 @@ Feature: Car - Mode flag

    Scenario: Car - Snapping when using a ferry
        Given the node map
-            """
-            a b   c d   e f
-            """
+            | a | b |   | c | d |   | e | f |

        And the ways
            | nodes | highway | route | duration |
@@ -3,14 +3,11 @@ 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
-            """
+            | a | b |
+            |   | c |

        And the ways
            | nodes | name     | ref |
@@ -18,53 +15,13 @@ Feature: Car - Street names in instructions
            | bc    | Your Way | A1  |

        When I route I should get
-            | from | to | route                              | ref  |
-            | a    | c  | My Way,Your Way,Your Way           | ,A1,A1|
-
-    Scenario: Car - A named street with pronunciation
-        Given the node map
-            """
-            a b d
-              1
-              c
-            """
-
-        And the ways
-            | 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,My Way | ,meyeway,meyeway    | ,A1,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                              |
+            | a    | c  | My Way,Your Way (A1),Your Way (A1) |

    @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 |
@@ -74,33 +31,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 |
-            | abc   | primary      | road  | roooaad            |
-            | cg    | primary      | road  | roooaad            |
-            | bfd   | trunk_link   |       |                    |
-            | cde   | trunk        | trunk | truank             |
-
-        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 |
@@ -17,28 +17,24 @@ Feature: Car - Oneway streets

    Scenario: Car - Implied oneways
        Then routability should be
-            | highway         | junction   | forw | backw | #                     |
-            | motorway        |            | x    |       |                       |
-            | motorway_link   |            | x    | x     | does not imply oneway |
-            | primary         |            | x    | x     |                       |
-            | motorway        | roundabout | x    |       |                       |
-            | motorway_link   | roundabout | x    |       |                       |
-            | primary         | roundabout | x    |       |                       |
+            | highway       | junction   | forw | backw |
+            | motorway      |            | x    |       |
+            | motorway_link |            | x    |       |
+            | primary       |            | x    | x     |
+            | motorway      | roundabout | x    |       |
+            | motorway_link | roundabout | x    |       |
+            | primary       | roundabout | x    |       |

    Scenario: Car - Overrule implied oneway
        Then routability should be
-            | highway       | oneway | forw | backw | #                    |
-            | motorway      | no     | x    | x     |                      |
-            | motorway_link | no     | x    | x     |                      |
-            | motorway_link | yes    | x    |       |                      |
-            | motorway_link |        | x    | x     | does not imply onway |
+            | highway       | oneway | forw | backw |
+            | motorway      | no     | x    | x     |
+            | motorway_link | no     | x    | x     |

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

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

        When I route I should get
            | from | to | route       |
@@ -72,9 +66,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 |
@@ -85,12 +77,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     |
@@ -5,16 +5,13 @@ Feature: Car - Turn restrictions

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

    @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 +33,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 +61,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 +85,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 +109,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 +133,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 +148,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 +181,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 +205,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 +229,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 +253,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 +277,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 +307,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 +329,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 +364,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 +398,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,29 +429,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 |
-
@@ -1,14 +0,0 @@
-@routing @car @surface
-Feature: Car - Surfaces
-
-    Background:
-        Given the profile "car"
-
-    Scenario: Car - Surface should reduce speed
-        Then routability should be
-            | highway  | service           | forw       | backw       |
-            | service  | alley             | 5 km/h +-1 | 5 km/h +-1  |
-            | service  | emergency_access  |            |             |
-            | service  | driveway          | 5 km/h +-1 | 5 km/h +-1  |
-            | service  | drive-through     | 5 km/h +-1 | 5 km/h +-1  |
-            | service  | parking           | 5 km/h +-1 | 5 km/h +-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 |
@@ -7,31 +7,18 @@ Feature: Car - speeds

    Scenario: Car - speed of various way types
        Then routability should be
-            | highway        | oneway | bothw   |
-            | motorway       | no     | 71 km/h |
-            | motorway_link  | no     | 36 km/h |
-            | trunk          | no     | 68 km/h |
-            | trunk_link     | no     | 31 km/h |
-            | primary        | no     | 52 km/h |
-            | primary_link   | no     | 23 km/h |
-            | secondary      | no     | 44 km/h |
-            | secondary_link | no     | 19 km/h |
-            | tertiary       | no     | 31 km/h |
-            | tertiary_link  | no     | 16 km/h |
-            | unclassified   | no     | 19 km/h |
-            | residential    | no     | 19 km/h |
-            | living_street  | no     | 8 km/h  |
-            | service        | no     | 11 km/h |
-
-    # Alternating oneways have to take average waiting time into account.
-    Scenario: Car - scaled speeds for oneway=alternating
-        Then routability should be
-            | highway        | oneway      | junction   | forw          | backw        | #              |
-            | tertiary       |             |            | 31 km/h       | 31 km/h      |                |
-            | tertiary       | alternating |            | 12 km/h +- 1  | 12 km/h +- 1 |                |
-            | motorway       |             |            | 71 km/h       |              | implied oneway |
-            | motorway       | alternating |            | 28 km/h +- 1  |              | implied oneway |
-            | motorway       | reversible  |            |               |              | unroutable     |
-            | primary        |             | roundabout | 52 km/h       |              | implied oneway |
-            | primary        | alternating | roundabout | 20 km/h +- 1  |              | implied oneway |
-            | primary        | reversible  | roundabout |               |              | unroutable     |
+            | 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,106 +0,0 @@
-@routing @basic @car
-Feature: Basic Routing
-
-    Background:
-        Given the profile "car"
-        Given a grid size of 500 meters
-
-    @smallest
-    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              |
-            | 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     |
@@ -64,64 +64,64 @@ Feature: Car - Surfaces
    Scenario: Car - Surface should reduce speed
        Then routability should be
            | highway  | oneway | surface         | forw        | backw       |
-            | motorway | no     |                 | 72 km/h     | 72 km/h     |
-            | motorway | no     | asphalt         | 72 km/h     | 72 km/h +-1 |
-            | motorway | no     | concrete        | 72 km/h +-1 | 72 km/h +-1 |
-            | motorway | no     | concrete:plates | 72 km/h +-1 | 72 km/h +-1 |
-            | motorway | no     | concrete:lanes  | 72 km/h +-1 | 72 km/h +-1 |
-            | motorway | no     | paved           | 72 km/h +-1 | 72 km/h +-1 |
-            | motorway | no     | cement          | 64 km/h +-1 | 64 km/h +-1 |
-            | motorway | no     | compacted       | 64 km/h +-1 | 64 km/h +-1 |
-            | motorway | no     | fine_gravel     | 64 km/h +-1 | 64 km/h +-1 |
-            | motorway | no     | paving_stones   | 48 km/h +-1 | 48 km/h +-1 |
-            | motorway | no     | metal           | 48 km/h +-1 | 48 km/h +-1 |
-            | motorway | no     | bricks          | 48 km/h +-1 | 48 km/h +-1 |
-            | motorway | no     | grass           | 32 km/h +-1 | 32 km/h +-1 |
-            | motorway | no     | wood            | 32 km/h +-1 | 32 km/h +-1 |
-            | motorway | no     | sett            | 32 km/h +-1 | 32 km/h +-1 |
-            | motorway | no     | grass_paver     | 32 km/h +-1 | 32 km/h +-1 |
-            | motorway | no     | gravel          | 32 km/h +-1 | 32 km/h +-1 |
-            | motorway | no     | unpaved         | 32 km/h +-1 | 32 km/h +-1 |
-            | motorway | no     | ground          | 32 km/h +-1 | 32 km/h +-1 |
-            | motorway | no     | dirt            | 32 km/h +-1 | 32 km/h +-1 |
-            | motorway | no     | pebblestone     | 32 km/h +-1 | 32 km/h +-1 |
-            | motorway | no     | tartan          | 32 km/h +-1 | 32 km/h +-1 |
-            | motorway | no     | cobblestone     | 24 km/h +-1 | 24 km/h +-1 |
-            | motorway | no     | clay            | 24 km/h +-1 | 24 km/h +-1 |
-            | motorway | no     | earth           | 16 km/h +-1 | 16 km/h +-1 |
-            | motorway | no     | stone           | 16 km/h +-1 | 16 km/h +-1 |
-            | motorway | no     | rocky           | 16 km/h +-1 | 16 km/h +-1 |
-            | motorway | no     | sand            | 16 km/h +-1 | 16 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           | 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     |           | 72 km/h     | 72 km/h     |
-            | motorway | no     | grade1    | 48 km/h +-1 | 48 km/h +-1 |
-            | motorway | no     | grade2    | 32 km/h +-1 | 32 km/h +-1 |
-            | motorway | no     | grade3    | 24 km/h +-1 | 24 km/h +-1 |
-            | motorway | no     | grade4    | 20 km/h +-1 | 20 km/h +-1 |
-            | motorway | no     | grade5    | 16 km/h +-1 | 16 km/h +-1 |
+            | motorway | no     |           | 80 km/h +-1 | 80 km/h +-1 |
+            | motorway | no     | grade1    | 60 km/h +-1 | 60 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     |               | 72 km/h     | 72 km/h     |
-            | motorway | no     | intermediate  | 64 km/h     | 64 km/h     |
-            | motorway | no     | bad           | 32 km/h +-1 | 32 km/h +-1 |
-            | motorway | no     | very_bad      | 16 km/h +-1 | 16 km/h +-1 |
-            | motorway | no     | horrible      |  8 km/h +-1 |  8 km/h +-1 |
-            | motorway | no     | very_horrible |  4 km/h +-1 |  4 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    | backw   | forw    |
-            | motorway | no     |           |         |               | 72 km/h | 72 km/h |
-            | service  | no     | grade1    | asphalt | excellent     | 12 km/h | 12 km/h |
-            | motorway | no     | grade5    | asphalt | excellent     | 16 km/h | 16 km/h |
-            | motorway | no     | grade1    | mud     | excellent     |  8 km/h |  8 km/h |
-            | motorway | no     | grade1    | asphalt | very_horrible |  4 km/h |  4 km/h |
-            | service  | no     | grade5    | mud     | very_horrible |  4 km/h |  4 km/h |
+            | 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
@@ -138,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     |
+    
@@ -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 not based on raster sources
+        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 |
+
@@ -1,127 +0,0 @@
-@routing @speed @traffic
-Feature: Traffic - speeds
-
-    Background: Use specific speeds
-
-    Scenario: Weighting based on speed file
-        Given the node locations
-            | node | lat        | lon      |
-            | a    | 0.1        | 0.1      |
-            | b    | 0.05       | 0.1      |
-            | c    | 0.0        | 0.1      |
-            | d    | 0.05       | 0.03     |
-            | e    | 0.05       | 0.066    |
-            | f    | 0.075      | 0.066    |
-            | g    | 0.075      | 0.1      |
-        And the ways
-            | nodes | highway |
-            | ab    | primary |
-            | ad    | primary |
-            | bc    | primary |
-            | dc    | primary |
-            | de    | primary |
-            | eb    | primary |
-            | df    | primary |
-            | fb    | primary |
-        Given the profile "testbot"
-        Given the extract extra arguments "--generate-edge-lookup"
-        Given the contract extra arguments "--segment-speed-file {speeds_file}"
-        Given the speed file
-        """
-        1,2,0
-        2,1,0
-        2,3,27
-        3,2,27
-        1,4,27
-        4,1,27
-        """
-        And I route I should get
-            | from | to | route          | speed   |
-            | a    | b  | ad,de,eb,eb    | 30 km/h |
-            | a    | c  | ad,dc,dc       | 31 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  | fb,fb          | 36 km/h |
-            | a    | g  | ad,df,fb,fb    | 30 km/h |
-
-
-    Scenario: Speeds that isolate a single node (a)
-        Given the node locations
-            | node | lat        | lon      |
-            | a    | 0.1        | 0.1      |
-            | b    | 0.05       | 0.1      |
-            | c    | 0.0        | 0.1      |
-            | d    | 0.05       | 0.03      |
-            | e    | 0.05       | 0.066     |
-            | f    | 0.075      | 0.066     |
-            | g    | 0.075      | 0.1      |
-            | h    | 2.075      | 19.1     |
-        And the ways
-            | nodes | highway |
-            | ab    | primary |
-            | ad    | primary |
-            | bc    | primary |
-            | dc    | primary |
-            | de    | primary |
-            | eb    | primary |
-            | df    | primary |
-            | fb    | primary |
-        Given the profile "testbot"
-        Given the extract extra arguments "--generate-edge-lookup"
-        Given the contract extra arguments "--segment-speed-file {speeds_file}"
-        Given the speed file
-        """
-        1,2,0
-        2,1,0
-        2,3,27
-        3,2,27
-        1,4,0
-        4,1,0
-        """
-        And I route I should get
-            | from | to | route          | speed   |
-            | a    | b  | fb,fb          | 36 km/h |
-            | a    | c  | fb,bc,bc       | 30 km/h |
-            | b    | c  | bc,bc          | 27 km/h |
-            | a    | d  | fb,df,df       | 36 km/h |
-            | d    | c  | dc,dc          | 36 km/h |
-            | g    | b  | fb,fb          | 36 km/h |
-            | a    | g  | fb,fb          | 36 km/h |
-
-    Scenario: Verify that negative values cause an error, they're not valid at all
-        Given the node locations
-            | node | lat        | lon      |
-            | a    | 0.1        | 0.1      |
-            | b    | 0.05       | 0.1      |
-            | c    | 0.0        | 0.1      |
-            | d    | 0.05       | 0.03     |
-            | e    | 0.05       | 0.066    |
-            | f    | 0.075      | 0.066    |
-            | g    | 0.075      | 0.1      |
-            | h    | 1.075      | 10.1     |
-        And the ways
-            | nodes | highway |
-            | ab    | primary |
-            | ad    | primary |
-            | bc    | primary |
-            | dc    | primary |
-            | de    | primary |
-            | eb    | primary |
-            | df    | primary |
-            | fb    | primary |
-        Given the profile "testbot"
-        Given the extract extra arguments "--generate-edge-lookup"
-        Given the speed file
-        """
-        1,2,-10
-        2,1,-20
-        2,3,27
-        3,2,27
-        1,4,-3
-        4,1,-5
-        """
-        And the data has been extracted
-        When I try to run "osrm-contract --segment-speed-file {speeds_file} {processed_file}"
-        And stderr should contain "malformed"
-        And it should exit with an error
@@ -1,117 +0,0 @@
-@routing @speed @traffic
-Feature: Traffic - turn penalties
-
-    Background: Evenly spaced grid with multiple intersections
-        Given the node map
-            """
-              a   b
-            c d e f g
-              h   i
-            j k l m n
-              o   p
-            """
-
-        And the nodes
-            | node | id |
-            | a    | 1  |
-            | b    | 2  |
-            | c    | 3  |
-            | d    | 4  |
-            | e    | 5  |
-            | f    | 6  |
-            | g    | 7  |
-            | h    | 8  |
-            | i    | 9  |
-            | j    | 10 |
-            | k    | 11 |
-            | l    | 12 |
-            | m    | 13 |
-            | n    | 14 |
-            | o    | 15 |
-            | p    | 16 |
-
-        And the ways
-            | nodes | highway |
-            | ad    | primary |
-            | cd    | primary |
-            | def   | primary |
-            | dhk   | primary |
-
-            | bf    | primary |
-            | fg    | primary |
-            | fim   | primary |
-
-            | jk    | primary |
-            | klm   | primary |
-            | ko    | primary |
-
-            | mn    | primary |
-            | mp    | primary |
-        And the profile "car"
-        And the extract extra arguments "--generate-edge-lookup"
-
-    Scenario: Weighting not based on turn penalty file
-        When I route I should get
-            | from | to | route           | speed   | time      |
-            | a    | h  | ad,dhk,dhk      | 52 km/h | 14s +-1   |
-                                                                  # straight
-            | i    | g  | fim,fg,fg       | 45 km/h | 16s +-1   |
-                                                                  # right
-            | a    | e  | ad,def,def      | 38 km/h | 19s +-1   |
-                                                                  # left
-            | c    | g  | cd,def,fg,fg    | 52 km/h | 27s +-1   |
-                                                                  # double straight
-            | p    | g  | mp,fim,fg,fg    | 48 km/h | 29s +-1   |
-                                                                  # straight-right
-            | a    | l  | ad,dhk,klm,klm  | 44 km/h | 33s +-1   |
-                                                                  # straight-left
-            | l    | e  | klm,dhk,def,def | 45 km/h | 32s +-1   |
-                                                                  # double right
-            | g    | n  | fg,fim,mn,mn    | 38 km/h | 38s +-1   |
-                                                                  # double left
-
-    Scenario: Weighting based on turn penalty file
-        Given the turn penalty file
-            """
-            9,6,7,1.8
-            9,13,14,24.5
-            8,4,3,35
-            12,11,8,9
-            8,11,12,23
-            1,4,5,-0.2
-            """
-        And the contract extra arguments "--turn-penalty-file {penalties_file}"
-        When I route I should get
-            | from | to | route                 | speed   | time      |
-            | a    | h  | ad,dhk,dhk            | 52 km/h | 14s +-1   |
-                                                                              # straight
-            | i    | g  | fim,fg,fg             | 46 km/h | 15s +-1   |
-                                                                              # right - ifg penalty
-            | a    | e  | ad,def,def            | 53 km/h | 14s +-1   |
-                                                                              # left - faster because of negative ade penalty
-            | c    | g  | cd,def,fg,fg          | 52 km/h | 27s +-1   |
-                                                                              # double straight
-            | p    | g  | mp,fim,fg,fg          | 49 km/h | 29s +-1   |
-                                                                              # straight-right - ifg penalty
-            | a    | l  | ad,def,fim,klm,klm    | 48 km/h | 45s +-1   |
-                                                                              # was straight-left - forced around by hkl penalty
-            | l    | e  | klm,fim,def,def       | 38 km/h | 38s +-1   |
-                                                                              # double right - forced left by lkh penalty
-            | g    | n  | fg,fim,mn,mn          | 25 km/h | 57s +-1   |
-                                                                              # double left - imn penalty
-            | j    | c  | jk,klm,fim,def,cd,cd  | 44 km/h | 65.8s +-1 |
-                                                                              # double left - hdc penalty ever so slightly higher than imn; forces all the way around
-
-    Scenario: Too-negative penalty clamps, but does not fail
-        Given the contract extra arguments "--turn-penalty-file {penalties_file}"
-        And the profile "testbot"
-        And the turn penalty file
-            """
-            1,4,5,-10
-            """
-        When I route I should get
-            | from | to | route      | time    |
-            | a    | d  | ad,ad      | 10s +-1 |
-            | a    | e  | ad,def,def | 10s +-1 |
-            | b    | f  | bf,bf      | 10s +-1 |
-            | b    | g  | bf,fg,fg   | 20s +-1 |
@@ -7,11 +7,9 @@ Feature: Foot - Squares and other areas
    @square
    Scenario: Foot - 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: Foot - Squares and other areas
    @building
    Scenario: Foot - 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: Foot - Squares and other areas
    @parking
    Scenario: Foot - 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 |
@@ -86,10 +80,8 @@ Feature: Foot - Squares and other areas
    @train @platform
    Scenario: Foot - railway platforms
        Given the node map
-            """
-            x a b y
-              d c
-            """
+            | x | a | b | y |
+            |   | d | c |   |

        And the ways
            | nodes | highway | railway  |
@@ -6,11 +6,9 @@ Feature: Foot - Handle ferry routes

    Scenario: Foot - 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 | foot |
@@ -31,12 +29,10 @@ Feature: Foot - Handle ferry routes

    Scenario: Foot - 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 | foot | duration |
@@ -52,10 +48,8 @@ Feature: Foot - Handle ferry routes

    Scenario: Foot - Ferry duration, multiple nodes
        Given the node map
-            """
-            x         y
-              a b c d
-            """
+            | x |   |   |   |   | y |
+            |   | a | b | c | d |   |

        And the ways
            | nodes | highway | route | foot | duration |
@@ -6,14 +6,14 @@ Background: Use specific speeds

    Scenario: Foot - Ignore maxspeed
        Then routability should be
-            | highway     | maxspeed  | bothw      |
-            | residential |           | 145 s ~10% |
-            | residential | 1         | 145 s ~10% |
-            | residential | 100       | 145 s ~10% |
-            | residential | 1         | 145 s ~10% |
-            | residential | 1mph      | 145 s ~10% |
-            | residential | 1 mph     | 145 s ~10% |
-            | residential | 1unknown  | 145 s ~10% |
-            | residential | 1 unknown | 145 s ~10% |
-            | residential | none      | 145 s ~10% |
-            | residential | signals   | 145 s ~10% |
+            | highway     | maxspeed  | bothw     |
+            | residential |           | 145s ~10% |
+            | residential | 1         | 145s ~10% |
+            | residential | 100       | 145s ~10% |
+            | residential | 1         | 145s ~10% |
+            | residential | 1mph      | 145s ~10% |
+            | residential | 1 mph     | 145s ~10% |
+            | residential | 1unknown  | 145s ~10% |
+            | residential | 1 unknown | 145s ~10% |
+            | residential | none      | 145s ~10% |
+            | residential | signals   | 145s ~10% |
@@ -6,26 +6,22 @@ Feature: Foot - Street names in instructions

    Scenario: Foot - A named street
        Given the node map
-            """
-            a b
-              c
-            """
+            | a | b |
+            |   | c |

        And the ways
-            | nodes | name     | ref |
-            | ab    | My Way   | A6  |
-            | bc    | Your Way | B7  |
+            | nodes | name     |
+            | ab    | My Way   |
+            | bc    | Your Way |

        When I route I should get
-            | from | to | route                                   |
-            | a    | c  | My Way,Your Way,Your Way                |
+            | from | to | route                    |
+            | a    | c  | My Way,Your Way,Your Way |

    @unnamed
-    Scenario: Foot - No longer use way type to describe unnamed ways, see #3231
+    Scenario: Foot - 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: Foot - Street names in instructions
            | bcd   | track   |      |

        When I route I should get
-            | from | to | route |
-            | a    | d  | ,     |
+            | from | to | route                                             |
+            | a    | d  | {highway:footway},{highway:track},{highway:track} |
@@ -6,37 +6,31 @@ Feature: Foot - Way ref

    Scenario: Foot - Way with both name and ref
        Given the node map
-            """
-            a b
-            """
+            | a | b |

        And the ways
            | nodes | name         | ref |
            | ab    | Utopia Drive | E7  |

        When I route I should get
-            | from | to | route                     | ref   |
-            | a    | b  | Utopia Drive,Utopia Drive | E7,E7 |
+            | from | to | route                               |
+            | a    | b  | Utopia Drive / E7,Utopia Drive / E7 |

    Scenario: Foot - Way with only ref
        Given the node map
-            """
-            a b
-            """
+            | a | b |

        And the ways
            | nodes | name | ref |
            | ab    |      | E7  |

        When I route I should get
-            | from | to | route | ref   |
-            | a    | b  | ,     | E7,E7 |
+            | from | to | route |
+            | a    | b  | E7,E7 |

    Scenario: Foot - Way with only name
        Given the node map
-            """
-            a b
-            """
+            | a | b |

        And the ways
            | nodes | name         |
@@ -8,11 +8,9 @@ Feature: Foot - Turn restrictions
    @no_turning
    Scenario: Foot - No left turn
        Given the node map
-            """
-              n
-            w j e
-              s
-            """
+            |   | n |   |
+            | w | j | e |
+            |   | s |   |

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

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

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

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

        And the ways
            | nodes | oneway |
@@ -138,11 +128,9 @@ Feature: Foot - Turn restrictions
    @only_turning
    Scenario: Foot - Only right turn
        Given the node map
-            """
-              n
-            w j e
-              s
-            """
+            |   | n |   |
+            | w | j | e |
+            |   | s |   |

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

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

        And the ways
            | nodes | oneway |
@@ -216,11 +200,9 @@ Feature: Foot - Turn restrictions
    @except
    Scenario: Foot - 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 |
@@ -248,11 +230,9 @@ Feature: Foot - Turn restrictions
    @except
    Scenario: Foot - Except tag and on only_ restrictions
        Given the node map
-            """
-            a   b
-              j
-              s
-            """
+            | a |   | b |
+            |   | j |   |
+            |   | s |   |

        And the ways
            | nodes | oneway |
@@ -272,14 +252,12 @@ Feature: Foot - Turn restrictions
    @except
    Scenario: Foot - 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 |
@@ -10,13 +10,11 @@ Feature: Roundabout Instructions
    # make sense when you're going the opposite way around the roundabout.

        Given the node map
-            """
-                v
-                d
-            s a   c u
-                b
-                t
-            """
+            |   |   | v |   |   |
+            |   |   | d |   |   |
+            | s | a |   | c | u |
+            |   |   | b |   |   |
+            |   |   | t |   |   |

        And the ways
            | nodes | junction   |
@@ -6,10 +6,10 @@ Feature: Foot - Surfaces

    Scenario: Foot - Slow surfaces
        Then routability should be
-            | highway | surface     | bothw      |
-            | footway |             | 145 s ~10% |
-            | footway | fine_gravel | 193 s ~10% |
-            | footway | gravel      | 193 s ~10% |
-            | footway | pebblestone | 193 s ~10% |
-            | footway | mud         | 289 s ~10% |
-            | footway | sand        | 289 s ~10% |
+            | highway | surface     | bothw     |
+            | footway |             | 145s ~10% |
+            | footway | fine_gravel | 193s ~10% |
+            | footway | gravel      | 193s ~10% |
+            | footway | pebblestone | 193s ~10% |
+            | footway | mud         | 289s ~10% |
+            | footway | sand        | 289s ~10% |
@@ -1,248 +0,0 @@
-@routing @guidance @turn-lanes
-Feature: Turn Lane Guidance
-
-    Background:
-        Given the profile "car"
-        Given a grid size of 3 meters
-
-    @sliproads
-    Scenario: Separate Turn Lanes
-        Given the node map
-            """
-                          e
-            a     b       c g
-                          d
-                          f
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward | name     | oneway |
-            | ab    |                    | in       | yes    |
-            | bc    | left\|through      | in       | yes    |
-            | bd    | right              | in       | yes    |
-            | ec    |                    | cross    | no     |
-            | cd    |                    | cross    | no     |
-            | df    |                    | cross    | no     |
-            | cg    |                    | straight | no     |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction   |
-            | restriction | bd       | cd     | d        | no_left_turn  |
-            | restriction | bc       | cd     | c        | no_right_turn |
-
-       When I route I should get
-            | waypoints | route                | turns                           | lanes                                  |
-            | a,e       | in,cross,cross       | depart,turn left,arrive         | ,left:true straight:false right:false, |
-            | a,g       | in,straight,straight | depart,new name straight,arrive | ,left:false straight:true right:false, |
-            | a,f       | in,cross,cross       | depart,turn right,arrive        | ,left:false straight:false right:true, |
-
-    @sliproads
-    Scenario: Separate Turn Lanes
-        Given the node map
-            """
-                          e
-            a     b       c g
-                          d
-                          f
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward | name     | oneway |
-            | ab    |                    | in       | yes    |
-            | bc    | left\|through      | in       | yes    |
-            | bd    | right              | in       | yes    |
-            | ec    |                    | cross    | no     |
-            | cd    |                    | cross    | no     |
-            | df    |                    | cross    | no     |
-            | cg    |                    | straight | no     |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction   |
-            | restriction | bd       | cd     | d        | no_left_turn  |
-            | restriction | bc       | cd     | c        | no_right_turn |
-
-       When I route I should get
-            | waypoints | route                | turns                           | lanes                                  |
-            | a,e       | in,cross,cross       | depart,turn left,arrive         | ,left:true straight:false right:false, |
-            | a,g       | in,straight,straight | depart,new name straight,arrive | ,left:false straight:true right:false, |
-            | a,f       | in,cross,cross       | depart,turn right,arrive        | ,left:false straight:false right:true, |
-
-    @sliproads
-    Scenario: Separate Turn Lanes Next to other turns
-        Given the node map
-            """
-                          e
-            a     b       c g
-                          d
-                          f
-
-
-
-
-
-
-            i     h       j
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward | name     | oneway |
-            | ab    |                    | in       | yes    |
-            | bc    | left\|through      | in       | yes    |
-            | bd    | right              | in       | yes    |
-            | ec    |                    | cross    | no     |
-            | cd    |                    | cross    | no     |
-            | df    |                    | cross    | no     |
-            | cg    |                    | straight | no     |
-            | bh    | left\|right        | turn     | yes    |
-            | ihj   |                    | other    | no     |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction   |
-            | restriction | bd       | cd     | d        | no_left_turn  |
-            | restriction | bc       | cd     | c        | no_right_turn |
-
-       When I route I should get
-            | waypoints | route                | turns                               | lanes                                  |
-            | a,e       | in,cross,cross       | depart,turn left,arrive             | ,left:true straight:false right:false, |
-            | a,g       | in,straight,straight | depart,new name straight,arrive     | ,left:false straight:true right:false, |
-            | a,f       | in,cross,cross       | depart,turn right,arrive            | ,left:false straight:false right:true, |
-            | a,j       | in,turn,other,other  | depart,turn right,turn left,arrive  | ,,left:true right:false,               |
-            | a,i       | in,turn,other,other  | depart,turn right,turn right,arrive | ,,left:false right:true,               |
-
-    @todo @2654 @none
-    #https://github.com/Project-OSRM/osrm-backend/issues/2645
-    #http://www.openstreetmap.org/export#map=19/52.56054/13.32152
-    Scenario: Kurt-Schuhmacher-Damm
-        Given the node map
-            """
-                  g   f
-
-            j     h   e
-
-            a     b   c
-                  i   d
-            """
-
-        And the ways
-            | nodes | name | highway        | oneway | turn:lanes        |
-            | ab    |      | motorway_link  | yes    | left\|none\|right |
-            | bc    |      | primary_link   | yes    |                   |
-            | cd    | ksd  | secondary      | yes    |                   |
-            | cef   | ksd  | primary        | yes    |                   |
-            | hj    |      | motorway_link  | yes    |                   |
-            | eh    |      | secondary_link | yes    |                   |
-            | gh    | ksd  | primary        | yes    |                   |
-            | hbi   | ksd  | secondary      | yes    |                   |
-
-        When I route I should get
-            | waypoints | route    | turns                    | lanes                             |
-            | a,f       | ,ksd,ksd | depart,turn left,arrive  | ,left:true none:true right:false, |
-            | a,i       | ,ksd,ksd | depart,turn right,arrive | ,left:false none:true right:true, |
-
-    @todo @2650 @sliproads
-    #market and haight in SF, restricted turn
-    #http://www.openstreetmap.org/#map=19/37.77308/-122.42238
-    Scenario: Market/Haight without Through Street
-        Given the node map
-            """
-                          g j
-
-
-
-
-
-                              f
-                            e
-                          d
-            a           b c
-
-
-
-
-
-
-                    l     h i
-            """
-
-        And the ways
-            | nodes | name   | highway     | oneway | turn:lanes:forward |
-            | ab    | ghough | secondary   | yes    |                    |
-            | bc    | ghough | secondary   | yes    | through\|through   |
-            | bd    | ghough | secondary   | yes    | none\|through      |
-            | def   | ghough | secondary   | yes    |                    |
-            | gd    | market | primary     | yes    |                    |
-            | dc    | market | primary     | yes    |                    |
-            | ch    | market | primary     | yes    |                    |
-            | iej   | market | primary     | yes    |                    |
-            | bl    | haight | residential | yes    | left\|none         |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction   |
-            | relation    | bd       | dc     | d        | no_right_turn |
-
-        When I route I should get
-            | waypoints | route                | turns                              | lanes                                                    |
-            | a,l       | ghough,haight,haight | depart,turn right,arrive           | ,none:false straight:false straight:false straight:true, |
-            | a,h       | ghough,market,market | depart,turn slight right,arrive    | ,none:false straight:false straight:true straight:true,  |
-            | a,j       | ghough,market,market | depart,turn left,arrive            | ,none:true straight:false straight:false straight:false, |
-            | a,f       | ghough,ghough,ghough | depart,continue slight left,arrive | ,none:true straight:true straight:false straight:false,  |
-
-    @todo @2650 @sliproads
-    #market and haight in SF, unrestricted
-    #http://www.openstreetmap.org/#map=19/37.77308/-122.42238
-    Scenario: Market/Haight without Through Street
-        Given the node map
-            """
-                          g j
-
-
-
-
-
-                              f
-                            e
-                          d
-            a           b c
-
-
-
-
-
-
-                    l     h i
-            """
-
-        And the ways
-            | nodes | name   | highway     | oneway | turn:lanes:forward |
-            | ab    | ghough | secondary   | yes    |                    |
-            | bc    | ghough | secondary   | yes    | through\|through   |
-            | bd    | ghough | secondary   | yes    | none\|through      |
-            | def   | ghough | secondary   | yes    |                    |
-            | gd    | market | primary     | yes    |                    |
-            | dc    | market | primary     | yes    |                    |
-            | ch    | market | primary     | yes    |                    |
-            | iej   | market | primary     | yes    |                    |
-            | bl    | haight | residential | yes    | left\|none         |
-
-        When I route I should get
-            | waypoints | route                | turns                              | lanes                                                    |
-            | a,l       | ghough,haight,haight | depart,turn right,arrive           | ,none:false straight:false straight:false straight:true, |
-            | a,h       | ghough,market,market | depart,turn slight right,arrive    | ,none:false straight:false straight:true straight:true,  |
-            | a,j       | ghough,market,market | depart,turn left,arrive            | ,none:true straight:false straight:false straight:false, |
-            | a,f       | ghough,ghough,ghough | depart,continue slight left,arrive | ,none:true straight:true straight:false straight:false,  |
-
-    Scenario: Check sliproad handler loop's exit condition, Issue #2896
-      # http://www.openstreetmap.org/way/198481519
-        Given the node locations
-            | node | lat        | lon         |
-            | a    | 7.6125350  | 126.5708309 |
-            | b    | 7.6125156  | 126.5707219 |
-            | c    | 7.6125363  | 126.5708337 |
-
-        And the ways
-            | nodes | name |
-            | cbac  |      |
-
-        When I route I should get
-            | from | to | route | turns         |
-            | a    | c  | ,     | depart,arrive |
@@ -1,785 +0,0 @@
-@routing @guidance @turn-lanes
-Feature: Turn Lane Guidance
-
-    Background:
-        Given the profile "car"
-        Given a grid size of 20 meters
-
-    @anticipate
-    Scenario: Anticipate Lane Change for subsequent multi-lane intersections
-        Given the node map
-            """
-            a – b – x
-                |
-                c – d – z
-                |   |
-                y   e
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward           |
-            | ab    | through\|right\|right\|right |
-            | bx    |                              |
-            | bc    | left\|left\|through          |
-            | cd    | through\|right               |
-            | cy    |                              |
-            | dz    |                              |
-            | de    |                              |
-
-       When I route I should get
-            | waypoints | route          | turns                                         | lanes                                                                                                             | #      |
-            | a,d       | ab,bc,cd,cd    | depart,turn right,turn left,arrive            | ,straight:false right:true right:true right:false,left:true left:true straight:false,                             | 2 hops |
-            | a,e       | ab,bc,cd,de,de | depart,turn right,turn left,turn right,arrive | ,straight:false right:false right:true right:false,left:false left:true straight:false,straight:false right:true, | 3 hops |
-
-    @anticipate
-    Scenario: Anticipate Lane Change for quick same direction turns, staying on the same street
-        Given the node map
-            """
-            a – b – x
-                |
-                c
-                |
-            e – d – y
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward    | turn:lanes:backward | name |
-            | ab    | through\|right\|right |                     | MySt |
-            | bx    |                       |                     | XSt  |
-            | bc    |                       | left\|right         | MySt |
-            | cd    | left\|right           | through\|through    | MySt |
-            | de    |                       | left\|left\|through | MySt |
-            | dy    |                       |                     | YSt  |
-
-       When I route I should get
-            | waypoints | route               | turns                                   | lanes                                                         |
-            | a,e       | MySt,MySt,MySt,MySt | depart,continue right,turn right,arrive | ,straight:false right:false right:true,left:false right:true, |
-            | e,a       | MySt,MySt,MySt,MySt | depart,continue left,turn left,arrive   | ,left:true left:false straight:false,left:true right:false,   |
-
-    @anticipate
-    Scenario: Anticipate Lane Change for quick same direction turns, changing between streets
-        Given the node map
-            """
-            a – b – x
-                |
-                c
-                |
-            e – d – y
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward    | turn:lanes:backward | name |
-            | ab    | through\|right\|right |                     | AXSt |
-            | bx    |                       |                     | AXSt |
-            | bc    |                       | left\|right         | BDSt |
-            | cd    | left\|right           | through\|through    | BDSt |
-            | de    |                       | left\|left\|through | EYSt |
-            | dy    |                       |                     | EYSt |
-
-       When I route I should get
-            | waypoints | route               | turns                               | lanes                                                         |
-            | a,e       | AXSt,BDSt,EYSt,EYSt | depart,turn right,turn right,arrive | ,straight:false right:false right:true,left:false right:true, |
-            | e,a       | EYSt,BDSt,AXSt,AXSt | depart,turn left,turn left,arrive   | ,left:true left:false straight:false,left:true right:false,   |
-
-
-    @anticipate
-    Scenario: Anticipate Lane Change for quick turns during a merge
-        Given the node map
-            """
-            a
-              \
-            x – b – c – y
-                    |
-                    d
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward       | name | highway       | oneway |
-            | ab    | slight_left\|slight_left | On   | motorway_link | yes    |
-            | xb    |                          | Hwy  | motorway      |        |
-            | bc    | through\|slight_right    | Hwy  | motorway      |        |
-            | cd    |                          | Off  | motorway_link | yes    |
-            | cy    |                          | Hwy  | motorway      |        |
-
-       When I route I should get
-            | waypoints | route          | turns                                           | lanes                                                                 |
-            | a,d       | On,Hwy,Off,Off | depart,merge slight right,off ramp right,arrive | ,slight left:false slight left:true,straight:false slight right:true, |
-
-
-    @anticipate
-    Scenario: Schoenefelder Kreuz
-    # https://www.openstreetmap.org/way/264306388#map=16/52.3202/13.5568
-        Given the node map
-            """
-            a b – x
-                \       / i
-                  c – d
-                        \ j
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward                                  | lanes | highway       | oneway | name |
-            | ab    | none\|none\|none\|slight_right\|slight_right        |   5   | motorway      |        | abx  |
-            | bx    |                                                     |   3   | motorway      |        | abx  |
-            | bc    |                                                     |   2   | motorway_link | yes    | bcd  |
-            | cd    | slight_left\|slight_left;slight_right\|slight_right |   3   | motorway_link | yes    | bcd  |
-            | di    | slight_left\|slight_right                           |   2   | motorway_link | yes    | di   |
-            | dj    |                                                     |   2   | motorway_link | yes    | dj   |
-
-       When I route I should get
-            | waypoints | route         | turns                                          | lanes                                                                                                                                    |
-            | a,i       | abx,bcd,di,di | depart,off ramp right,fork slight left,arrive  | ,none:false none:false none:false slight right:true slight right:true,slight left:true slight left;slight right:true slight right:false, |
-            | a,j       | abx,bcd,dj,dj | depart,off ramp right,fork slight right,arrive | ,none:false none:false none:false slight right:true slight right:true,slight left:false slight left;slight right:true slight right:true, |
-
-
-    @anticipate
-    Scenario: Kreuz Oranienburg
-    # https://www.openstreetmap.org/way/4484007#map=18/52.70439/13.20269
-        Given the node map
-            """
-            i               a
-              ' .       . '
-            j – – c – b – – x
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward | lanes | highway       | oneway | name |
-            | ab    |                    | 1     | motorway_link | yes    | ab   |
-            | xb    |                    | 1     | motorway_link | yes    | xbcj |
-            | bc    | none\|slight_right | 2     | motorway_link | yes    | xbcj |
-            | ci    |                    | 1     | motorway_link | yes    | ci   |
-            | cj    |                    | 1     | motorway_link | yes    | xbcj |
-
-       When I route I should get
-            | waypoints | route        | turns                           | lanes                          |
-            | a,i       | ab,ci,ci     | depart,turn slight right,arrive | ,none:false slight right:true, |
-            | a,j       | ab,xbcj      | depart,arrive                   | ,                              |
-
-
-    @anticipate
-    Scenario: Lane anticipation for fan-in
-        Given the node map
-            """
-            a – b – x
-                |
-                c – d – z
-                |   |
-                y   e
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward           | name |
-            | ab    | through\|right\|right\|right | abx  |
-            | bx    |                              | abx  |
-            | bc    | left\|left\|through          | bcy  |
-            | cy    |                              | bcy  |
-            | cd    | through\|right               | cdz  |
-            | dz    |                              | cdz  |
-            | de    |                              | de   |
-
-       When I route I should get
-            | waypoints | route             | turns                                         | lanes                                                                                                             |
-            | a,e       | abx,bcy,cdz,de,de | depart,turn right,turn left,turn right,arrive | ,straight:false right:false right:true right:false,left:false left:true straight:false,straight:false right:true, |
-
-    @anticipate
-    Scenario: Lane anticipation for fan-out
-        Given the node map
-            """
-            a – b – x
-                |
-                c – d – z
-                |   |
-                y   e
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward           | name |
-            | ab    | through\|right               | abx  |
-            | bx    |                              | abx  |
-            | bc    | left\|left\|through          | bcy  |
-            | cy    |                              | bcy  |
-            | cd    | through\|right\|right\|right | cdz  |
-            | dz    |                              | cdz  |
-            | de    |                              | de   |
-
-       When I route I should get
-            | waypoints | route             | turns                                         | lanes                                                                                                          |
-            | a,e       | abx,bcy,cdz,de,de | depart,turn right,turn left,turn right,arrive | ,straight:false right:true,left:true left:true straight:false,straight:false right:true right:true right:true, |
-
-    @anticipate
-    Scenario: Lane anticipation for fan-in followed by fan-out
-        Given the node map
-            """
-            a – b – x
-                |
-                c – d – z
-                |   |
-                y   e
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward           | name |
-            | ab    | through\|right\|right\|right | abx  |
-            | bx    |                              | abx  |
-            | bc    | left\|left\|through          | bcy  |
-            | cy    |                              | bcy  |
-            | cd    | through\|right\|right\|right | cdz  |
-            | dz    |                              | cdz  |
-            | de    |                              | de   |
-
-       When I route I should get
-            | waypoints | route             | turns                                         | lanes                                                                                                                                 |
-            | a,e       | abx,bcy,cdz,de,de | depart,turn right,turn left,turn right,arrive | ,straight:false right:true right:true right:false,left:true left:true straight:false,straight:false right:true right:true right:true, |
-
-    @anticipate
-    Scenario: Lane anticipation for fan-out followed by fan-in
-        Given the node map
-            """
-            a – b – x
-                |
-                c – d – z
-                |   |
-                y   e
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward  | name |
-            | ab    | through\|right      | abx  |
-            | bx    |                     | abx  |
-            | bc    | left\|left\|through | bcy  |
-            | cy    |                     | bcy  |
-            | cd    | through\|right      | cdz  |
-            | dz    |                     | cdz  |
-            | de    |                     | de   |
-
-       When I route I should get
-            | waypoints | route             | turns                                         | lanes                                                                                     |
-            | a,e       | abx,bcy,cdz,de,de | depart,turn right,turn left,turn right,arrive | ,straight:false right:true,left:false left:true straight:false,straight:false right:true, |
-
-    @anticipate
-    Scenario: Lane anticipation for multiple hops with same number of lanes
-        Given the node map
-            """
-            a – b – x
-                |
-                c – d – z
-                |   |
-                y   e – f
-                    |
-                    w
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward           | name |
-            | ab    | through\|right\|right\|right | abx  |
-            | bx    |                              | abx  |
-            | bc    | left\|left\|through          | bcy  |
-            | cy    |                              | bcy  |
-            | cd    | through\|right\|right        | cdz  |
-            | dz    |                              | cdz  |
-            | de    | left\|through                | dew  |
-            | ew    |                              | dew  |
-            | ef    |                              | ef   |
-
-       When I route I should get
-            | waypoints | route                 | turns                                                   | lanes                                                                                                                                                  |
-            | a,f       | abx,bcy,cdz,dew,ef,ef | depart,turn right,turn left,turn right,turn left,arrive | ,straight:false right:true right:false right:false,left:true left:false straight:false,straight:false right:true right:false,left:true straight:false, |
-
-       @anticipate
-       Scenario: Anticipate Lanes for through, through with lanes
-           Given the node map
-               """
-                         f   g
-                        /   /
-               a – b – c – d – e
-                        \   \
-                         h   i
-               """
-
-           And the ways
-               | nodes | turn:lanes:forward                     | name |
-               | ab    |                                        | main |
-               | bc    | left\|through\|through\|through\|right | main |
-               | cd    | left\|through\|right                   | main |
-               | de    |                                        | main |
-               | cf    |                                        | off  |
-               | ch    |                                        | off  |
-               | dg    |                                        | off  |
-               | di    |                                        | off  |
-
-          When I route I should get
-               | waypoints | route          | turns                           | lanes                                                                |
-               | a,e       | main,main,main | depart,use lane straight,arrive | ,left:false straight:false straight:true straight:false right:false, |
-
-       @anticipate
-       Scenario: Anticipate Lanes for through and collapse multiple use lanes
-           Given the node map
-               """
-                     e   f   g
-                    /   /   /
-               a – b – c – d
-                    \   \   \
-                     h   i   j
-               """
-
-           And the ways
-               | nodes | turn:lanes:forward                     | name |
-               | ab    | left\|through\|through\|right          | main |
-               | bc    | left\|through\|through\|right          | main |
-               | cd    | left\|through\|through\|through\|right | main |
-               | be    |                                        | off  |
-               | bh    |                                        | off  |
-               | cf    |                                        | off  |
-               | ci    |                                        | off  |
-               | dg    |                                        | off  |
-               | dj    |                                        | off  |
-
-          When I route I should get
-               | waypoints | route     | turns         | lanes |
-               | a,c       | main,main | depart,arrive | ,     |
-               | a,d       | main,main | depart,arrive | ,     |
-
-       @anticipate
-       Scenario: Anticipate Lanes for through followed by left/right
-           Given the node map
-               """
-                     f   g   d
-                    /   /   /
-               a – b – c – x
-                    \   \   \
-                     h   i   e
-               """
-
-           And the ways
-               | nodes | turn:lanes:forward                              | name  |
-               | ab    | left\|through\|through\|through\|through\|right | main  |
-               | bc    | left\|through\|through\|right                   | main  |
-               | cx    | left\|right                                     | main  |
-               | xd    |                                                 | left  |
-               | xe    |                                                 | right |
-               | bf    |                                                 | off   |
-               | bh    |                                                 | off   |
-               | cg    |                                                 | off   |
-               | ci    |                                                 | off   |
-
-          When I route I should get
-               | waypoints | route                      | turns                                                        | lanes                                                                                                                                                         |
-               | a,d       | main,main,main,left,left   | depart,use lane straight,use lane straight,turn left,arrive  | ,left:false straight:false straight:true straight:false straight:false right:false,left:false straight:true straight:false right:false,left:true right:false, |
-               | a,e       | main,main,main,right,right | depart,use lane straight,use lane straight,turn right,arrive | ,left:false straight:false straight:false straight:true straight:false right:false,left:false straight:false straight:true right:false,left:false right:true, |
-
-       @anticipate
-       Scenario: Anticipate Lanes for through with turn before / after
-           Given the node map
-               """
-               c       g       l
-               b – d – e – h - i
-               a       f       j
-               """
-
-           And the ways
-               | nodes | turn:lanes:forward                                           | name  | oneway |
-               | ab    | right\|right\|right\|right                                   | ab    | yes    |
-               | cb    | left\|left\|left\|left                                       | cb    | yes    |
-               | bd    |                                                              | bdehi |        |
-               | de    | left\|left\|through\|through\|through\|through\|right\|right | bdehi |        |
-               | ef    |                                                              | ef    |        |
-               | eg    |                                                              | eg    |        |
-               | eh    |                                                              | bdehi |        |
-               | hi    | left\|left\|right\|right                                     | bdehi |        |
-               | ij    |                                                              | ij    |        |
-               | il    |                                                              | il    |        |
-
-          When I route I should get
-               | waypoints | route                | turns                                                 | lanes                                                                                                                                                                                               | #           |
-               | a,f       | ab,bdehi,ef,ef       | depart,turn right,turn right,arrive                   | ,right:false right:false right:true right:true,left:false left:false straight:false straight:false straight:false straight:false right:true right:true,                                             |             |
-               | a,g       | ab,bdehi,eg,eg       | depart,turn right,turn left,arrive                    | ,right:true right:true right:false right:false,left:true left:true straight:false straight:false straight:false straight:false right:false right:false,                                             |             |
-               | a,j       | ab,bdehi,bdehi,ij,ij | depart,turn right,use lane straight,turn right,arrive | ,right:true right:true right:false right:false,left:false left:false straight:false straight:false straight:true straight:true right:false right:false,left:false left:false right:true right:true, |             |
-               | a,l       | ab,bdehi,bdehi,il,il | depart,turn right,use lane straight,turn left,arrive  | ,right:false right:false right:true right:true,left:false left:false straight:true straight:true straight:false straight:false right:false right:false,left:true left:true right:false right:false, | not perfect |
-               | c,g       | cb,bdehi,eg,eg       | depart,turn left,turn left,arrive                     | ,left:true left:true left:false left:false,left:true left:true straight:false straight:false straight:false straight:false right:false right:false,                                                 |             |
-               | c,f       | cb,bdehi,ef,ef       | depart,turn left,turn right,arrive                    | ,left:false left:false left:true left:true,left:false left:false straight:false straight:false straight:false straight:false right:true right:true,                                                 |             |
-               | c,l       | cb,bdehi,bdehi,il,il | depart,turn left,use lane straight,turn left,arrive   | ,left:false left:false left:true left:true,left:false left:false straight:true straight:true straight:false straight:false right:false right:false,left:true left:true right:false right:false,     |             |
-               | c,j       | cb,bdehi,bdehi,ij,ij | depart,turn left,use lane straight,turn right,arrive  | ,left:true left:true left:false left:false,left:false left:false straight:false straight:false straight:true straight:true right:false right:false,left:false left:false right:true right:true,     | not perfect |
-
-       @anticipate
-       Scenario: Anticipate Lanes for turns with through before and after
-           Given a grid size of 10 meters
-           Given the node map
-               """
-               a – b – q       s   h – i
-                     \       /   /
-                       e – f – g
-                     /       \   \
-               c – d – r       t   j – k
-
-               """
-
-           And the ways
-               | nodes | turn:lanes:forward                              | name | highway | oneway |
-               | ab    | through\|right\|right\|right                    | top  | primary | yes    |
-               | be    |                                                 | top  | primary | yes    |
-               | bq    |                                                 | off  | primary | yes    |
-               | ef    | left\|through\|through\|through\|through\|right | main | primary | yes    |
-               | fg    | left\|left\|right\|right                        | main | primary | yes    |
-               | fs    |                                                 | off  | primary | yes    |
-               | ft    |                                                 | off  | primary | yes    |
-               | gh    |                                                 | top  | primary | yes    |
-               | hi    |                                                 | top  | primary | yes    |
-               | cd    | left\|left\|left\|through                       | bot  | primary | yes    |
-               | de    |                                                 | bot  | primary | yes    |
-               | dr    |                                                 | off  | primary | yes    |
-               | gj    |                                                 | bot  | primary | yes    |
-               | jk    |                                                 | bot  | primary | yes    |
-
-          When I route I should get
-               | waypoints | route                 | turns                                                  | lanes                                                                                                                                                                           |
-               | a,i       | top,main,main,top,top | depart,turn right,use lane straight,turn left,arrive   | ,straight:false right:false right:true right:true,left:false straight:true straight:true straight:false straight:false right:false,left:true left:true right:false right:false, |
-               | a,k       | top,main,main,bot,bot | depart,turn right,use lane straight,turn right,arrive  | ,straight:false right:true right:true right:false,left:false straight:false straight:false straight:true straight:true right:false,left:false left:false right:true right:true, |
-               | c,i       | bot,main,main,top,top | depart,turn left,use lane straight,turn left,arrive    | ,left:false left:true left:true straight:false,left:false straight:true straight:true straight:false straight:false right:false,left:true left:true right:false right:false,    |
-               | c,k       | bot,main,main,bot,bot | depart,turn left,use lane straight,turn right,arrive   | ,left:true left:true left:false straight:false,left:false straight:false straight:false straight:true straight:true right:false,left:false left:false right:true right:true,    |
-
-       @anticipate
-       Scenario: Anticipate Lanes for turn between throughs
-           Given the node map
-               """
-                   q
-                   |
-               a – b – c – s
-                   |   |
-                   r   d – t
-                       |
-                       e
-               """
-
-           And the ways
-               | nodes | turn:lanes:forward                                       | name |
-               | ab    | left\|through\|through\|through\|through\|through\|right | main |
-               | bq    |                                                          | off  |
-               | br    |                                                          | off  |
-               | bc    | through\|through\|right\|right\|right                    | main |
-               | cs    |                                                          | off  |
-               | cd    | left\|through\|through                                   | main |
-               | de    |                                                          | main |
-               | dt    |                                                          | off  |
-
-          When I route I should get
-               | waypoints | route               | turns                                          | lanes                                                                                                                                                             |
-               | a,e       | main,main,main,main | depart,use lane straight,continue right,arrive | ,left:false straight:false straight:false straight:false straight:true straight:true right:false,straight:false straight:false right:false right:true right:true, |
-
-    @anticipate @todo @2661
-    Scenario: Anticipate with lanes in roundabout: roundabouts as the unit of anticipation
-        Given the node map
-            """
-                 /e\
-            a – b   d – f
-                 \c/
-                  |
-                 /g\
-            k – h   j – l
-                 \i/
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward                       | highway | junction   | #   |
-            | ab    | slight_right\|slight_right\|slight_right | primary |            |     |
-            | bc    | slight_left\|slight_right\|slight_right  | primary | roundabout | top |
-            | cd    |                                          | primary | roundabout | top |
-            | de    |                                          | primary | roundabout | top |
-            | eb    |                                          | primary | roundabout | top |
-            | df    |                                          | primary |            |     |
-            | cg    | slight_right\|slight_right               | primary |            |     |
-            | gh    | slight_left\|slight_right                | primary | roundabout | bot |
-            | hi    |                                          | primary | roundabout | bot |
-            | ij    | slight_left\|slight_right                | primary | roundabout | bot |
-            | jg    |                                          | primary | roundabout | bot |
-            | hk    |                                          | primary |            |     |
-            | jl    |                                          | primary |            |     |
-
-        When I route I should get
-            | #           | waypoints | route       | turns                                             | lanes                                                                                          |
-            | right-right | a,k       | ab,cg,hk,hk | depart,roundabout-exit-1,roundabout-exit-1,arrive | ,slight right:false slight right:false slight right:true,slight right:false slight right:true, |
-            | right-left  | a,l       | ab,cg,jl,jl | depart,roundabout-exit-1,roundabout-exit-2,arrive | ,slight right:false slight right:false slight right:true,slight right:false slight right:true, |
-            | todo exits  | a,f       | ab,df,df    | depart,roundabout-exit-2,arrive                   | ,slight right:false slight right:false slight right:true,                                      |
-            | todo exits  | a,e       | ab,bc,eb    | depart,roundabout-exit-undefined,arrive           | ,slight right:true slight right:true slight right:true,                                        |
-
-    @anticipate @todo
-    Scenario: Roundabout with lanes only tagged on exit
-        Given the node map
-            """
-                 /e\
-            a – b   d – f
-                 \c/
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward                     | highway | junction   |
-            | ab    |                                        | primary |            |
-            | bc    |                                        | primary | roundabout |
-            | cd    | slight_left\|slight_left\|slight_right | primary | roundabout |
-            | de    |                                        | primary | roundabout |
-            | eb    |                                        | primary | roundabout |
-            | df    |                                        | primary |            |
-
-        When I route I should get
-            | waypoints | route    | turns                                                 | lanes                                                    |
-            | a,f       | ab,df,df | depart,roundabout-exit-1,use lane slight right,arrive | ,,slight left:false slight left:false slight right:true, |
-
-    @anticipate
-    Scenario: No Lanes for Roundabouts, see #2626
-        Given the node map
-            """
-                a
-                |
-               /b\
-              c   g – h
-             /|   |
-            | d   f
-            |/ \e/ \
-            x     \ y
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward         | highway | junction   |
-            | ab    | slight_right\|slight_right | primary |            |
-            | bc    |                            | primary | roundabout |
-            | cd    |                            | primary | roundabout |
-            | de    |                            | primary | roundabout |
-            | ef    |                            | primary | roundabout |
-            | fg    | through\|slight_right      | primary | roundabout |
-            | gb    |                            | primary | roundabout |
-            | gh    |                            | primary |            |
-            | cx    |                            | primary |            |
-            | dx    |                            | primary |            |
-            | ey    |                            | primary |            |
-            | fy    |                            | primary |            |
-
-        When I route I should get
-            | waypoints | route    | turns                           | lanes |
-            | a,h       | ab,gh,gh | depart,roundabout-exit-5,arrive | ,,    |
-
-    @anticipate
-    Scenario: No Lanes for Roundabouts, see #2626
-        Given the node map
-            """
-                 /a\
-            x – b   d – y
-                 \c/
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward         | highway | junction   | name       |
-            | xb    | slight_right\|slight_right | primary |            | xb         |
-            | dy    |                            | primary |            | dy         |
-            | ab    |                            | primary | roundabout | roundabout |
-            | bc    |                            | primary | roundabout | roundabout |
-            | cd    | left\|slight_right         | primary | roundabout | roundabout |
-            | da    |                            | primary | roundabout | roundabout |
-
-        When I route I should get
-            | waypoints | route                    | turns                                   | lanes |
-            | x,y       | xb,dy,dy                 | depart,roundabout-exit-1,arrive         | ,,    |
-            | x,c       | xb,roundabout,roundabout | depart,roundabout-exit-undefined,arrive | ,,    |
-            | x,a       | xb,roundabout,roundabout | depart,roundabout-exit-undefined,arrive | ,,    |
-
-    @anticipate
-    Scenario: No Lanes for Roundabouts, see #2626
-        Given the profile file "car" extended with
-        """
-        properties.left_hand_driving = true
-        """
-        And the node map
-            """
-                  a
-                  |
-                 /b\
-            h – c   g
-                |   |\
-                d   f |
-               / \e/ \|
-              x /     y
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward         | highway | junction   |
-            | ab    | slight_left\|slight_left   | primary |            |
-            | bg    |                            | primary | roundabout |
-            | gf    |                            | primary | roundabout |
-            | fe    |                            | primary | roundabout |
-            | ed    |                            | primary | roundabout |
-            | dc    | slight_left                | primary | roundabout |
-            | cb    |                            | primary | roundabout |
-            | ch    |                            | primary |            |
-            | ex    |                            | primary |            |
-            | dx    |                            | primary |            |
-            | gy    |                            | primary |            |
-            | fy    |                            | primary |            |
-
-        When I route I should get
-            | waypoints | route      | turns                           | lanes |
-            | a,h       | ab,ch,ch   | depart,roundabout-exit-5,arrive | ,,    |
-
-    @anticipate
-    Scenario: No Lanes for Roundabouts, see #2626
-        Given the node map
-            """
-                 /a\
-            x – b   d – y
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                |   |
-                 | |
-                 | |
-                 | |
-                 | |
-                 | |
-                 | |
-                 | |
-                 | |
-                 | |
-                 | |
-                 | |
-                 | |
-                  |
-                  |
-                  |
-                  |
-                  |
-                  |
-                  |
-                  |
-                  |
-                  |
-                  |
-                  |
-                  c
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward         | highway | junction   | name       |
-            | xb    | slight_right\|slight_right | primary |            | xb         |
-            | dy    |                            | primary |            | dy         |
-            | ab    |                            | primary | roundabout | roundabout |
-            | bc    |                            | primary | roundabout | roundabout |
-            | cd    | left\|slight_right         | primary | roundabout | roundabout |
-            | da    |                            | primary | roundabout | roundabout |
-
-        When I route I should get
-            | waypoints | route                    | turns                                   | lanes |
-            | x,y       | xb,dy,dy                 | depart,roundabout-exit-1,arrive         | ,,    |
-            | x,c       | xb,roundabout,roundabout | depart,roundabout-exit-undefined,arrive | ,,    |
-            | x,a       | xb,roundabout,roundabout | depart,roundabout-exit-undefined,arrive | ,,    |
-
-    @anticipate @todo @2032
-    Scenario: No Lanes for Roundabouts, see #2626
-        Given the node map
-            """
-            a – b –x
-                |
-               /c\
-              d   f – g – z
-               \e/    |
-                |     h
-                y
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward                                  | highway | junction   | name  |
-            | ab    | through\|right\|right\|right\|right                 | primary |            | abx   |
-            | bx    |                                                     | primary |            | abx   |
-            | bc    | right\|right\|right\|right                          | primary |            | bc    |
-            | cd    |                                                     | primary | roundabout | cdefc |
-            | de    | slight_left\|slight_left\|slight_left\|slight_right | primary | roundabout | cdefc |
-            | ef    | left\|slight_right\|slight_right                    | primary | roundabout | cdefc |
-            | fc    |                                                     | primary | roundabout | cdefc |
-            | ey    |                                                     | primary |            | ey    |
-            | fg    | through\|right                                      | primary |            | fg    |
-            | gz    |                                                     | primary |            | gz    |
-            | gh    |                                                     | primary |            | gh    |
-
-        When I route I should get
-            | waypoints | route           | turns                                            | lanes                                                                                      |
-            | a,h       | abx,bc,fg,gh,gh | depart,turn right,cdefc-exit-2,turn right,arrive | ,straight:false right:false right:false right:false right:true,,straight:false right:true, |
-
-    @anticipate
-    Scenario: Anticipate none tags
-        Given the node map
-            """
-            c       g       l
-            b – d – e – h - i
-            a       f       j
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward       | highway   | name |
-            | ab    | none\|none\|right\|right | primary   | abc  |
-            | bc    |                          | primary   | abc  |
-            | bd    |                          | primary   | bdeh |
-            | de    | left\|none\|none\|right  | primary   | bdeh |
-            | eh    |                          | primary   | bdeh |
-            | ef    |                          | primary   | feg  |
-            | eg    |                          | primary   | feg  |
-
-        When I route I should get
-            | waypoints | route            | turns                               | lanes                                                                                      |
-            | a,g       | abc,bdeh,feg,feg | depart,turn right,turn left,arrive  | ,none:false none:false right:true right:false,left:true none:false none:false right:false, |
-            | a,f       | abc,bdeh,feg,feg | depart,turn right,turn right,arrive | ,none:false none:false right:false right:true,left:false none:false none:false right:true, |
-
-    @anticipate
-    Scenario: Triple Right keeping Left
-        Given the node map
-            """
-                  a – b – i
-                      |
-            f – e – g |
-                |     |
-                |     |
-            j – d – – c
-                      |
-                      h
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward | highway   | name   |
-            | abi   | \|\|right\|right   | primary   | start  |
-            | bch   | \|\|right\|right   | primary   | first  |
-            | cdj   | \|\|right\|right   | primary   | second |
-            | de    | left\|right\|right | secondary | third  |
-            | feg   |                    | tertiary  | fourth |
-
-        When I route I should get
-            | waypoints | route                                  | turns                                                     | lanes                                                                                                                                                                      |
-            | a,f       | start,first,second,third,fourth,fourth | depart,turn right,turn right,turn right,turn left,arrive  | ,none:false none:false right:true right:false,none:false none:false right:true right:false,none:false none:false right:true right:false,left:true right:false right:false, |
-            | a,g       | start,first,second,third,fourth,fourth | depart,turn right,turn right,turn right,turn right,arrive | ,none:false none:false right:true right:true,none:false none:false right:true right:true,none:false none:false right:true right:true,left:false right:true right:true,     |
-
-    @anticipate
-    Scenario: Tripple Left keeping Right
-        Given the node map
-            """
-            i – b – a
-                |
-                | g – e – f
-                |     |
-                |     |
-                c – – d – j
-                |
-                h
-            """
-
-        And the ways
-            | nodes | turn:lanes:forward | highway   | name   |
-            | abi   | left\|left\|\|     | primary   | start  |
-            | bch   | left\|left\|\|     | primary   | first  |
-            | cdj   | left\|left\|\|     | primary   | second |
-            | de    | left\|left\|right  | secondary | third  |
-            | feg   |                    | tertiary  | fourth |
-
-        When I route I should get
-            | waypoints | route                                  | turns                                                  | lanes                                                                                                                                                               |
-            | a,f       | start,first,second,third,fourth,fourth | depart,turn left,turn left,turn left,turn right,arrive | ,left:false left:true none:false none:false,left:false left:true none:false none:false,left:false left:true none:false none:false,left:false left:false right:true, |
-            | a,g       | start,first,second,third,fourth,fourth | depart,turn left,turn left,turn left,turn left,arrive  | ,left:true left:true none:false none:false,left:true left:true none:false none:false,left:true left:true none:false none:false,left:true left:true right:false,     |
@@ -1,33 +0,0 @@
-@routing @bicycle @mode
-Feature: Bike - Mode flag
-
-    Background:
-        Given the profile "bicycle"
-        Given a grid size of 5 meters
-
-    Scenario: Bike Sliproad
-        Given the node map
-            """
-                  i
-            a b - c-d
-                ` |
-                g-e-h
-                  |
-                  |
-                  f
-            """
-
-        And the nodes
-            | node | highway         |
-            | c    | traffic_signals |
-
-        And the ways
-            | nodes | highway   | name   | oneway:bicycle |
-            | abcd  | cycleway  | street |                |
-            | eb    | path      |        | yes            |
-            | icef  | tertiary  | road   |                |
-            | geh   | secondary | street |                |
-
-        When I route I should get
-            | waypoints | route             | turns                               |
-            | a,f       | street,,road,road | depart,turn right,turn right,arrive |
@@ -1,132 +0,0 @@
-@routing @car @bridge @tunnel @guidance
-Feature: Car - Guidance - Bridges and Tunnels
-    Background:
-        Given the profile "car"
-        And a grid size of 100 meters
-
-    Scenario: Simple Bridge
-        Given the node map
-            """
-            a b c d
-            """
-
-        And the ways
-            | nodes | highway | bridge | name               |
-            | ab    | primary |        | Hauptstraße        |
-            | bc    | primary | yes    | Hauptstraßenbrücke |
-            | cd    | primary |        | Hauptstraße        |
-
-        When I route I should get
-            | from | to | route                   | turns         |
-            | a    | d  | Hauptstraße,Hauptstraße | depart,arrive |
-
-    Scenario: Bridge with Immediate Turn
-        Given the node map
-            """
-                  d
-            a   b c
-                  e
-            """
-
-        And the ways
-            | nodes | highway | bridge | name               |
-            | ab    | primary |        | Hauptstraße        |
-            | bc    | primary | yes    | Hauptstraßenbrücke |
-            | dce   | primary |        | Nebenstraße        |
-
-        When I route I should get
-            | from | to | route                                      | turns                    |
-            | a    | d  | Hauptstraße,Nebenstraße,Nebenstraße        | depart,turn left,arrive  |
-            | a    | e  | Hauptstraße,Nebenstraße,Nebenstraße        | depart,turn right,arrive |
-            | e    | a  | Nebenstraße,Hauptstraßenbrücke,Hauptstraße | depart,turn left,arrive  |
-            | d    | a  | Nebenstraße,Hauptstraßenbrücke,Hauptstraße | depart,turn right,arrive |
-
-    Scenario: Bridge with Immediate Turn Front and Back
-        Given the node map
-            """
-            f     d
-            a   b c
-            g     e
-            """
-
-        And the ways
-            | nodes | highway | bridge | name               |
-            | ab    | primary |        | Hauptstraße        |
-            | bc    | primary | yes    | Hauptstraßenbrücke |
-            | dce   | primary |        | Nebenstraße        |
-            | gaf   | primary |        | Anderestraße       |
-
-        When I route I should get
-            | from | to | route                                                    | turns                               |
-            | f    | d  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn left,turn left,arrive   |
-            | f    | e  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn left,turn right,arrive  |
-            | g    | d  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn right,turn left,arrive  |
-            | g    | e  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn right,turn right,arrive |
-            | e    | f  | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn left,turn right,arrive  |
-            | e    | g  | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn left,turn left,arrive   |
-            | d    | f  | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn right,turn right,arrive |
-            | d    | g  | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn right,turn left,arrive  |
-
-    Scenario: Simple Tunnel
-        Given the node map
-            """
-            a b c d
-            """
-
-        And the ways
-            | nodes | highway | tunnel | name               |
-            | ab    | primary |        | Hauptstraße        |
-            | bc    | primary | yes    | Hauptstraßentunnel |
-            | cd    | primary |        | Hauptstraße        |
-
-        When I route I should get
-            | from | to | route                   | turns         |
-            | a    | d  | Hauptstraße,Hauptstraße | depart,arrive |
-
-    Scenario: Tunnel with Immediate Turn
-        Given the node map
-            """
-                  d
-            a   b c
-                  e
-            """
-
-        And the ways
-            | nodes | highway | tunnel | name               |
-            | ab    | primary |        | Hauptstraße        |
-            | bc    | primary | yes    | Hauptstraßentunnel |
-            | dce   | primary |        | Nebenstraße        |
-
-        When I route I should get
-            | from | to | route                                      | turns                    |
-            | a    | d  | Hauptstraße,Nebenstraße,Nebenstraße        | depart,turn left,arrive  |
-            | a    | e  | Hauptstraße,Nebenstraße,Nebenstraße        | depart,turn right,arrive |
-            | e    | a  | Nebenstraße,Hauptstraßentunnel,Hauptstraße | depart,turn left,arrive  |
-            | d    | a  | Nebenstraße,Hauptstraßentunnel,Hauptstraße | depart,turn right,arrive |
-
-    Scenario: Tunnel with Immediate Turn Front and Back
-        Given the node map
-            """
-            f     d
-            a   b c
-            g     e
-            """
-
-        And the ways
-            | nodes | highway | bridge | name               |
-            | ab    | primary |        | Hauptstraße        |
-            | bc    | primary | yes    | Hauptstraßentunnel |
-            | dce   | primary |        | Nebenstraße        |
-            | gaf   | primary |        | Anderestraße       |
-
-        When I route I should get
-            | from | to | route                                                    | turns                               |
-            | f    | d  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn left,turn left,arrive   |
-            | f    | e  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn left,turn right,arrive  |
-            | g    | d  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn right,turn left,arrive  |
-            | g    | e  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn right,turn right,arrive |
-            | e    | f  | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn left,turn right,arrive  |
-            | e    | g  | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn left,turn left,arrive   |
-            | d    | f  | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn right,turn right,arrive |
-            | d    | g  | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn right,turn left,arrive  |
-
@@ -1,52 +0,0 @@
-@routing @guidance
-Feature: Features related to bugs
-
-    Background:
-        Given the profile "car"
-        Given a grid size of 5 meters
-
-    @2852
-    Scenario: Loop
-        Given the node map
-            """
-            a 1   g     b
-
-
-            e           f
-
-                        2
-            d     h     c
-            """
-
-        And the ways
-            | nodes | name   | oneway |
-            | agb   | top    | yes    |
-            | bfc   | right  | yes    |
-            | chd   | bottom | yes    |
-            | dea   | left   | yes    |
-
-        And the nodes
-            | node | highway         |
-            | g    | traffic_signals |
-            | f    | traffic_signals |
-            | h    | traffic_signals |
-            | e    | traffic_signals |
-
-        When I route I should get
-            | waypoints | route           | turns                        |
-            | 1,2       | top,right,right | depart,new name right,arrive |
-
-    @3156
-    Scenario: Incorrect lanes tag
-        Given the node map
-            """
-            a b
-            """
-
-        And the ways
-            | nodes | lanes |
-            | ab    | 1; 2  |
-
-        And the data has been saved to disk
-        When I try to run "osrm-extract {osm_file} --profile {profile_file}"
-        Then it should exit successfully
@@ -1,57 +0,0 @@
-@routing  @guidance @collapsing
-Feature: Collapse
-
-    Background:
-        Given the profile "car"
-        Given a grid size of 5 meters
-
-    @reverse
-    Scenario: Collapse U-Turn Triangle Intersection
-        Given the node map
-            """
-            g   f   e   d
-
-
-            a     b     c
-            """
-
-        And the ways
-            | nodes | highway      | name | oneway |
-            | abc   | primary      | road | yes    |
-            | defg  | primary      | road | yes    |
-            | fb    | primary_link |      | yes    |
-            | be    | primary_link |      | yes    |
-
-       When I route I should get
-            | waypoints | route          | turns                        |
-            | a,g       | road,road,road | depart,continue uturn,arrive |
-            | d,c       | road,road,road | depart,continue uturn,arrive |
-
-    @reverse @traffic-signals
-    Scenario: Collapse U-Turn Triangle Intersection
-        Given the node map
-            """
-            g   f   j   e   d
-
-                  h   i
-
-            a       b       c
-            """
-
-        And the ways
-            | nodes | highway      | name | oneway |
-            | abc   | primary      | road | yes    |
-            | dejfg | primary      | road | yes    |
-            | fhb   | primary_link |      |        |
-            | bie   | primary_link |      |        |
-
-       And the nodes
-            | node | highway         |
-            | j    | traffic_signals |
-            | h    | traffic_signals |
-            | i    | traffic_signals |
-
-       When I route I should get
-            | waypoints | route          | turns                        |
-            | a,g       | road,road,road | depart,continue uturn,arrive |
-            | d,c       | road,road,road | depart,continue uturn,arrive |
@@ -7,10 +7,8 @@ Feature: Continue Instructions

    Scenario: Road turning left
        Given the node map
-            """
-                c
-            a   b d
-            """
+            |   |   | c |   |
+            | a |   | b | d |

        And the ways
            | nodes  | highway |
@@ -18,53 +16,14 @@ Feature: Continue Instructions
            | bd     | primary |

       When I route I should get
-            | waypoints | route       | turns                       |
-            | a,c       | abc,abc,abc | depart,continue left,arrive |
-            | a,d       | abc,bd,bd   | depart,turn straight,arrive |
-
-    Scenario: Road turning left and straight
-        Given the node map
-            """
-                c
-            a   b d
-            """
-
-        And the ways
-            | nodes  | highway | name |
-            | abc    | primary | road |
-            | bd     | primary | road |
-
-       When I route I should get
-            | waypoints | route          | turns                       |
-            | a,c       | road,road,road | depart,continue left,arrive |
-            | a,d       | road,road      | depart,arrive               |
-
-    Scenario: Road turning left and straight
-        Given the node map
-            """
-                c
-            a   b d
-                e
-            """
-
-        And the ways
-            | nodes  | highway | name |
-            | abc    | primary | road |
-            | bd     | primary | road |
-            | be     | primary | road |
-
-       When I route I should get
-            | waypoints | route          | turns                        |
-            | a,c       | road,road,road | depart,continue left,arrive  |
-            | a,d       | road,road      | depart,arrive                |
-            | a,e       | road,road,road | depart,continue right,arrive |
+            | waypoints | route       | turns                           |
+            | a,c       | abc,abc,abc | depart,continue left,arrive     |
+            | a,d       | abc,bd,bd   | depart,new name straight,arrive |

    Scenario: Road turning right
        Given the node map
-            """
-            a   b d
-                c
-            """
+            | a |   | b | d |
+            |   |   | c |   |

        And the ways
            | nodes  | highway |
@@ -72,18 +31,16 @@ Feature: Continue Instructions
            | bd     | primary |

       When I route I should get
-            | waypoints | route       | turns                        |
-            | a,c       | abc,abc,abc | depart,continue right,arrive |
-            | a,d       | abc,bd,bd   | depart,turn straight,arrive  |
+            | waypoints | route       | turns                           |
+            | a,c       | abc,abc,abc | depart,continue right,arrive    |
+            | a,d       | abc,bd,bd   | depart,new name straight,arrive |

    Scenario: Road turning slight left
        Given the node map
-            """
-                    c
-
-            a   b
-                  d
-            """
+            |   |   |   |   | c |
+            |   |   |   |   |   |
+            | a |   | b |   |   |
+            |   |   |   | d |   |

        And the ways
            | nodes  | highway |
@@ -97,12 +54,10 @@ Feature: Continue Instructions

    Scenario: Road turning slight right
        Given the node map
-            """
-                  d
-            a   b
-
-                    c
-            """
+            |   |   |   | d |   |
+            | a |   | b |   |   |
+            |   |   |   |   |   |
+            |   |   |   |   | c |

        And the ways
            | nodes  | highway |
@@ -116,13 +71,11 @@ Feature: Continue Instructions

    Scenario: Road Loop
       Given the node map
-           """
-               f   e
-
-           a   b g
-
-               c   d
-           """
+           |   |   | f |   | e |
+           |   |   |   |   |   |
+           | a |   | b | g |   |
+           |   |   |   |   |   |
+           |   |   | c |   | d |

       And the ways
          | nodes   | highway |
@@ -134,5 +87,4 @@ Feature: Continue Instructions
          | a,c       | abcdefb,abcdefb,abcdefb | depart,continue right,arrive |
          | a,f       | abcdefb,abcdefb,abcdefb | depart,continue left,arrive  |
          | a,d       | abcdefb,abcdefb,abcdefb | depart,continue right,arrive |
-          # continuing right here, since the turn to the left is more expensive
-          | a,e       | abcdefb,abcdefb,abcdefb | depart,continue right,arrive |
+          | a,e       | abcdefb,abcdefb,abcdefb | depart,continue left,arrive  |
@@ -1,433 +0,0 @@
-@routing  @guidance
-Feature: Slipways and Dedicated Turn Lanes
-
-    Background:
-        Given the profile "car"
-        Given a grid size of 5 meters
-
-    Scenario: Turn Instead of Ramp
-        Given the node map
-            """
-                    e
-            a b     c d
-                  h
-
-                  1
-
-                    f
-
-                    g
-            """
-
-        And the ways
-            | nodes | highway    | name   |
-            | abc   | trunk      | first  |
-            | cd    | trunk      | first  |
-            | bhf   | trunk_link |        |
-            | cfg   | primary    | second |
-            | ec    | primary    | second |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction   |
-            | restriction | abc      | cfg    | c        | no_right_turn |
-
-       When I route I should get
-            | waypoints | route               | turns                           |
-            | a,g       | first,second,second | depart,turn right,arrive        |
-            | a,1       | first,,             | depart,turn slight right,arrive |
-
-    Scenario: Turn Instead of Ramp - Max-Speed
-        Given the node map
-            """
-                    e
-            a-b-----c-------------------------d
-                 `h |
-                   ||
-                  1||
-                   `|
-                    f
-                    |
-                    g
-            """
-
-        And the ways
-            | nodes | highway    | name   | maxspeed |
-            | abc   | trunk      | first  | 70       |
-            | cd    | trunk      | first  | 2        |
-            | bhf   | trunk_link |        | 2        |
-            | cfg   | primary    | second | 50       |
-            | ec    | primary    | second | 50       |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction   |
-            | restriction | abc      | cfg    | c        | no_right_turn |
-
-       When I route I should get
-            | waypoints | route               | turns                           |
-            | a,g       | first,second,second | depart,turn right,arrive        |
-            | a,1       | first,,             | depart,turn slight right,arrive |
-
-
-    Scenario: Turn Instead of Ramp
-        Given the node map
-            """
-                    e
-            a b     c d
-                  h
-
-
-
-
-
-
-
-                    f
-
-
-                    g
-            """
-
-        And the ways
-            | nodes | highway       | name   |
-            | abcd  | motorway      | first  |
-            | bhf   | motorway_link |        |
-            | efg   | primary       | second |
-
-       When I route I should get
-            | waypoints | route                | turns                                             |
-            | a,g       | first,,second,second | depart,off ramp slight right,turn straight,arrive |
-
-    Scenario: Turn Instead of Ramp
-        Given the node map
-            """
-                    e
-            a b     c d
-                  h
-
-
-
-                    f
-
-
-                    g
-            """
-
-        And the ways
-            | nodes | highway       | name   |
-            | abcd  | motorway      | first  |
-            | bhf   | motorway_link |        |
-            | efg   | primary       | second |
-
-        When I route I should get
-            | waypoints | route                | turns                                             |
-            | a,g       | first,,second,second | depart,off ramp slight right,turn straight,arrive |
-
-    Scenario: Inner city expressway with on road
-        Given the node map
-            """
-            a b       c g
-                    f
-
-
-
-                      d
-
-
-
-                      e
-            """
-
-        And the ways
-            | nodes | highway      | name  |
-            | abc   | primary      | road  |
-            | cg    | primary      | road  |
-            | bfd   | trunk_link   |       |
-            | cde   | trunk        | trunk |
-
-        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                    |
-            | a,e       | road,trunk,trunk     | depart,turn right,arrive |
-
-
-    Scenario: Slipway Round U-Turn
-        Given the node map
-            """
-            a   f
-
-            b   e
-
-
-              g
-
-            c   d
-            """
-
-        And the ways
-            | nodes | highway      | name | oneway |
-            | abc   | primary      | road | yes    |
-            | bge   | primary_link |      | yes    |
-            | def   | primary      | road | yes    |
-
-       When I route I should get
-            | waypoints | route          | turns                        |
-            | a,f       | road,road,road | depart,continue uturn,arrive |
-
-    Scenario: Slipway Steep U-Turn
-        Given the node map
-            """
-            a   f
-
-            b   e
-              g
-
-
-            c   d
-            """
-
-        And the ways
-            | nodes | highway      | name | oneway |
-            | abc   | primary      | road | yes    |
-            | bge   | primary_link |      | yes    |
-            | def   | primary      | road | yes    |
-
-       When I route I should get
-            | waypoints | route          | turns                        |
-            | a,f       | road,road,road | depart,continue uturn,arrive |
-
-    Scenario: Schwarzwaldstrasse Autobahn
-        Given the node map
-            """
-                  . i . . . . . h . . . . g
-               .j      '.   . '
-            a .           k
-               '  b . r c . d . e . . . . f
-                   .    .   .
-                     .  .   .
-                      . .   .
-                      . .   .
-                      l .   .
-                      m .   .
-                        n   q
-                        .   .
-                        .   .
-                        .   .
-                        o   p
-            """
-
-        And the nodes
-            # the traffic light at `l` is not actually in the data, but necessary for the test to check everything
-            # http://www.openstreetmap.org/#map=19/48.99211/8.40336
-            | node | highway         |
-            | r    | traffic_signals |
-            | l    | traffic_signals |
-
-        And the ways
-            | nodes | highway        | name               | ref  | oneway |
-            | abrcd | secondary      | Schwarzwaldstrasse | L561 | yes    |
-            | hija  | secondary      | Schwarzwaldstrasse | L561 | yes    |
-            | def   | secondary      | Ettlinger Strasse  |      | yes    |
-            | gh    | secondary      | Ettlinger Strasse  |      | yes    |
-            | blmn  | secondary_link |                    | L561 | yes    |
-            | hkc   | secondary_link | Ettlinger Strasse  |      | yes    |
-            | qdki  | secondary_link | Ettlinger Allee    |      | yes    |
-            | cn    | secondary_link | Ettlinger Allee    |      | yes    |
-            | no    | primary        | Ettlinger Allee    |      | yes    |
-            | pq    | primary        | Ettlinger Allee    |      | yes    |
-            | qe    | secondary_link | Ettlinger Allee    |      | yes    |
-
-        When I route I should get
-            | waypoints | route                                                    | turns                    | ref        |
-            | a,o       | Schwarzwaldstrasse,Ettlinger Allee,Ettlinger Allee       | depart,turn right,arrive | L561,L561, |
-
-    Scenario: Traffic Lights everywhere
-        #http://map.project-osrm.org/?z=18&center=48.995336%2C8.383813&loc=48.995467%2C8.384548&loc=48.995115%2C8.382761&hl=en&alt=0
-        Given the node map
-            """
-            a     k l     j
-                      d b c i
-
-                        e g
-
-                        1
-                          h
-
-                          f
-            """
-
-        And the nodes
-            | node | highway         |
-            | b    | traffic_signals |
-            | e    | traffic_signals |
-            | g    | traffic_signals |
-
-        And the ways
-            | nodes  | highway        | name          | oneway |
-            | aklbci | secondary      | Ebertstrasse  | yes    |
-            | kdeh   | secondary_link |               | yes    |
-            | jcghf  | primary        | Brauerstrasse | yes    |
-
-        When I route I should get
-            | waypoints | route                                    | turns                    |
-            | a,i       | Ebertstrasse,Ebertstrasse                | depart,arrive            |
-            | a,l       | Ebertstrasse,Ebertstrasse                | depart,arrive            |
-            | a,f       | Ebertstrasse,Brauerstrasse,Brauerstrasse | depart,turn right,arrive |
-            | a,1       | Ebertstrasse,,                           | depart,turn right,arrive |
-
-    #2839
-    Scenario: Self-Loop
-        Given the node map
-            """
-                                                      l     k
-                                                                  j
-                                                  m
-                                                                      i
-
-
-                                                                        h
-
-                                                n
-
-                                                                        g
-                                                o
-
-                                                                      f
-                                              p
-                                                                  e
-            a         b                 c                   d
-            """
-
-     And the ways
-            | nodes           | name    | oneway | highway     | lanes |
-            | abc             | circled | no     | residential | 1     |
-            | cdefghijklmnopc | circled | yes    | residential | 1     |
-
-     When I route I should get
-            | waypoints | bearings     | route           | turns         |
-            | b,a       | 90,10 270,10 | circled,circled | depart,arrive |
-
-    @todo
-    #due to the current turn function, the left turn bcp is exactly the same cost as pcb, a right turn. The right turn should be way faster,though
-    #for that reason we cannot distinguish between driving clockwise through the circle or counter-clockwise. Until this is improved, this case here
-    #has to remain as todo (see #https://github.com/Project-OSRM/osrm-backend/pull/2849)
-    Scenario: Self-Loop - Bidirectional
-        Given the node map
-            """
-                                                      l     k
-                                                                  j
-                                                  m
-                                                                      i
-
-
-                                                                        h
-
-                                                n
-
-                                                                        g
-                                                o
-
-                                                                      f
-                                              p
-                                                                  e
-            a         b                 c                   d
-            """
-
-     And the ways
-            | nodes           | name    | oneway | highway     | lanes |
-            | abc             | circled | no     | residential | 1     |
-            | cdefghijklmnopc | circled | no     | residential | 1     |
-
-     When I route I should get
-            | waypoints | bearings     | route           | turns         |
-            | b,a       | 90,10 270,10 | circled,circled | depart,arrive |
-
-    #http://www.openstreetmap.org/#map=19/38.90597/-77.01276
-    Scenario: Don't falsly classify as sliproads
-        Given the node map
-            """
-                                                          j
-            a b                                           c             d
-
-
-
-
-
-                    e
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-                                                          1
-
-                                                f         g
-
-                                                          i             h
-            """
-
-        And the ways
-            | nodes | name       | highway   | oneway | maxspeed |
-            | abcd  | new york   | primary   | yes    | 35       |
-            | befgh | m street   | secondary | yes    | 35       |
-            | igcj  | 1st street | tertiary  | no     | 20       |
-
-        And the nodes
-            | node | highway         |
-            | c    | traffic_signals |
-            | g    | traffic_signals |
-
-        When I route I should get
-            | waypoints | route                                   | turns                              | #                                    |
-            | a,d       | new york,new york                       | depart,arrive                      | this is the sinatra route            |
-            | a,j       | new york,1st street,1st street          | depart,turn left,arrive            |                                      |
-            | a,1       | new york,m street,1st street,1st street | depart,turn right,turn left,arrive | this can false be seen as a sliproad |
-
-    # Merging into degree two loop on dedicated turn detection / 2927
-    Scenario: Turn Instead of Ramp
-        Given the node map
-            """
-                                          f
-                    g           h
-                                    d     e
-            i       c           j
-
-
-
-
-
-
-
-
-                b
-
-                a
-            """
-
-        And the ways
-            | nodes | highway | name | oneway |
-            | abi   | primary | road | yes    |
-            | bcjd  | primary | loop | yes    |
-            | dhgf  | primary | loop | yes    |
-            | fed   | primary | loop | yes    |
-
-        And the nodes
-            | node | highway         |
-            | g    | traffic_signals |
-            | c    | traffic_signals |
-
-        # We don't actually care about routes here, this is all about endless loops in turn discovery
-        When I route I should get
-            | waypoints | route          | turns                          |
-            | a,i       | road,road,road | depart,fork slight left,arrive |
@@ -1,43 +0,0 @@
-@routing @guidance
-Feature: Destination Signs
-
-    Background:
-        Given the profile "car"
-
-    Scenario: Car - route name assembly with destination signs
-        Given the node map
-          """
-          a b
-          c d
-          e f
-          g h
-          i j
-          k l
-          m n
-          o p
-          q r
-          """
-
-        And the ways
-          | nodes | name | ref | destination    | destination:ref | oneway | #                                    |
-          | ab    | AB   | E1  |                |                 | yes    |                                      |
-          | cd    | CD   |     | Berlin         |                 | yes    |                                      |
-          | ef    | EF   |     | Berlin         | A1              | yes    |                                      |
-          | gh    |      |     | Berlin         | A1              | yes    |                                      |
-          | ij    |      |     | Berlin         |                 | yes    |                                      |
-          | kl    | KL   | E1  | Berlin         | A1              | yes    |                                      |
-          | mn    | MN   |     | Berlin;Hamburg | A1;A2           | yes    |                                      |
-          | op    | OP   |     | Berlin;Hamburg | A1;A2           | no     | mis-tagged destination: not a oneway |
-          | qr    | QR   |     |                | A1;A2           | yes    |                                      |
-
-        When I route I should get
-          | from | to | route | destinations                                    | ref   | #                         |
-          | a    | b  | AB,AB | ,                                               | E1,E1 |                           |
-          | c    | d  | CD,CD | Berlin,Berlin                                   | ,     |                           |
-          | e    | f  | EF,EF | A1: Berlin,A1: Berlin                           | ,     |                           |
-          | g    | h  | ,     | A1: Berlin,A1: Berlin                           | ,     |                           |
-          | i    | j  | ,     | Berlin,Berlin                                   | ,     |                           |
-          | k    | l  | KL,KL | A1: Berlin,A1: Berlin                           | E1,E1 |                           |
-          | m    | n  | MN,MN | A1, A2: Berlin, Hamburg,A1, A2: Berlin, Hamburg | ,     |                           |
-          | o    | p  | OP,OP | ,                                               | ,     | guard against mis-tagging |
-          | q    | r  | QR,QR | A1, A2,A1, A2                                   | ,     |                           |
@@ -1,43 +0,0 @@
-@routing @guidance
-Feature: Destination Signs
-
-    Background:
-        Given the profile "car"
-
-    Scenario: Car - route name assembly with destination signs accounting for directional tags
-        Given the node map
-          """
-          a b
-          c d
-          e f
-          g h
-          i j
-          k l
-          m n
-          o p
-          q r
-          """
-
-        And the ways
-          | nodes | name | ref | destination    | destination:ref | destination:forward | destination:backward | oneway | #                                    |
-          | ab    | AB   |     | Berlin         |                 |                     |                      | yes    |                                      |
-          | cd    | CD   |     |                |                 | Berlin              |                      | yes    |                                      |
-          | ef    | EF   |     |                |                 | Berlin              |  Hamburg             | -1     |                                      |
-          | gh    | GH   |     |                | A1              |                     |                      | yes    |                                      |
-          | ij    | IJ   |     | Berlin         | A1              |                     |                      | no     | mis-tagged destination: not a oneway |
-          | kl    | KL   |     |                | A1              | Berlin              |  Hamburg             | yes    |                                      |
-          | mn    | MN   |     | Berlin         | A1              | Berlin              |  Hamburg             | yes    |                                      |
-          | op    | OP   |     | Berlin         |                 |                     |  Hamburg             | -1     |                                      |
-          | qr    | QR   |     |                |                 |                     |  Hamburg             | -1     |                                      |
-
-        When I route I should get
-          | from | to | route                                                     | destinations                                    | ref   | #                         |
-          | a    | b  | AB,AB                                                     | Berlin,Berlin                                   | ,     |                           |
-          | c    | d  | CD,CD                                                     | Berlin,Berlin                                   | ,     |                           |
-          | f    | e  | EF,EF                                                     | Hamburg,Hamburg                                 | ,     |                           |
-          | g    | h  | GH,GH                                                     | A1,A1                                           | ,     |                           |
-          | i    | j  | IJ,IJ                                                     | ,                                               | ,     | guard against mis-tagging |
-          | k    | l  | KL,KL                                                     | A1: Berlin,A1: Berlin                           | ,     |                           |
-          | m    | n  | MN,MN                                                     | A1: Berlin,A1: Berlin                           | ,     |                           |
-          | p    | o  | OP,OP                                                     | Hamburg,Hamburg                                 | ,     |                           |
-          | r    | q  | QR,QR                                                     | Hamburg,Hamburg                                 | ,     |                           |
@@ -1,39 +0,0 @@
-@routing @guidance
-Feature: Destination Signs
-
-    Background:
-        Given the profile "car"
-
-    Scenario: Car - route name assembly with destination signs accounting for directional:ref tags
-        Given the node map
-          """
-          a b
-          c d
-          e f
-          g h
-          i j
-          k l
-          m n
-          o p
-          q r
-          """
-
-        And the ways
-          | nodes | name | destination    | destination:ref | destination:ref:forward | destination:ref:backward | destination:forward | destination:backward | oneway | #                                    |
-          | ab    | AB   | Berlin         | A1              | A1                      | A2                       |                     |                      | yes    |                                      |
-          | cd    | CD   |                | A1              | A1                      | A2                       | Berlin              |  Hamburg             | -1     |                                      |
-          | ef    | EF   |                |                 | A1                      | A2                       | Berlin              |  Hamburg             | yes    |                                      |
-          | gh    | GH   |                |                 | A1                      | A2                       | Berlin              |  Hamburg             | -1     |                                      |
-          | ij    | IJ   | Berlin         | A1              |                         | A2                       | Berlin              |  Hamburg             | yes    |                                      |
-          | kl    | KL   |                | A1              |                         | A2                       | Berlin              |  Hamburg             | -1     |                                      |
-          | mn    | MN   | Berlin         | A1              | A1                      |                          | Berlin              |  Hamburg             | no     | mis-tagged destination: not a oneway |
-         
-        When I route I should get
-          | from | to | route                                                     | destinations                                    | ref   | #                         |
-          | a    | b  | AB,AB                                                     | A1: Berlin,A1: Berlin                           | ,     |                           |
-          | d    | c  | CD,CD                                                     | A2: Hamburg,A2: Hamburg                         | ,     |                           |
-          | e    | f  | EF,EF                                                     | A1: Berlin,A1: Berlin                           | ,     |                           |
-          | h    | g  | GH,GH                                                     | A2: Hamburg,A2: Hamburg                         | ,     |                           |
-          | i    | j  | IJ,IJ                                                     | A1: Berlin,A1: Berlin                           | ,     |                           |
-          | l    | k  | KL,KL                                                     | A2: Hamburg,A2: Hamburg                         | ,     |                           |
-          | m    | n  | MN,MN                                                     | ,                                               | ,     | guard against mis-tagging |
@@ -7,173 +7,117 @@ Feature: End Of Road Instructions

    Scenario: End of Road with through street
        Given the node map
-            """
-                c
-            a e b
-              f d
-            """
+            |   |   | c |
+            | a |   | b |
+            |   |   | d |

        And the ways
            | nodes  | highway |
-            | aeb    | primary |
+            | ab     | primary |
            | cbd    | primary |
-            | ef     | primary |

       When I route I should get
-            | waypoints | route       | turns                           |
-            | a,c       | aeb,cbd,cbd | depart,end of road left,arrive  |
-            | a,d       | aeb,cbd,cbd | depart,end of road right,arrive |
+            | waypoints | route      | turns                           |
+            | a,c       | ab,cbd,cbd | depart,end of road left,arrive  |
+            | a,d       | ab,cbd,cbd | depart,end of road right,arrive |

    Scenario: End of Road with three streets
        Given the node map
-            """
-                c
-            a e b
-              f d
-            """
+            |   |   | c |
+            | a |   | b |
+            |   |   | d |

        And the ways
            | nodes  | highway |
-            | aeb    | primary |
+            | ab     | primary |
            | cb     | primary |
            | bd     | primary |
-            | ef     | primary |

       When I route I should get
-            | waypoints | route     | turns                           |
-            | a,c       | aeb,cb,cb | depart,end of road left,arrive  |
-            | a,d       | aeb,bd,bd | depart,end of road right,arrive |
+            | waypoints | route    | turns                           |
+            | a,c       | ab,cb,cb | depart,end of road left,arrive  |
+            | a,d       | ab,bd,bd | depart,end of road right,arrive |

    Scenario: End of Road with three streets, slightly angled
        Given the node map
-            """
-            a e       c
-              f       b
-                      d
-            """
+            | a |   |   |   |   | c |
+            |   |   |   |   |   | b |
+            |   |   |   |   |   | d |

        And the ways
            | nodes  | highway |
-            | aeb    | primary |
+            | ab     | primary |
            | cb     | primary |
            | bd     | primary |
-            | ef     | primary |

       When I route I should get
-            | waypoints | route     | turns                           |
-            | a,c       | aeb,cb,cb | depart,end of road left,arrive  |
-            | a,d       | aeb,bd,bd | depart,end of road right,arrive |
+            | waypoints | route    | turns                           |
+            | a,c       | ab,cb,cb | depart,end of road left,arrive  |
+            | a,d       | ab,bd,bd | depart,end of road right,arrive |

    Scenario: End of Road with three streets, slightly angled
        Given the node map
-            """
-                      c
-              f       b
-            a e       d
-            """
+            |   |   |   |   |   | c |
+            |   |   |   |   |   | b |
+            | a |   |   |   |   | d |

        And the ways
            | nodes  | highway |
-            | aeb    | primary |
-            | ef     | primary |
+            | ab     | primary |
            | cb     | primary |
            | bd     | primary |

       When I route I should get
-            | waypoints | route     | turns                           |
-            | a,c       | aeb,cb,cb | depart,end of road left,arrive  |
-            | a,d       | aeb,bd,bd | depart,end of road right,arrive |
+            | waypoints | route    | turns                           |
+            | a,c       | ab,cb,cb | depart,end of road left,arrive  |
+            | a,d       | ab,bd,bd | depart,end of road right,arrive |

    Scenario: End of Road with through street, slightly angled
        Given the node map
-            """
-            a e       c
-              f       b
-                      d
-            """
+            | a |   |   |   |   | c |
+            |   |   |   |   |   | b |
+            |   |   |   |   |   | d |

        And the ways
            | nodes  | highway |
-            | aeb    | primary |
-            | ef     | primary |
+            | ab     | primary |
            | cbd    | primary |

       When I route I should get
-            | waypoints | route       | turns                           |
-            | a,c       | aeb,cbd,cbd | depart,end of road left,arrive  |
-            | a,d       | aeb,cbd,cbd | depart,end of road right,arrive |
+            | waypoints | route      | turns                           |
+            | a,c       | ab,cbd,cbd | depart,end of road left,arrive  |
+            | a,d       | ab,cbd,cbd | depart,end of road right,arrive |

    Scenario: End of Road with through street, slightly angled
        Given the node map
-            """
-                      c
-              f       b
-            a e       d
-            """
+            |   |   |   |   |   | c |
+            |   |   |   |   |   | b |
+            | a |   |   |   |   | d |

        And the ways
            | nodes  | highway |
-            | aeb    | primary |
-            | ef     | primary |
+            | ab     | primary |
            | cbd    | primary |

       When I route I should get
-            | waypoints | route       | turns                           |
-            | a,c       | aeb,cbd,cbd | depart,end of road left,arrive  |
-            | a,d       | aeb,cbd,cbd | depart,end of road right,arrive |
+            | waypoints | route      | turns                           |
+            | a,c       | ab,cbd,cbd | depart,end of road left,arrive  |
+            | a,d       | ab,cbd,cbd | depart,end of road right,arrive |

    Scenario: End of Road with two ramps - prefer ramp over end of road
        Given the node map
-            """
-                c
-            a e b
-              f d
-            """
+            |   |   | c |
+            | a |   | b |
+            |   |   | d |

        And the ways
            | nodes  | highway       |
-            | aeb    | primary       |
-            | ef     | primary       |
+            | ab     | primary       |
            | bc     | motorway_link |
            | bd     | motorway_link |

       When I route I should get
-            | waypoints | route     | turns                       |
-            | a,c       | aeb,bc,bc | depart,on ramp left,arrive  |
-            | a,d       | aeb,bd,bd | depart,on ramp right,arrive |
+            | waypoints | route    | turns                    |
+            | a,c       | ab,bc,bc | depart,ramp left,arrive  |
+            | a,d       | ab,bd,bd | depart,ramp right,arrive |

-    # http://www.openstreetmap.org/#map=19/52.49907/13.41836
-    @end-of-road @negative
-    Scenario: Don't Handle Circles as End-Of-Road
-        Given the node map
-            """
-              r       q
-                      a s
-                  b
-                          j
-
-            l   c         i       k
-
-                          h
-            m
-                d                 n
-                  e     g
-                    f
-                    o   p
-            """
-
-        And the ways
-            | nodes        | highway     | name  | oneway |
-            | abcdefghijsa | secondary   | kotti | yes    |
-            | ki           | secondary   | skal  | yes    |
-            | cl           | secondary   | skal  | yes    |
-            | md           | secondary   | skal  | yes    |
-            | gn           | secondary   | skal  | yes    |
-            | qa           | tertiary    | adal  | no     |
-            | br           | residential | rei   | yes    |
-            | fo           | secondary   | kstr  | yes    |
-            | pg           | secondary   | kstr  | yes    |
-
-        When I route I should get
-            | waypoints | route                | turns                               | #                                                      |
-            | k,l       | skal,kotti,skal,skal | depart,turn right,turn right,arrive | # could be a case to find better turn instructions for |
@@ -7,11 +7,9 @@ Feature: Fork Instructions

    Scenario: Fork Same Road Class
        Given the node map
-            """
-                    c
-            a   b
-                    d
-            """
+            |   |   |   |   | c |
+            | a |   | b |   |   |
+            |   |   |   |   | d |

        And the ways
            | nodes  | highway |
@@ -24,48 +22,11 @@ Feature: Fork Instructions
            | a,c       | ab,bc,bc | depart,fork slight left,arrive  |
            | a,d       | ab,bd,bd | depart,fork slight right,arrive |

-    Scenario: Don't Fork On Single Road
-        Given the node map
-            """
-                    c
-            a   b
-                    d
-            """
-
-        And the ways
-            | nodes  | highway | oneway |
-            | ab     | primary | no     |
-            | cb     | primary | yes    |
-            | bd     | primary | yes    |
-
-       When I route I should get
-            | waypoints | route    | turns                               |
-            | a,d       | ab,bd,bd | depart,new name slight right,arrive |
-
-    Scenario: Don't Fork On Single Road
-        Given the node map
-            """
-                        c
-            a   b   d
-            """
-
-        And the ways
-            | nodes  | highway | oneway | name |
-            | ab     | primary | no     | road |
-            | cb     | primary | yes    | road |
-            | bd     | primary | yes    | turn |
-
-       When I route I should get
-            | waypoints | route          | turns                           |
-            | a,d       | road,turn,turn | depart,new name straight,arrive |
-
    Scenario: Do not fork on link type
        Given the node map
-            """
-                    c
-            a   b
-                    d
-            """
+            |   |   |   |   | c |
+            | a |   | b |   |   |
+            |   |   |   |   | d |

        And the ways
            | nodes  | highway      |
@@ -80,11 +41,9 @@ Feature: Fork Instructions

    Scenario: Fork in presence of other roads
        Given the node map
-            """
-                    c
-            a   b
-              e     d
-            """
+            |   |   |   |   | c |
+            | a |   | b |   |   |
+            |   | e |   |   | d |

        And the ways
            | nodes  | highway |
@@ -100,12 +59,10 @@ Feature: Fork Instructions

    Scenario: Fork Turning Slight Left
        Given the node map
-            """
-                      c
-
-            a   b
-                    d
-            """
+            |   |   |   |   |   | c |
+            |   |   |   |   |   |   |
+            | a |   | b |   |   |   |
+            |   |   |   |   | d |   |

        And the ways
            | nodes  | highway |
@@ -120,12 +77,10 @@ Feature: Fork Instructions

    Scenario: Fork Turning Slight Right
        Given the node map
-            """
-                    c
-            a   b
-
-                      d
-            """
+            |   |   |   |   | c |   |
+            | a |   | b |   |   |   |
+            |   |   |   |   |   |   |
+            |   |   |   |   |   | d |

        And the ways
            | nodes  | highway |
@@ -140,11 +95,9 @@ Feature: Fork Instructions

    Scenario: Do not fork on service
        Given the node map
-            """
-                    c
-            a   b
-                    d
-            """
+            |   |   |   |   | c |
+            | a |   | b |   |   |
+            |   |   |   |   | d |

        And the ways
            | nodes  | highway     |
@@ -158,11 +111,9 @@ Feature: Fork Instructions

    Scenario: Fork Both Turning Slight Right
        Given the node map
-            """
-            a   b
-                      c
-                      d
-            """
+            | a |   | b |   |   |   |
+            |   |   |   |   |   | c |
+            |   |   |   |   |   | d |

        And the ways
            | nodes  | highway |
@@ -177,11 +128,9 @@ Feature: Fork Instructions

    Scenario: Fork Both Turning Slight Left
        Given the node map
-            """
-                      c
-                      d
-            a   b
-            """
+            |   |   |   |   |   | c |
+            |   |   |   |   |   | d |
+            | a |   | b |   |   |   |

        And the ways
            | nodes  | highway |
@@ -196,11 +145,9 @@ Feature: Fork Instructions

    Scenario: Fork Both Turning Slight Right - Unnamed
        Given the node map
-            """
-            a   b
-                      c
-                      d
-            """
+            | a |   | b |   |   |   |
+            |   |   |   |   |   | c |
+            |   |   |   |   |   | d |

        And the ways
            | nodes  | highway | name |
@@ -215,11 +162,9 @@ Feature: Fork Instructions

    Scenario: Fork Both Turning Slight Left - Unnamed
        Given the node map
-            """
-                      c
-                      d
-            a   b
-            """
+            |   |   |   |   |   | c |
+            |   |   |   |   |   | d |
+            | a |   | b |   |   |   |

        And the ways
            | nodes  | highway | name |
@@ -234,11 +179,9 @@ Feature: Fork Instructions

    Scenario: Fork Both Turning Very Slightly Right - Unnamed
        Given the node map
-            """
-            a   b
-                                  c
-                                              d
-            """
+            | a |   | b |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |   |   | c |   |   |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | d |

        And the ways
            | nodes  | highway | name |
@@ -253,11 +196,9 @@ Feature: Fork Instructions

    Scenario: Fork Both Turning Very Slightly Right - Unnamed Ramps
        Given the node map
-            """
-            a   b
-                                  c
-                                              d
-            """
+            | a |   | b |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |   |   | c |   |   |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | d |

        And the ways
            | nodes  | highway       | name |
@@ -272,11 +213,9 @@ Feature: Fork Instructions

    Scenario: Non-Fork on complex intersection - left
        Given the node map
-            """
-                    c
-            a   b
-              e     d
-            """
+            |   |   |   |   | c |
+            | a |   | b |   |   |
+            |   | e |   |   | d |

        And the ways
            | nodes  | highway   |
@@ -291,11 +230,9 @@ Feature: Fork Instructions

    Scenario: Non-Fork on complex intersection - right
        Given the node map
-            """
-              e     c
-            a   b
-                    d
-            """
+            |   | e |   |   | c |
+            | a |   | b |   |   |
+            |   |   |   |   | d |

        And the ways
            | nodes  | highway   |
@@ -308,13 +245,12 @@ Feature: Fork Instructions
            | a,c       | abd,bc,bc | depart,turn slight left,arrive |
            | a,d       | abd,abd   | depart,arrive                  |

+    @pr2275 @bug
    Scenario: Tripple fork
        Given the node map
-            """
-                            c
-            a   b   d
-                            e
-            """
+            |   |   |   |   |   |   |   |   | c |
+            | a |   | b |   | d |   |   |   |   |
+            |   |   |   |   |   |   |   |   | e |

        And the ways
            | nodes  | highway   |
@@ -331,11 +267,9 @@ Feature: Fork Instructions

    Scenario: Tripple fork -- middle obvious
        Given the node map
-            """
-                    c
-            a   b   d
-                    e
-            """
+            |   |   |   |   | c |
+            | a |   | b |   | d |
+            |   |   |   |   | e |

        And the ways
            | nodes  | highway   |
@@ -348,40 +282,3 @@ Feature: Fork Instructions
            | a,c       | abd,bc,bc | depart,turn slight left,arrive  |
            | a,d       | abd,abd   | depart,arrive                   |
            | a,e       | abd,be,be | depart,turn slight right,arrive |
-
-    Scenario: Don't Fork when leaving Road
-        Given the node map
-            """
-            a   b   c
-                    d
-            """
-
-        And the ways
-            | nodes  | highway   |
-            | abc    | secondary |
-            | bd     | secondary |
-
-       When I route I should get
-            | waypoints | route     | turns                           |
-            | a,c       | abc,abc   | depart,arrive                   |
-            | a,d       | abc,bd,bd | depart,turn slight right,arrive |
-
-     Scenario: Fork on motorway links - don't fork on through
-        Given the node map
-            """
-            i         a
-            j   c b   x
-            """
-
-        And the ways
-            | nodes | name | highway       |
-            | xb    | xbcj | motorway_link |
-            | bc    | xbcj | motorway_link |
-            | cj    | xbcj | motorway_link |
-            | ci    | off  | motorway_link |
-            | ab    | on   | motorway_link |
-
-        When I route I should get
-            | waypoints | route      | turns                           |
-            | a,j       | on,xbcj    | depart,arrive                   |
-            | a,i       | on,off,off | depart,turn slight right,arrive |
@@ -1,148 +0,0 @@
-@routing  @guidance @intersections
-Feature: Intersections Data
-
-    Background:
-        Given the profile "car"
-        Given a grid size of 10 meters
-
-    Scenario: Passing Three Way South
-        Given the node map
-            """
-            a   b   c
-                d
-            """
-
-        And the ways
-            | nodes  | name    |
-            | ab     | through |
-            | bc     | through |
-            | bd     | corner  |
-
-       When I route I should get
-            | waypoints | route           | intersections                               |
-            | a,c       | through,through | true:90,true:90 true:180 false:270;true:270 |
-
-    Scenario: Passing Three Way North
-        Given the node map
-            """
-                d
-            a   b   c
-            """
-
-        And the ways
-            | nodes  | name    |
-            | ab     | through |
-            | bc     | through |
-            | bd     | corner  |
-
-       When I route I should get
-            | waypoints | route           | intersections                             |
-            | a,c       | through,through | true:90,true:0 true:90 false:270;true:270 |
-
-    Scenario: Passing Oneway Street In
-        Given the node map
-            """
-                d
-            a   b   c
-            """
-
-        And the ways
-            | nodes  | name    | oneway |
-            | ab     | through | no     |
-            | bc     | through | no     |
-            | db     | corner  | yes    |
-
-       When I route I should get
-            | waypoints | route           | intersections                              |
-            | a,c       | through,through | true:90,false:0 true:90 false:270;true:270 |
-
-    Scenario: Passing Oneway Street Out
-        Given the node map
-            """
-                d
-            a   b   c
-            """
-
-        And the ways
-            | nodes  | name    | oneway |
-            | ab     | through | no     |
-            | bc     | through | no     |
-            | bd     | corner  | yes    |
-
-       When I route I should get
-            | waypoints | route           | intersections                             |
-            | a,c       | through,through | true:90,true:0 true:90 false:270;true:270 |
-
-    Scenario: Passing Two Intersections
-        Given the node map
-            """
-                e
-            a   b   c   d
-                    f
-            """
-
-        And the ways
-            | nodes  | name    |
-            | ab     | through |
-            | bc     | through |
-            | cd     | through |
-            | be     | corner  |
-            | cf     | corner  |
-
-       When I route I should get
-            | waypoints | route           | intersections                                                        |
-            | a,d       | through,through | true:90,true:0 true:90 false:270,true:90 true:180 false:270;true:270 |
-
-    Scenario: Passing Two Intersections, Collapsing
-        Given the node map
-            """
-                e
-            a   b   c   d
-                    f
-            """
-
-        And the ways
-            | nodes  | name          |
-            | ab     | through       |
-            | bc     | throughbridge |
-            | cd     | through       |
-            | be     | corner        |
-            | cf     | corner        |
-
-       When I route I should get
-            | waypoints | route                  | intersections                                                        |
-            | a,d       | through,through        | true:90,true:0 true:90 false:270,true:90 true:180 false:270;true:270 |
-            | f,a       | corner,through,through | true:0;true:90 false:180 true:270,true:0 false:90 true:270;true:90   |
-
-    Scenario: Roundabouts
-        Given the node map
-            """
-                    e
-
-                    a
-                  1   4
-
-            f   b       d   h
-
-                  2   3
-                    c
-
-                    g
-            """
-
-        And the ways
-            | nodes | junction   |
-            | abcda | roundabout |
-            | ea    |            |
-            | fb    |            |
-            | gc    |            |
-            | hd    |            |
-
-        When I route I should get
-            | waypoints | route          | intersections                                                                                                                 |
-            | e,f       | ea,fb,fb       | true:180;false:0 false:150 true:210,false:30 true:150 true:270;true:90                                                        |
-            | e,g       | ea,gc,gc       | true:180;false:0 false:150 true:210,false:30 true:150 true:270,true:30 true:180 false:330;true:0                              |
-            | e,h       | ea,hd,hd       | true:180;false:0 false:150 true:210,false:30 true:150 true:270,true:30 true:180 false:330,true:90 false:210 true:330;true:270 |
-            | e,2       | ea,abcda,abcda | true:180;false:0 false:150 true:210,false:30 true:150 true:270;true:327 +-1                                                   |
-            | 1,g       | abcda,gc,gc    | true:214;false:30 true:150 true:270,true:30 true:180 false:330;true:0                                                         |
-            | 1,3       | abcda,abcda    | true:214,false:30 true:150 true:270,true:30 true:180 false:330;true:214                                                       |
@@ -3,16 +3,13 @@ Feature: Merging

    Background:
        Given the profile "car"
-        And a grid size of 10 meters
+        Given a grid size of 10 meters

-    @merge
    Scenario: Merge on Four Way Intersection
        Given the node map
-            """
-            d
-            a   b             c
-            e
-            """
+            | d |   |   |
+            | a | b | c |
+            | e |   |   |

        And the ways
            | nodes | highway |
@@ -21,108 +18,35 @@ Feature: Merging
            | eb    | primary |

       When I route I should get
-            | waypoints | route      | turns                       |
-            | d,c       | db,abc,abc | depart,turn straight,arrive |
-            | e,c       | eb,abc,abc | depart,turn straight,arrive |
-
-    @merge
-    Scenario: Merge on Three Way Intersection Right
-        Given the node map
-            """
-            d
-            a   b             c
-            """
-
-        And the ways
-            | nodes | highway |
-            | abc   | primary |
-            | db    | primary |
-
-       When I route I should get
-            | waypoints | route      | turns                       |
-            | d,c       | db,abc,abc | depart,turn straight,arrive |
-
-    @merge @negative
-    Scenario: Don't Merge on Short-Three Way Intersection Right
-        Given the node map
-            """
-            d
-            a   b         c
-            """
-
-        And the ways
-            | nodes | highway |
-            | abc   | primary |
-            | db    | primary |
-
-       When I route I should get
-            | waypoints | route      | turns                          |
-            | d,c       | db,abc,abc | depart,turn slight left,arrive |
-
-
-    @merge
-    Scenario: Merge on Three Way Intersection Right
-        Given the node map
-            """
-            a   b             c
-            d
-            """
-
-        And the ways
-            | nodes | highway |
-            | abc   | primary |
-            | db    | primary |
-
-       When I route I should get
-            | waypoints | route      | turns                       |
-            | d,c       | db,abc,abc | depart,turn straight,arrive |
-
-    @merge
-    Scenario: Merge onto a turning road
-        Given the node map
-            """
-                        e
-
-
-
-
-
-
-
-
-                      d
-
-
-
-
-                    c
-                  b
-            a           f
-            """
-
-        And the ways
-            | nodes | highway     | name |
-            | abcde | primary     | road |
-            | fd    | residential | in   |
-
-        When I route I should get
-            | waypoints | turns                         | route        |
-            | f,e       | depart,turn straight,arrive   | in,road,road |
-            | f,a       | depart,turn sharp left,arrive | in,road,road |
-
-    @merge
-    Scenario: Merge onto a motorway
-        Given the node map
-            """
-            d
-            a     b           c
-            """
-
-        And the ways
-            | nodes | name | highway       | oneway |
-            | abc   | A100 | motorway      | yes    |
-            | db    |      | motorway_link | yes    |
-
-        When I route I should get
            | waypoints | route      | turns                            |
-            | d,c       | ,A100,A100 | depart,merge slight right,arrive |
+            | d,c       | db,abc,abc | depart,merge slight right,arrive |
+            | e,c       | eb,abc,abc | depart,merge slight left,arrive  |
+
+    Scenario: Merge on Three Way Intersection Right
+        Given the node map
+            | d |   |   |
+            | a | b | c |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | db    | primary |
+
+       When I route I should get
+            | waypoints | route      | turns                            |
+            | d,c       | db,abc,abc | depart,merge slight right,arrive |
+
+    Scenario: Merge on Three Way Intersection Right
+        Given the node map
+            | a | b | c |
+            | d |   |   |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | db    | primary |
+
+       When I route I should get
+            | waypoints | route      | turns                           |
+            | d,c       | db,abc,abc | depart,merge slight left,arrive |
+
@@ -7,123 +7,109 @@ Feature: Motorway Guidance

    Scenario: Ramp Exit Right
        Given the node map
-            """
-            a b c d e
-                  f g
-            """
+            | a | b | c | d | e |
+            |   |   |   | f | g |

        And the ways
-            | nodes | highway       | oneway |
-            | abcde | motorway      |        |
-            | bfg   | motorway_link | yes    |
+            | nodes  | highway       |
+            | abcde  | motorway      |
+            | bfg    | motorway_link |

       When I route I should get
-            | waypoints | route         | turns                                |
-            | a,e       | abcde,abcde   | depart,arrive                        |
-            | a,g       | abcde,bfg,bfg | depart,off ramp slight right,arrive |
+            | waypoints | route         | turns                           |
+            | a,e       | abcde,abcde   | depart,arrive                   |
+            | a,g       | abcde,bfg,bfg | depart,ramp slight right,arrive |

    Scenario: Ramp Exit Right Curved Right
        Given the node map
-            """
-            a b c
-                f d
-                  g e
-            """
+            | a | b | c |   |   |
+            |   |   | f | d |   |
+            |   |   |   | g | e |

        And the ways
-            | nodes | highway       | oneway |
-            | abcde | motorway      |        |
-            | bfg   | motorway_link | yes    |
+            | nodes  | highway       |
+            | abcde  | motorway      |
+            | bfg    | motorway_link |

       When I route I should get
-            | waypoints | route         | turns                         |
-            | a,e       | abcde,abcde   | depart,arrive                 |
-            | a,g       | abcde,bfg,bfg | depart,off ramp right,arrive |
+            | waypoints | route         | turns                    |
+            | a,e       | abcde,abcde   | depart,arrive            |
+            | a,g       | abcde,bfg,bfg | depart,ramp right,arrive |

    Scenario: Ramp Exit Right Curved Left
        Given the node map
-            """
-                    e
-                  d g
-            a b c f
-            """
+            |   |   |   |   | e |
+            |   |   |   | d | g |
+            | a | b | c | f |   |


        And the ways
-            | nodes | highway       | oneway |
-            | abcde | motorway      |        |
-            | cfg   | motorway_link | yes    |
+            | nodes  | highway       |
+            | abcde  | motorway      |
+            | cfg    | motorway_link |

       When I route I should get
-            | waypoints | route         | turns                                |
-            | a,e       | abcde,abcde   | depart,arrive                        |
-            | a,g       | abcde,cfg,cfg | depart,off ramp slight right,arrive |
+            | waypoints | route         | turns                           |
+            | a,e       | abcde,abcde   | depart,arrive                   |
+            | a,g       | abcde,cfg,cfg | depart,ramp slight right,arrive |


    Scenario: Ramp Exit Left
        Given the node map
-            """
-                  f g
-            a b c d e
-            """
+            |   |   |   | f | g |
+            | a | b | c | d | e |

        And the ways
-            | nodes | highway       | oneway |
-            | abcde | motorway      |        |
-            | bfg   | motorway_link | yes    |
+            | nodes  | highway       |
+            | abcde  | motorway      |
+            | bfg    | motorway_link |

       When I route I should get
-            | waypoints | route         | turns                               |
-            | a,e       | abcde,abcde   | depart,arrive                       |
-            | a,g       | abcde,bfg,bfg | depart,off ramp slight left,arrive |
+            | waypoints | route         | turns                          |
+            | a,e       | abcde,abcde   | depart,arrive                  |
+            | a,g       | abcde,bfg,bfg | depart,ramp slight left,arrive |

    Scenario: Ramp Exit Left Curved Left
        Given the node map
-            """
-                  g e
-                f d
-            a b c
-            """
+            |   |   |   | g | e |
+            |   |   | f | d |   |
+            | a | b | c |   |   |

        And the ways
-            | nodes | highway       | oneway |
-            | abcde | motorway      |        |
-            | bfg   | motorway_link | yes    |
+            | nodes  | highway       |
+            | abcde  | motorway      |
+            | bfg    | motorway_link |

       When I route I should get
-            | waypoints | route         | turns                        |
-            | a,e       | abcde,abcde   | depart,arrive                |
-            | a,g       | abcde,bfg,bfg | depart,off ramp left,arrive |
+            | waypoints | route         | turns                   |
+            | a,e       | abcde,abcde   | depart,arrive           |
+            | a,g       | abcde,bfg,bfg | depart,ramp left,arrive |

    Scenario: Ramp Exit Left Curved Right
        Given the node map
-            """
-            a b c f
-                  d g
-                    e
-            """
+            | a | b | c | f |   |
+            |   |   |   | d | g |
+            |   |   |   |   | e |

        And the ways
-            | nodes | highway       | oneway |
-            | abcde | motorway      |        |
-            | cfg   | motorway_link | yes    |
+            | nodes  | highway       |
+            | abcde  | motorway      |
+            | cfg    | motorway_link |

       When I route I should get
-            | waypoints | route         | turns                               |
-            | a,e       | abcde,abcde   | depart,arrive                       |
-            | a,g       | abcde,cfg,cfg | depart,off ramp slight left,arrive |
+            | waypoints | route         | turns                          |
+            | a,e       | abcde,abcde   | depart,arrive                  |
+            | a,g       | abcde,cfg,cfg | depart,ramp slight left,arrive |

    Scenario: On Ramp Right
        Given the node map
-            """
-            a b c d e
-            f g
-            """
+            | a | b | c | d | e |
+            | f | g |   |   |   |

        And the ways
-            | nodes | highway       | oneway |
-            | abcde | motorway      |        |
-            | fgd   | motorway_link | yes    |
+            | nodes  | highway       |
+            | abcde  | motorway      |
+            | fgd    | motorway_link |

       When I route I should get
            | waypoints | route           | turns                           |
@@ -132,15 +118,13 @@ Feature: Motorway Guidance

    Scenario: On Ramp Left
        Given the node map
-            """
-            f g
-            a b c d e
-            """
+            | f | g |   |   |   |
+            | a | b | c | d | e |

        And the ways
-            | nodes | highway       | oneway |
-            | abcde | motorway      |        |
-            | fgd   | motorway_link | yes    |
+            | nodes  | highway       |
+            | abcde  | motorway      |
+            | fgd    | motorway_link |

       When I route I should get
            | waypoints | route           | turns                            |
@@ -149,11 +133,9 @@ Feature: Motorway Guidance

    Scenario: Highway Fork
        Given the node map
-            """
-                    d e
-            a b c
-                    f g
-            """
+            |   |   |   |   | d | e |
+            | a | b | c |   |   |   |
+            |   |   |   |   | f | g |

        And the ways
            | nodes  | highway  |
@@ -167,17 +149,15 @@ Feature: Motorway Guidance

     Scenario: Fork After Ramp
       Given the node map
-            """
-                    d e
-            a b c
-                    f g
-            """
+            |   |   |   |   | d | e |
+            | a | b | c |   |   |   |
+            |   |   |   |   | f | g |

        And the ways
-            | nodes | highway       | oneway |
-            | abc   | motorway_link | yes    |
-            | cde   | motorway      |        |
-            | cfg   | motorway      |        |
+            | nodes  | highway       |
+            | abc    | motorway_link |
+            | cde    | motorway      |
+            | cfg    | motorway      |

       When I route I should get
            | waypoints | route       | turns                           |
@@ -186,51 +166,45 @@ Feature: Motorway Guidance

     Scenario: On And Off Ramp Right
       Given the node map
-            """
-            a b   c   d e
-            f g       h i
-            """
+            | a | b |   | c |   | d | e |
+            | f | g |   |   |   | h | i |

        And the ways
-            | nodes | highway       | oneway |
-            | abcde | motorway      |        |
-            | fgc   | motorway_link | yes    |
-            | chi   | motorway_link | yes    |
+            | nodes  | highway       |
+            | abcde  | motorway      |
+            | fgc    | motorway_link |
+            | chi    | motorway_link |

       When I route I should get
-            | waypoints | route           | turns                              |
-            | a,e       | abcde,abcde     | depart,arrive                      |
-            | f,e       | fgc,abcde,abcde | depart,merge slight left,arrive    |
-            | a,i       | abcde,chi,chi   | depart,off ramp slight right,arrive |
-            | f,i       | fgc,chi,chi     | depart,off ramp right,arrive       |
+            | waypoints | route           | turns                           |
+            | a,e       | abcde,abcde     | depart,arrive                   |
+            | f,e       | fgc,abcde,abcde | depart,merge slight left,arrive |
+            | a,i       | abcde,chi,chi   | depart,ramp slight right,arrive |
+            | f,i       | fgc,chi,chi     | depart,ramp right,arrive        |

    Scenario: On And Off Ramp Left
       Given the node map
-            """
-            f g       h i
-            a b   c   d e
-            """
+            | f | g |   |   |   | h | i |
+            | a | b |   | c |   | d | e |

        And the ways
-            | nodes | highway       | oneway |
-            | abcde | motorway      |        |
-            | fgc   | motorway_link | yes    |
-            | chi   | motorway_link | yes    |
+            | nodes  | highway       |
+            | abcde  | motorway      |
+            | fgc    | motorway_link |
+            | chi    | motorway_link |

       When I route I should get
-            | waypoints | route           | turns                             |
-            | a,e       | abcde,abcde     | depart,arrive                     |
-            | f,e       | fgc,abcde,abcde | depart,merge slight right,arrive  |
-            | a,i       | abcde,chi,chi   | depart,off ramp slight left,arrive |
-            | f,i       | fgc,chi,chi     | depart,off ramp left,arrive       |
+            | waypoints | route           | turns                            |
+            | a,e       | abcde,abcde     | depart,arrive                    |
+            | f,e       | fgc,abcde,abcde | depart,merge slight right,arrive |
+            | a,i       | abcde,chi,chi   | depart,ramp slight left,arrive   |
+            | f,i       | fgc,chi,chi     | depart,ramp left,arrive          |

    Scenario: Merging Motorways
        Given the node map
-            """
-            e
-            a b c
-            d
-            """
+            | e |   |   |
+            | a | b | c |
+            | d |   |   |

        And the ways
            | nodes | highway  |
@@ -242,23 +216,3 @@ Feature: Motorway Guidance
            | waypoints | route      | turns                            |
            | d,c       | db,abc,abc | depart,merge slight left,arrive  |
            | e,c       | eb,abc,abc | depart,merge slight right,arrive |
-
-    Scenario: Handle 90 degree off ramps correctly
-        Given the node map
-            """
-            a
-            x b   c y
-                  d
-            """
-
-        And the ways
-            | nodes | name | highway       | oneway |
-            | ab    | On   | motorway_link | yes    |
-            | xb    | Hwy  | motorway      |        |
-            | bc    | Hwy  | motorway      |        |
-            | cd    | Off  | motorway_link | yes    |
-            | cy    | Hwy  | motorway      |        |
-
-       When I route I should get
-            | waypoints | route               | turns                                           |
-            | a,d       | On,Hwy,Off,Off      | depart,merge slight right,off ramp right,arrive |
@@ -3,13 +3,11 @@ Feature: New-Name Instructions

    Background:
        Given the profile "car"
-        Given a grid size of 100 meters
+        Given a grid size of 10 meters

    Scenario: Undisturbed name Change
        Given the node map
-            """
-            a   b   c
-            """
+            | a |   | b |   | c |

        And the ways
            | nodes  |
@@ -23,10 +21,8 @@ Feature: New-Name Instructions

    Scenario: Undisturbed Name Change with unannounced Turn Right
        Given the node map
-            """
-            a   b
-                    c
-            """
+            | a |   | b |   |   |
+            |   |   |   |   | c |

        And the ways
            | nodes  |
@@ -39,10 +35,8 @@ Feature: New-Name Instructions

    Scenario: Undisturbed Name Change with unannounced Turn Left
        Given the node map
-            """
-                    c
-            a   b
-            """
+            |   |   |   |   | c |
+            | a |   | b |   |   |

        And the ways
            | nodes  |
@@ -55,10 +49,8 @@ Feature: New-Name Instructions

    Scenario: Disturbed Name Change with Turn
        Given the node map
-            """
-            a   b
-              d     c
-            """
+            | a |   | b |   |   |
+            |   | d |   |   | c |

        And the ways
            | nodes  |
@@ -72,10 +64,8 @@ Feature: New-Name Instructions

    Scenario: Undisturbed Name Change with announced Turn Left
        Given the node map
-            """
-                c
-            a   b
-            """
+            |   |   | c |
+            | a |   | b |

        And the ways
            | nodes  |
@@ -88,10 +78,8 @@ Feature: New-Name Instructions

    Scenario: Undisturbed Name Change with announced Turn Sharp Left
        Given the node map
-            """
-            c
-            a   b
-            """
+            | c |   |   |
+            | a |   | b |

        And the ways
            | nodes  |
@@ -104,10 +92,8 @@ Feature: New-Name Instructions

    Scenario: Undisturbed Name Change with announced Turn Right
        Given the node map
-            """
-            a   b
-                c
-            """
+            | a |   | b |
+            |   |   | c |

        And the ways
            | nodes  |
@@ -120,10 +106,8 @@ Feature: New-Name Instructions

    Scenario: Undisturbed Name Change with announced Turn Sharp Right
        Given the node map
-            """
-            a   b
-            c
-            """
+            | a |   | b |
+            | c |   |   |

        And the ways
            | nodes  |
@@ -137,277 +121,15 @@ Feature: New-Name Instructions

    Scenario: Disturbed Name Change with minor road class
        Given the node map
-            """
-            a   b   d
-                    c
-            """
+            | a |   | b |   | d |
+            |   |   |   |   | c |

        And the ways
-            | nodes  | highway     | oneway |
-            | ab     | residential | yes    |
-            | bc     | residential | yes    |
-            | bd     | service     | yes    |
+            | nodes  | highway     |
+            | ab     | residential |
+            | bc     | residential |
+            | bd     | service     |

       When I route I should get
            | waypoints | route    | turns                               |
            | a,c       | ab,bc,bc | depart,new name slight right,arrive |
-
-    Scenario: Empty road names - Announce Change From, suppress Change To
-        Given the node map
-            """
-            a   b 1 c   d
-            """
-
-        And the ways
-            | nodes | name |
-            | ab    | ab   |
-            | bc    |      |
-            | cd    | cd   |
-
-        When I route I should get
-            | waypoints | route    | turns                           |
-            | a,d       | ab,cd,cd | depart,new name straight,arrive |
-            | a,1       | ab,      | depart,arrive                   |
-
-    Scenario: Empty road names - Loose name shortly
-        Given the node map
-            """
-            a   b   c   d   e
-            """
-
-        And the ways
-            | nodes | name      |
-            | ab    | name      |
-            | bc    | with-name |
-            | cd    |           |
-            | de    | with-name |
-
-        When I route I should get
-            | waypoints | route                    | turns                           |
-            | a,e       | name,with-name,with-name | depart,new name straight,arrive |
-            | b,e       | with-name,with-name      | depart,arrive                   |
-
-    Scenario: Both Name and Ref Empty
-        Given the node map
-            """
-            a   b   c
-            """
-
-        And the ways
-            | nodes | name | ref |
-            | ab    |      |     |
-            | bc    |      |     |
-
-        When I route I should get
-            | waypoints | route | turns         |
-            | a,c       | ,     | depart,arrive |
-
-    Scenario: Same Name, Ref Extended
-        Given the node map
-            """
-            a   b   c
-            """
-
-        And the ways
-            | nodes | name | ref   |
-            | ab    | A    | B1    |
-            | bc    | C    | B1;B2 |
-
-        When I route I should get
-            | waypoints | route | turns                           |
-            | a,c       | A,C,C | depart,new name straight,arrive |
-
-    Scenario: Same Name, Ref Removed
-        Given the node map
-            """
-            a   b   c
-            """
-
-        And the ways
-            | nodes | name | ref   |
-            | ab    | A    | B1;B2 |
-            | bc    | C    | B1    |
-
-        When I route I should get
-            | waypoints | route | turns                           |
-            | a,c       | A,C,C | depart,new name straight,arrive |
-
-    Scenario: Name Removed, Ref Extended
-        Given the node map
-            """
-            a   b   c
-            """
-
-        And the ways
-            | nodes | name | ref   |
-            | ab    | A    | B1    |
-            | bc    |      | B1;B2 |
-
-        When I route I should get
-            | waypoints | route | turns         |
-            | a,c       | A,    | depart,arrive |
-
-    Scenario: Name Added, Ref Removed
-        Given the node map
-            """
-            a   b   c
-            """
-
-        And the ways
-            | nodes | name | ref   |
-            | ab    |      | B1    |
-            | bc    | A    |       |
-
-        When I route I should get
-            | waypoints | route | turns                           |
-            | a,c       | ,A,A  | depart,new name straight,arrive |
-
-    Scenario: Prefix Change
-        Given the node map
-            """
-            a       b       c
-            """
-
-        And the ways
-            | nodes | name                     | ref   | highway  |
-            | ab    | North Central Expressway | US 75 | motorway |
-            | bc    | Central Expressway       | US 75 | motorway |
-
-        When I route I should get
-            | waypoints | route                                                          | turns                           |
-            | a,c       | North Central Expressway,Central Expressway,Central Expressway | depart,new name straight,arrive |
-
-    Scenario: Prefix Change
-        Given the node map
-            """
-            a       b       c
-            """
-
-        And the ways
-            | nodes | name                     | ref   | highway  |
-            | ba    | North Central Expressway | US 75 | motorway |
-            | cb    | Central Expressway       | US 75 | motorway |
-
-        When I route I should get
-            | waypoints | route                                                                | turns                           |
-            | c,a       | Central Expressway,North Central Expressway,North Central Expressway | depart,new name straight,arrive |
-
-    Scenario: No Name, Same Reference
-        Given the node map
-            """
-            a       b       c
-            """
-
-        And the ways
-            | nodes | name               | ref   | highway  |
-            | ab    | Central Expressway | US 75 | motorway |
-            | bc    |                    | US 75 | motorway |
-
-        When I route I should get
-            | waypoints | route               | turns         |
-            | a,c       | Central Expressway, | depart,arrive |
-
-    Scenario: No Name, Same Reference
-        Given the node map
-            """
-            a       b       c
-            """
-
-        And the ways
-            | nodes | name               | ref   | highway  |
-            | ab    |                    | US 75 | motorway |
-            | bc    | Central Expressway | US 75 | motorway |
-
-        When I route I should get
-            | waypoints | route               | turns         |
-            | a,c       | ,Central Expressway | depart,arrive |
-
-    Scenario: No Name, Same Reference
-        Given the node map
-            """
-            a       b       c
-            """
-
-        And the ways
-            | nodes | name | ref         | highway  |
-            | ab    |      | US 75;US 69 | motorway |
-            | bc    |      | US 75       | motorway |
-
-        When I route I should get
-            | waypoints | route | turns         |
-            | a,c       | ,     | depart,arrive |
-
-    Scenario: No Name, Same Reference
-        Given the node map
-            """
-            a       b       c
-            """
-
-        And the ways
-            | nodes | name | ref         | highway  |
-            | ab    |      | US 69;US 75 | motorway |
-            | bc    |      | US 75       | motorway |
-
-        When I route I should get
-            | waypoints | route | turns         |
-            | a,c       | ,     | depart,arrive |
-
-    Scenario: No Name, Same Reference
-        Given the node map
-            """
-            a       b       c
-            """
-
-        And the ways
-            | nodes | name | ref         | highway  |
-            | ab    |      | US 75       | motorway |
-            | bc    |      | US 75;US 69 | motorway |
-
-        When I route I should get
-            | waypoints | route | turns         |
-            | a,c       | ,     | depart,arrive |
-
-    Scenario: No Name, Same Reference
-        Given the node map
-            """
-            a       b       c
-            """
-
-        And the ways
-            | nodes | name | ref         | highway  |
-            | ab    |      | US 75       | motorway |
-            | bc    |      | US 69;US 75 | motorway |
-
-        When I route I should get
-            | waypoints | route | turns         |
-            | a,c       | ,     | depart,arrive |
-
-    Scenario: Spaces in refs for containment check, #3086
-        Given the node map
-            """
-            a       b       c
-            """
-
-        And the ways
-            | nodes | name     | ref                        | highway  |
-            | ab    | Keystone | US 64;US 412;OK 151 Detour | motorway |
-            | bc    | Keystone | US 64; US 412              | motorway |
-
-        When I route I should get
-            | waypoints | route             | turns         |
-            | a,c       | Keystone,Keystone | depart,arrive |
-
-    Scenario: More spaces in refs for containment check, #3086
-        Given the node map
-            """
-            a       b       c
-            """
-
-        And the ways
-            | nodes | name      | ref                              | highway  |
-            | ab    | Keystone  | US 64; US 412  ;   OK 151 Detour | motorway |
-            | bc    |  Keystone |  US 64  ;  US 412                | motorway |
-
-        When I route I should get
-            | waypoints | route             | turns         |
-            | a,c       | Keystone,Keystone | depart,arrive |
@@ -1,63 +0,0 @@
-@routing @guidance @mode-change
-Feature: Notification on turn onto mode change
-
-    Background:
-        Given the profile "car"
-        Given a grid size of 400 meters
-
-    Scenario: Turn onto a Ferry
-        Given the node map
-            """
-            f
-            b     d
-            a       e
-            """
-
-        And the ways
-            | nodes | highway | route | name  |
-            | abf   | primary |       |       |
-            | bd    |         | ferry | ferry |
-            | de    | primary |       |       |
-
-        When I route I should get
-            | waypoints | route     | turns                                        | modes                          |
-            | a,e       | ,ferry,,  | depart,turn right,notification right,arrive  | driving,ferry,driving,driving  |
-
-    Scenario: Turn onto a Ferry
-        Given the node map
-            """
-            h     g
-            a c   e
-            b     f
-            """
-
-        And the ways
-            | nodes | highway | route | name  |
-            | ac    | primary |       |       |
-            | bah   | primary |       |       |
-            | ec    |         | ferry | ferry |
-            | gef   | primary |       |       |
-
-        When I route I should get
-            | waypoints | route     | turns                                                      | modes                                   |
-            | g,h       | ,ferry,,, | depart,turn right,notification straight,turn right,arrive  | driving,ferry,driving,driving,driving   |
-            | b,g       | ,,ferry,, | depart,turn right,notification straight,turn left,arrive   | driving,driving,ferry,driving,driving   |
-
-    Scenario: Straight onto a Ferry
-        Given the node map
-            """
-
-              c d   i
-            a
-                  f
-            """
-
-        And the ways
-            | nodes | highway | route | name    |
-            | ac    | primary |       |         |
-            | dc    |         | ferry | ferry   |
-            | df    | primary |       |         |
-
-        When I route I should get
-            | waypoints | route     | turns                                                  | modes                           |
-            | a,f       | ,ferry,,  | depart,notification right,notification right,arrive    | driving,ferry,driving,driving   |
@@ -1,192 +0,0 @@
-@routing  @guidance @perceived-angles
-Feature: Simple Turns
-
-    Background:
-        Given the profile "car"
-        Given a grid size of 5 meters
-
-    Scenario: Turning into splitting road
-        Given the node map
-            """
-              a
-              b
-
-
-            c   d
-
-                  e
-
-                f
-            """
-
-        And the ways
-            | nodes | name | highway | oneway |
-            | ab    | road | primary | no     |
-            | bc    | road | primary | yes    |
-            | fdb   | road | primary | yes    |
-            | de    | turn | primary | no     |
-
-        When I route I should get
-            | waypoints | turns                           | route          |
-            | f,a       | depart,arrive                   | road,road      |
-            | e,a       | depart,turn slight right,arrive | turn,road,road |
-
-    Scenario: Turning into splitting road
-        Given the node map
-        """
-              a
-            g-b
-              /\
-             /  \
-            c   d
-                |\
-                | e
-                |
-                f
-        """
-
-        And the ways
-            | nodes | name | highway | oneway |
-            | ab    | road | primary | no     |
-            | bc    | road | primary | yes    |
-            | fdb   | road | primary | yes    |
-            | de    | turn | primary | no     |
-            | bg    | left | primary | yes    |
-
-        When I route I should get
-            | waypoints | turns                                     | route               |
-            | f,a       | depart,arrive                             | road,road           |
-            | e,a       | depart,turn slight right,arrive           | turn,road,road      |
-            | e,g       | depart,turn slight right,turn left,arrive | turn,road,left,left |
-            | f,g       | depart,turn left,arrive                   | road,left,left      |
-            | f,c       | depart,continue uturn,arrive              | road,road,road      |
-
-    Scenario: Middle Island
-        Given the node map
-            """
-              a
-
-              b
-            c   h
-
-
-
-
-            d   g
-              e
-
-              f
-            """
-
-        And the ways
-            | nodes | name | oneway |
-            | ab    | road | no     |
-            | ef    | road | no     |
-            | bcde  | road | yes    |
-            | eghb  | road | yes    |
-
-        When I route I should get
-            | waypoints | turns         | route     |
-            | a,f       | depart,arrive | road,road |
-            | c,f       | depart,arrive | road,road |
-            | f,a       | depart,arrive | road,road |
-            | g,a       | depart,arrive | road,road |
-
-    Scenario: Middle Island Over Bridge
-        Given the node map
-            """
-              a
-
-              b
-            c   h
-
-
-            1   2
-
-            d   g
-              e
-
-              f
-            """
-
-        And the ways
-            | nodes | name   | oneway |
-            | ab    | road   | no     |
-            | ef    | road   | no     |
-            | bc    | road   | yes    |
-            | cd    | bridge | yes    |
-            | de    | road   | yes    |
-            | eg    | road   | yes    |
-            | gh    | bridge | yes    |
-            | hb    | road   | yes    |
-
-        When I route I should get
-            | waypoints | turns                           | route            |
-            | a,f       | depart,arrive                   | road,road        |
-            | c,f       | depart,new name straight,arrive | bridge,road,road |
-            | 1,f       | depart,new name straight,arrive | bridge,road,road |
-            | f,a       | depart,arrive                   | road,road        |
-            | g,a       | depart,new name straight,arrive | bridge,road,road |
-            | 2,a       | depart,new name straight,arrive | bridge,road,road |
-
-    @negative
-    Scenario: Don't Collapse Places:
-        Given the node map
-            """
-                        h
-                        g
-
-
-
-
-            a b                   e f
-
-
-
-
-                        c
-                        d
-            """
-
-        And the ways
-            | nodes | name   | oneway |
-            | ab    | place  | no     |
-            | cd    | bottom | no     |
-            | ef    | place  | no     |
-            | gh    | top    | no     |
-            | bcegb | place  | yes    |
-
-        When I route I should get
-            | waypoints | turns                                             | route                      |
-            | a,d       | depart,turn right,arrive                          | place,bottom,bottom        |
-            | a,f       | depart,continue left,continue right,arrive        | place,place,place,place    |
-            | d,f       | depart,turn right,continue right,arrive           | bottom,place,place,place   |
-            | d,h       | depart,turn right,continue left,turn right,arrive | bottom,place,place,top,top |
-
-    @bug @not-sorted @3179
-    Scenario: Adjusting road angles to not be sorted
-        Given the node map
-            """
-                                 g
-                                |
-                               |
-                              |
-                             _e - - - - - - - - - f
-                           /
-            a - - - - -b <
-                     i     \ _
-                h             c - - - - - - - - - d
-
-            """
-
-        And the ways
-            | nodes | name  | oneway |
-            | ab    | road  | no     |
-            | febcd | road  | yes    |
-            | ge    | in    | yes    |
-            | eh    | right | yes    |
-            | ei    | left  | yes    |
-
-        When I route I should get
-            | waypoints | route        |
-            | g,a       | in,road,road |
@@ -1,24 +0,0 @@
-@routing  @guidance @post-processing
-Feature: General Post-Processing related features
-
-    Background:
-        Given the profile "car"
-        Given a grid size of 10 meters
-
-    # this testcase used to crash geometry generation (at that time handled during intersection generation)
-    Scenario: Regression test #2424
-        Given the node map
-            """
-                e           i
-            a   b   c   d   h   k   m
-                    f           l
-            """
-
-        And the ways
-            | nodes  | name                 |
-            | abcd   | Fritz-Elsas-Straße   |
-            | hkm    | Fritz-Elsas-Straße   |
-            | dhi    | Martin-Luther-Straße |
-            | be     | corner               |
-            | kl     | corner               |
-            | cf     | corner               |
@@ -7,10 +7,8 @@ Feature: Ramp Guidance

    Scenario: Ramp On Through Street Right
        Given the node map
-            """
-            a b c
-              d
-            """
+            | a | b | c |
+            |   | d |   |

        And the ways
            | nodes | highway       |
@@ -18,15 +16,13 @@ Feature: Ramp Guidance
            | bd    | motorway_link |

       When I route I should get
-            | waypoints | route     | turns                          |
-            | a,d       | abc,bd,bd | depart,on ramp right,arrive |
+            | waypoints | route     | turns                    |
+            | a,d       | abc,bd,bd | depart,ramp right,arrive |

    Scenario: Ramp On Through Street Left
        Given the node map
-            """
-              d
-            a b c
-            """
+            |   | d |   |
+            | a | b | c |

        And the ways
            | nodes | highway       |
@@ -34,16 +30,14 @@ Feature: Ramp Guidance
            | bd    | motorway_link |

       When I route I should get
-            | waypoints | route     | turns                         |
-            | a,d       | abc,bd,bd | depart,on ramp left,arrive |
+            | waypoints | route     | turns                   |
+            | a,d       | abc,bd,bd | depart,ramp left,arrive |

    Scenario: Ramp On Through Street Left and Right
        Given the node map
-            """
-              e
-            a b c
-              d
-            """
+            |   | e |   |
+            | a | b | c |
+            |   | d |   |

        And the ways
            | nodes | highway       |
@@ -52,16 +46,14 @@ Feature: Ramp Guidance
            | bd    | motorway_link |

       When I route I should get
-            | waypoints | route     | turns                          |
-            | a,d       | abc,bd,bd | depart,on ramp right,arrive |
-            | a,e       | abc,be,be | depart,on ramp left,arrive  |
+            | waypoints | route     | turns                    |
+            | a,d       | abc,bd,bd | depart,ramp right,arrive |
+            | a,e       | abc,be,be | depart,ramp left,arrive  |

    Scenario: Ramp On Three Way Intersection Right
        Given the node map
-            """
-            a b c
-              d
-            """
+            | a | b | c |
+            |   | d |   |

        And the ways
            | nodes | highway       |
@@ -70,16 +62,14 @@ Feature: Ramp Guidance
            | bd    | motorway_link |

       When I route I should get
-            | waypoints | route    | turns                          |
-            | a,d       | ab,bd,bd | depart,on ramp right,arrive |
+            | waypoints | route    | turns                    |
+            | a,d       | ab,bd,bd | depart,ramp right,arrive |

    Scenario: Ramp On Three Way Intersection Right
        Given the node map
-            """
-                c
-            a b
-              d
-            """
+            |   |   | c |
+            | a | b |   |
+            |   | d |   |

        And the ways
            | nodes | highway       |
@@ -88,33 +78,29 @@ Feature: Ramp Guidance
            | bd    | motorway_link |

       When I route I should get
-            | waypoints | route    | turns                          |
-            | a,d       | ab,bd,bd | depart,on ramp right,arrive |
+            | waypoints | route    | turns                    |
+            | a,d       | ab,bd,bd | depart,ramp right,arrive |

    Scenario: Ramp Off Though Street
        Given the node map
-            """
-                    c
-            a     b
-                  d
-            """
+            |   |   | c |
+            | a | b |   |
+            |   | d |   |

        And the ways
-            | nodes | highway       | oneway |
-            | abc   | tertiary      | yes    |
-            | bd    | motorway_link | yes    |
+            | nodes | highway       |
+            | abc   | tertiary      |
+            | bd    | motorway_link |

       When I route I should get
-            | waypoints | route     | turns                          |
-            | a,d       | abc,bd,bd | depart,on ramp right,arrive |
-            | a,c       | abc,abc   | depart,arrive                  |
+            | waypoints | route     | turns                    |
+            | a,d       | abc,bd,bd | depart,ramp right,arrive |
+            | a,c       | abc,abc   | depart,arrive            |

    Scenario: Straight Ramp Off Turning Though Street
        Given the node map
-            """
-                c
-            a b d
-            """
+            |   |   | c |
+            | a | b | d |

        And the ways
            | nodes | highway       |
@@ -122,17 +108,15 @@ Feature: Ramp Guidance
            | bd    | motorway_link |

       When I route I should get
-            | waypoints | route     | turns                          |
-            | a,d       | abc,bd,bd | depart,on ramp straight,arrive |
-            | a,c       | abc,abc   | depart,arrive                  |
+            | waypoints | route       | turns                       |
+            | a,d       | abc,bd,bd   | depart,ramp straight,arrive |
+            | a,c       | abc,abc,abc | depart,continue left,arrive |

    Scenario: Fork Ramp Off Turning Though Street
        Given the node map
-            """
-                c
-            a b
-                d
-            """
+            |   |   | c |
+            | a | b |   |
+            |   |   | d |

        And the ways
            | nodes | highway       |
@@ -140,17 +124,15 @@ Feature: Ramp Guidance
            | bd    | motorway_link |

       When I route I should get
-            | waypoints | route     | turns                       |
-            | a,d       | abc,bd,bd | depart,on ramp right,arrive |
-            | a,c       | abc,abc   | depart,arrive               |
+            | waypoints | route       | turns                       |
+            | a,d       | abc,bd,bd   | depart,ramp right,arrive    |
+            | a,c       | abc,abc,abc | depart,continue left,arrive |

    Scenario: Fork Ramp
        Given the node map
-            """
-                c
-            a b
-                d
-            """
+            |   |   | c |
+            | a | b |   |
+            |   |   | d |

        And the ways
            | nodes | highway       |
@@ -159,17 +141,15 @@ Feature: Ramp Guidance
            | bd    | motorway_link |

       When I route I should get
-            | waypoints | route    | turns                          |
-            | a,d       | ab,bd,bd | depart,on ramp right,arrive |
-            | a,c       | ab,bc,bc | depart,turn left,arrive        |
+            | waypoints | route    | turns                    |
+            | a,d       | ab,bd,bd | depart,ramp right,arrive |
+            | a,c       | ab,bc,bc | depart,turn left,arrive  |

    Scenario: Fork Slight Ramp
        Given the node map
-            """
-                  c
-            a b
-                  d
-            """
+            |   |   |   | c |
+            | a | b |   |   |
+            |   |   |   | d |

        And the ways
            | nodes | highway       |
@@ -178,17 +158,15 @@ Feature: Ramp Guidance
            | bd    | motorway_link |

       When I route I should get
-            | waypoints | route    | turns                                 |
-            | a,d       | ab,bd,bd | depart,on ramp slight right,arrive |
-            | a,c       | ab,bc,bc | depart,turn slight left,arrive        |
+            | waypoints | route    | turns                           |
+            | a,d       | ab,bd,bd | depart,ramp slight right,arrive |
+            | a,c       | ab,bc,bc | depart,turn slight left,arrive  |

    Scenario: Fork Slight Ramp on Through Street
        Given the node map
-            """
-                  c
-            a b
-                  d
-            """
+            |   |   |   | c |
+            | a | b |   |   |
+            |   |   |   | d |

        And the ways
            | nodes | highway       |
@@ -196,17 +174,15 @@ Feature: Ramp Guidance
            | bd    | motorway_link |

       When I route I should get
-            | waypoints | route     | turns                              |
-            | a,d       | abc,bd,bd | depart,on ramp slight right,arrive |
-            | a,c       | abc,abc   | depart,arrive                      |
+            | waypoints | route       | turns                              |
+            | a,d       | abc,bd,bd   | depart,ramp slight right,arrive    |
+            | a,c       | abc,abc,abc | depart,continue slight left,arrive |

    Scenario: Fork Slight Ramp on Obvious Through Street
        Given the node map
-            """
-                  c
-            a b
-                  d
-            """
+            |   |   |   | c |
+            | a | b |   |   |
+            |   |   |   | d |

        And the ways
            | nodes | highway       |
@@ -214,17 +190,15 @@ Feature: Ramp Guidance
            | bd    | motorway_link |

       When I route I should get
-            | waypoints | route     | turns                                 |
-            | a,d       | abc,bd,bd | depart,on ramp slight right,arrive |
-            | a,c       | abc,abc   | depart,arrive                         |
+            | waypoints | route     | turns                           |
+            | a,d       | abc,bd,bd | depart,ramp slight right,arrive |
+            | a,c       | abc,abc   | depart,arrive                   |

    Scenario: Two Ramps Joining into common Motorway
        Given the node map
-            """
-            a
-                c d
-            b
-            """
+            | a |   |   |   |
+            |   |   | c | d |
+            | b |   |   |   |

        And the ways
            | nodes | highway       |
@@ -239,11 +213,9 @@ Feature: Ramp Guidance

    Scenario: Two Ramps Joining into common Motorway Unnamed
        Given the node map
-            """
-            a
-                c d
-            b
-            """
+            | a |   |   |   |
+            |   |   | c | d |
+            | b |   |   |   |

        And the ways
            | nodes | highway       | name |
@@ -255,24 +227,3 @@ Feature: Ramp Guidance
            | waypoints | route    | turns         |
            | a,d       | ,        | depart,arrive |
            | b,d       | ,        | depart,arrive |
-
-    Scenario: Ferry Onto A Ramp
-        Given the node map
-            """
-                                d - e - g
-                                |
-            a - b ~ ~ ~ ~ ~ ~ ~ c 
-                                  ` f
-            """
-
-        And the ways
-            | nodes | highway       | route | name                       | ref |
-            | ab    | primary       |       | boarding                   |     |
-            | bc    |               | ferry | boaty mc boatface          | m2  |
-            | cf    |               | ferry | boaty mc boatface          |     |
-            | cd    |               | ferry | boaty mc boatface's cousin |     |
-            | de    | motorway_link |       |                   |     |
-
-        When I route I should get
-            | waypoints | route                                                   |
-            | a,e       | boarding,boaty mc boatface,boaty mc boatface's cousin,, |
@@ -7,13 +7,11 @@ Feature: Rotary

    Scenario: Enter and Exit
        Given the node map
-            """
-                a
-                b
-            h g   c d
-                e
-                f
-            """
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | h | g |   | c | d |
+            |   |   | e |   |   |
+            |   |   | f |   |   |

       And the ways
            | nodes  | junction   |
@@ -40,13 +38,11 @@ Feature: Rotary

    Scenario: Only Enter
        Given the node map
-            """
-                a
-                b
-            d c   g h
-                e
-                f
-            """
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | d | c |   | g | h |
+            |   |   | e |   |   |
+            |   |   | f |   |   |

       And the ways
            | nodes  | junction   |
@@ -73,13 +69,11 @@ Feature: Rotary

    Scenario: Only Exit
        Given the node map
-            """
-                a
-                b
-            d c   g h
-                e
-                f
-            """
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | d | c |   | g | h |
+            |   |   | e |   |   |
+            |   |   | f |   |   |

       And the ways
            | nodes  | junction   |
@@ -107,13 +101,11 @@ Feature: Rotary

    Scenario: Drive Around
        Given the node map
-            """
-                a
-                b
-            d c   g h
-                e
-                f
-            """
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | d | c |   | g | h |
+            |   |   | e |   |   |
+            |   |   | f |   |   |

       And the ways
            | nodes  | junction   |
@@ -141,13 +133,11 @@ Feature: Rotary
     #needs to be adjusted when name-discovery works for entrys
     Scenario: Mixed Entry and Exit
        Given the node map
-           """
-             c   a
-           j   b   f
-             k   e
-           l   h   d
-             g   i
-           """
+           |   | c |   | a |   |
+           | j |   | b |   | f |
+           |   | k |   | e |   |
+           | l |   | h |   | d |
+           |   | g |   | i |   |

        And the ways
           | nodes | junction   | oneway |
@@ -7,13 +7,11 @@ Feature: Rotary

    Scenario: Enter and Exit
        Given the node map
-            """
-                a
-                b
-            h g   c d
-                e
-                f
-            """
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | h | g |   | c | d |
+            |   |   | e |   |   |
+            |   |   | f |   |   |

       And the ways
            | nodes  | junction   |
@@ -40,13 +38,11 @@ Feature: Rotary

    Scenario: Only Enter
        Given the node map
-            """
-                a
-                b
-            d c   g h
-                e
-                f
-            """
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | d | c |   | g | h |
+            |   |   | e |   |   |
+            |   |   | f |   |   |

       And the ways
            | nodes  | junction   |
@@ -73,13 +69,11 @@ Feature: Rotary

    Scenario: Only Exit
        Given the node map
-            """
-                a
-                b
-            d c   g h
-                e
-                f
-            """
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | d | c |   | g | h |
+            |   |   | e |   |   |
+            |   |   | f |   |   |

       And the ways
            | nodes  | junction   |
@@ -107,13 +101,11 @@ Feature: Rotary

    Scenario: Drive Around
        Given the node map
-            """
-                a
-                b
-            d c   g h
-                e
-                f
-            """
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | d | c |   | g | h |
+            |   |   | e |   |   |
+            |   |   | f |   |   |

       And the ways
            | nodes  | junction   |
@@ -141,13 +133,11 @@ Feature: Rotary
     #needs to be adjusted when name-discovery works for entrys
     Scenario: Mixed Entry and Exit
        Given the node map
-           """
-             c   a
-           j   b   f
-             k   e
-           l   h   d
-             g   i
-           """
+           |   | c |   | a |   |
+           | j |   | b |   | f |
+           |   | k |   | e |   |
+           | l |   | h |   | d |
+           |   | g |   | i |   |

        And the ways
           | nodes | junction   | oneway |
@@ -178,12 +168,10 @@ Feature: Rotary

       Scenario: Collinear in X,Y
        Given the node map
-            """
-            a
-            b
-            c d f
-            e
-            """
+            | a |   |   |
+            | b |   |   |
+            | c | d | f |
+            | e |   |   |

        And the ways
            | nodes | junction   |
@@ -199,54 +187,10 @@ Feature: Rotary

       Scenario: Collinear in X,Y
        Given the node map
-            """
-            a
-            d
-            b c f
-            e
-            """
-
-        And the ways
-            | nodes | junction   |
-            | ad    |            |
-            | bcdb  | roundabout |
-            | be    |            |
-            | cf    |            |
-
-        When I route I should get
-            | waypoints | route    | turns                     |
-            | a,e       | ad,be,be | depart,bcdb-exit-1,arrive |
-            | a,f       | ad,cf,cf | depart,bcdb-exit-2,arrive |
-
-       Scenario: Collinear in X,Y
-        Given the node map
-            """
-            a
-            c
-            d b f
-            e
-            """
-
-        And the ways
-            | nodes | junction   |
-            | ac    |            |
-            | bcdb  | roundabout |
-            | de    |            |
-            | bf    |            |
-
-        When I route I should get
-            | waypoints | route    | turns                     |
-            | a,e       | ac,de,de | depart,bcdb-exit-1,arrive |
-            | a,f       | ac,bf,bf | depart,bcdb-exit-2,arrive |
-
-       Scenario: Collinear in X,Y
-        Given the node map
-            """
-            f
-            d c e
-              b
-              a
-            """
+            | a |   |   |
+            | d |   |   |
+            | b | c | f |
+            | e |   |   |

        And the ways
            | nodes | junction   |
@@ -262,12 +206,48 @@ Feature: Rotary

       Scenario: Collinear in X,Y
        Given the node map
-            """
-            f
-            d c e
-            b
-            a
-            """
+            | a |   |   |
+            | c |   |   |
+            | d | b | f |
+            | e |   |   |
+
+        And the ways
+            | nodes | junction   |
+            | ab    |            |
+            | bcdb  | roundabout |
+            | ce    |            |
+            | df    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                     |
+            | a,e       | ab,ce,ce | depart,bcdb-exit-1,arrive |
+            | a,f       | ab,df,df | depart,bcdb-exit-2,arrive |
+
+       Scenario: Collinear in X,Y
+        Given the node map
+            | f |   |   |
+            | d | c | e |
+            |   | b |   |
+            |   | a |   |
+
+        And the ways
+            | nodes | junction   |
+            | ab    |            |
+            | bcdb  | roundabout |
+            | ce    |            |
+            | df    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                     |
+            | a,e       | ab,ce,ce | depart,bcdb-exit-1,arrive |
+            | a,f       | ab,df,df | depart,bcdb-exit-2,arrive |
+
+       Scenario: Collinear in X,Y
+        Given the node map
+            | f |   |   |
+            | d | c | e |
+            | b |   |   |
+            | a |   |   |

        And the ways
            | nodes | junction   |
@@ -5,15 +5,44 @@ Feature: Basic Roundabout
        Given the profile "bicycle"
        Given a grid size of 10 meters

+    Scenario: Enter and Exit
+        Given the node map
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | h | g |   | c | d |
+            |   |   | e |   |   |
+            |   |   | f |   |   |
+
+       And the ways
+            | nodes  | junction   |
+            | ab     |            |
+            | cd     |            |
+            | ef     |            |
+            | gh     |            |
+            | bgecb  | roundabout |
+
+       When I route I should get
+           | waypoints | route    | turns                           |
+           | a,d       | ab,cd,cd | depart,roundabout-exit-3,arrive |
+           | a,f       | ab,ef,ef | depart,roundabout-exit-2,arrive |
+           | a,h       | ab,gh,gh | depart,roundabout-exit-1,arrive |
+           | d,f       | cd,ef,ef | depart,roundabout-exit-3,arrive |
+           | d,h       | cd,gh,gh | depart,roundabout-exit-2,arrive |
+           | d,a       | cd,ab,ab | depart,roundabout-exit-1,arrive |
+           | f,h       | ef,gh,gh | depart,roundabout-exit-3,arrive |
+           | f,a       | ef,ab,ab | depart,roundabout-exit-2,arrive |
+           | f,d       | ef,cd,cd | depart,roundabout-exit-1,arrive |
+           | h,a       | gh,ab,ab | depart,roundabout-exit-3,arrive |
+           | h,d       | gh,cd,cd | depart,roundabout-exit-2,arrive |
+           | h,f       | gh,ef,ef | depart,roundabout-exit-1,arrive |
+
    Scenario: Only Enter
        Given the node map
-            """
-                a
-                b
-            d c   g h
-                e
-                f
-            """
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | d | c |   | g | h |
+            |   |   | e |   |   |
+            |   |   | f |   |   |

       And the ways
            | nodes  | junction   |
@@ -40,13 +69,11 @@ Feature: Basic Roundabout

    Scenario: Only Exit
        Given the node map
-            """
-                a
-                b
-            d c   g h
-                e
-                f
-            """
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | d | c |   | g | h |
+            |   |   | e |   |   |
+            |   |   | f |   |   |

       And the ways
            | nodes  | junction   |
@@ -74,13 +101,11 @@ Feature: Basic Roundabout

    Scenario: Drive Around
        Given the node map
-            """
-                a
-                b
-            d c   g h
-                e
-                f
-            """
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | d | c |   | g | h |
+            |   |   | e |   |   |
+            |   |   | f |   |   |

       And the ways
            | nodes  | junction   |
@@ -107,13 +132,11 @@ Feature: Basic Roundabout

     Scenario: Mixed Entry and Exit
        Given the node map
-           """
-             c   a
-           j   b   f
-             k   e
-           l   h   d
-             g   i
-           """
+           |   | c |   | a |   |
+           | j |   | b |   | f |
+           |   | k |   | e |   |
+           | l |   | h |   | d |
+           |   | g |   | i |   |

        And the ways
           | nodes | junction   | oneway |
@@ -1,39 +0,0 @@
-@routing  @guidance
-Feature: Basic Roundabout
-
-    Background:
-        Given the profile "bicycle"
-        Given a grid size of 10 meters
-
-    Scenario: Enter and Exit
-        Given the node map
-            """
-                a
-                b
-            h g   c d
-                e
-                f
-            """
-
-       And the ways
-            | nodes  | junction   |
-            | ab     |            |
-            | cd     |            |
-            | ef     |            |
-            | gh     |            |
-            | bgecb  | roundabout |
-
-       When I route I should get
-           | waypoints | route    | turns                                         |
-           | a,d       | ab,cd,cd | depart,roundabout turn left exit-3,arrive     |
-           | a,f       | ab,ef,ef | depart,roundabout turn straight exit-2,arrive |
-           | a,h       | ab,gh,gh | depart,roundabout turn right exit-1,arrive    |
-           | d,f       | cd,ef,ef | depart,roundabout turn left exit-3,arrive     |
-           | d,h       | cd,gh,gh | depart,roundabout turn straight exit-2,arrive |
-           | d,a       | cd,ab,ab | depart,roundabout turn right exit-1,arrive    |
-           | f,h       | ef,gh,gh | depart,roundabout turn left exit-3,arrive     |
-           | f,a       | ef,ab,ab | depart,roundabout turn straight exit-2,arrive |
-           | f,d       | ef,cd,cd | depart,roundabout turn right exit-1,arrive    |
-           | h,a       | gh,ab,ab | depart,roundabout turn left exit-3,arrive     |
-           | h,d       | gh,cd,cd | depart,roundabout turn straight exit-2,arrive |
-           | h,f       | gh,ef,ef | depart,roundabout turn right exit-1,arrive    |
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Patrick Niklaus	97c7bcd9c8	Add assetion fix to changelog	2016-04-27 23:35:59 +02:00
Patrick Niklaus	c511b5a133	Try to kick start travis again	2016-04-27 23:25:14 +02:00
Daniel J. Hofmann	e7ab764714	Enable Travis builds for this branch	2016-04-27 18:50:49 +02:00
Daniel J. Hofmann	cbc2283b58	Add Hotfixes to Changelog	2016-04-27 17:25:00 +02:00
Moritz Kobitzsch	598d5fbb67	fix post-processing for local paths, fixes #2310	2016-04-27 17:16:05 +02:00
Moritz Kobitzsch	823dcbf511	remove invalid assertion	2016-04-27 17:15:54 +02:00
Moritz Kobitzsch	1933c5e8f4	Fix local path looping, fixes #2309	2016-04-26 00:53:49 +02:00