Enable builds on 5.10 release branch.

Set version to 5.10
Add regression test for interaction between via-way and via-node
2017-08-03 13:05:54 -07:00 · 2017-08-03 12:57:09 -07:00 · 2017-08-03 12:52:04 -07:00 · 2017-08-03 12:52:00 -07:00 · 2017-08-03 12:51:54 -07:00 · 2017-08-03 12:51:48 -07:00
717 changed files with 21978 additions and 42245 deletions
@@ -1,2 +0,0 @@
-test
-build
@@ -4,7 +4,6 @@ What issue is this PR targeting? If there is no issue that addresses the problem

 ## Tasklist
 - [ ] ADD OWN TASKS HERE
- - [ ] CHANGELOG.md entry ([How to write a changelog entry](http://keepachangelog.com/en/1.0.0/#how))
 - [ ] update relevant [Wiki pages](https://github.com/Project-OSRM/osrm-backend/wiki)
 - [ ] add regression / cucumber cases (see docs/testing.md)
 - [ ] review
@@ -46,7 +46,6 @@ Thumbs.db

 # build related files #
 #######################
-/_build*
 /build/
 /example/build/
 /test/data/monaco*
@@ -1,16 +0,0 @@
-*
-!README.md
-!CHANGELOG.md
-!CONTRIBUTING.MD
-!LICENCE.TXT
-!package.json
-!package-lock.json
-!yarn.lock
-!docs
-!example
-!taginfo.json
-!lib/*.js
-!profiles/*
-!profiles/lib/*
-!profiles/examples/*
-!scripts/node_install.sh
@@ -7,12 +7,17 @@ git:
 sudo: required
 dist: trusty

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

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

@@ -68,34 +73,25 @@ matrix:
      addons: &gcc6
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev', 'lcov']
+          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' ENABLE_COVERAGE=ON CUCUMBER_TIMEOUT=20000
-      before_script:
-        - cd ${TRAVIS_BUILD_DIR}
-        - lcov --directory . --zerocounters # clean cached da files
      after_success:
-        # Creating report
-        - cd ${TRAVIS_BUILD_DIR}
-        - lcov --directory . --capture --output-file coverage.info # capture coverage info
-        - lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter out system
-        - lcov --list coverage.info #debug info
-        # Uploading report to CodeCov
-        - bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
+        - bash <(curl -s https://codecov.io/bash)

    - os: linux
      compiler: "gcc-6-debug-asan"
      addons: &gcc6
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
-      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' TARGET_ARCH='x86_64-asan' ENABLE_SANITIZER=ON CUCUMBER_TIMEOUT=20000 LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/scripts/travis/leaksanitizer.conf"
+          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
+      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' TARGET_ARCH='x86_64-asan' ENABLE_SANITIZER=ON CUCUMBER_TIMEOUT=20000

    - os: linux
      compiler: "clang-4.0-debug"
      addons: &clang40
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
+          packages: ['libstdc++-5-dev', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Debug' CUCUMBER_TIMEOUT=60000

    - os: linux
@@ -103,8 +99,8 @@ matrix:
      addons:
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-4.9-dev']
-      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_SANITIZER=ON LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/scripts/travis/leaksanitizer.conf"
+          packages: ['libstdc++-5-dev']
+      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_SANITIZER=ON

    # Release Builds
    - os: linux
@@ -112,7 +108,7 @@ matrix:
      addons:
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-4.9-dev']
+          packages: ['libstdc++-5-dev']
      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON RUN_CLANG_FORMAT=ON ENABLE_LTO=ON

    - os: linux
@@ -120,7 +116,7 @@ matrix:
      addons: &gcc6
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
+          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release'

    - os: linux
@@ -134,7 +130,7 @@ matrix:
      addons: &gcc6
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
+          packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' ENABLE_STXXL=On

    - os: linux
@@ -142,22 +138,14 @@ matrix:
      addons: &gcc49
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.9', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev', 'ccache']
+          packages: ['g++-4.9', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
      env: CCOMPILER='gcc-4.9' CXXCOMPILER='g++-4.9' BUILD_TYPE='Release'

    - os: osx
      osx_image: xcode8.2
      compiler: "mason-osx-release"
      # we use the xcode provides clang and don't install our own
-      env: ENABLE_MASON=ON BUILD_TYPE='Release' CUCUMBER_TIMEOUT=60000 CCOMPILER='clang' CXXCOMPILER='clang++' ENABLE_ASSERTIONS=ON ENABLE_LTO=ON NODE="4"
-      after_success:
-        - ./scripts/travis/publish.sh
-
-    - os: osx
-      osx_image: xcode8.2
-      compiler: "mason-osx-release"
-      # we use the xcode provides clang and don't install our own
-      env: ENABLE_MASON=ON BUILD_TYPE='Release' CUCUMBER_TIMEOUT=60000 CCOMPILER='clang' CXXCOMPILER='clang++' ENABLE_ASSERTIONS=ON ENABLE_LTO=ON NODE="6"
+      env: ENABLE_MASON=ON BUILD_TYPE='Release' CUCUMBER_TIMEOUT=60000 CCOMPILER='clang' CXXCOMPILER='clang++' ENABLE_ASSERTIONS=ON ENABLE_LTO=ON
      after_success:
        - ./scripts/travis/publish.sh

@@ -167,7 +155,7 @@ matrix:
      #- addons: &clang40
      #-   apt:
      #-     sources: ['llvm-toolchain-trusty-4.0', 'ubuntu-toolchain-r-test']
-      #-     packages: ['clang-4.0', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
+      #-     packages: ['clang-4.0', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
      #- env: CCOMPILER='clang-4.0' CXXCOMPILER='clang++-4.0' BUILD_TYPE='Release'

    # Shared Library
@@ -176,7 +164,7 @@ matrix:
      addons: &gcc6
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
+          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON

      # Disabled because CI slowness
@@ -185,7 +173,7 @@ matrix:
      #- addons: &clang40
      #-   apt:
      #-     sources: ['llvm-toolchain-trusty-4.0', 'ubuntu-toolchain-r-test']
-      #-     packages: ['clang-4.0', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
+      #-     packages: ['clang-4.0', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
      #- env: CCOMPILER='clang-4.0' CXXCOMPILER='clang++-4.0' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON

    # Node build jobs. These skip running the tests.
@@ -195,7 +183,7 @@ matrix:
      addons:
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-4.9-dev']
+          packages: ['libstdc++-5-dev']
      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3
      install:
        - pushd ${OSRM_BUILD_DIR}
@@ -204,8 +192,7 @@ matrix:
              -DENABLE_MASON=${ENABLE_MASON:-OFF} \
              -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
              -DENABLE_CCACHE=ON \
-              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \
-              -DENABLE_GLIBC_WORKAROUND=ON
+              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
        - make --jobs=${JOBS}
        - popd
      script:
@@ -219,7 +206,7 @@ matrix:
      addons:
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-4.9-dev']
+          packages: ['libstdc++-5-dev']
      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Debug' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3
      install:
        - pushd ${OSRM_BUILD_DIR}
@@ -228,8 +215,7 @@ matrix:
              -DENABLE_MASON=${ENABLE_MASON:-OFF} \
              -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
              -DENABLE_CCACHE=ON \
-              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \
-              -DENABLE_GLIBC_WORKAROUND=ON
+              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
        - make --jobs=${JOBS}
        - popd
      script:
@@ -243,7 +229,7 @@ matrix:
      addons:
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-4.9-dev']
+          packages: ['libstdc++-5-dev']
      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 NODE="6"
      install:
        - pushd ${OSRM_BUILD_DIR}
@@ -252,8 +238,7 @@ matrix:
              -DENABLE_MASON=${ENABLE_MASON:-OFF} \
              -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
              -DENABLE_CCACHE=ON \
-              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \
-              -DENABLE_GLIBC_WORKAROUND=ON
+              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
        - make --jobs=${JOBS}
        - popd
      script:
@@ -267,7 +252,7 @@ matrix:
      addons:
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-4.9-dev']
+          packages: ['libstdc++-5-dev']
      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Debug' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 NODE="6"
      install:
        - pushd ${OSRM_BUILD_DIR}
@@ -276,56 +261,7 @@ matrix:
              -DENABLE_MASON=${ENABLE_MASON:-OFF} \
              -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
              -DENABLE_CCACHE=ON \
-              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \
-              -DENABLE_GLIBC_WORKAROUND=ON
-        - make --jobs=${JOBS}
-        - popd
-      script:
-        - npm run nodejs-tests
-      after_success:
-        - ./scripts/travis/publish.sh
-
-    - os: linux
-      sudo: false
-      compiler: "node-8-mason-linux-release"
-      addons:
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-4.9-dev']
-      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 NODE="8"
-      install:
-        - pushd ${OSRM_BUILD_DIR}
-        - |
-          cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-              -DENABLE_MASON=${ENABLE_MASON:-OFF} \
-              -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
-              -DENABLE_CCACHE=ON \
-              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \
-              -DENABLE_GLIBC_WORKAROUND=ON
-        - make --jobs=${JOBS}
-        - popd
-      script:
-        - npm run nodejs-tests
-      after_success:
-        - ./scripts/travis/publish.sh
-
-    - os: linux
-      sudo: false
-      compiler: "node-6-mason-linux-release"
-      addons:
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-4.9-dev']
-      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Debug' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 NODE="8"
-      install:
-        - pushd ${OSRM_BUILD_DIR}
-        - |
-          cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-              -DENABLE_MASON=${ENABLE_MASON:-OFF} \
-              -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
-              -DENABLE_CCACHE=ON \
-              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \
-              -DENABLE_GLIBC_WORKAROUND=ON
+              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
        - make --jobs=${JOBS}
        - popd
      script:
@@ -366,7 +302,7 @@ before_install:
  - mkdir -p ${CMAKE_DIR}
  - travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${CMAKE_DIR} || travis_terminate 1
  - export PATH=${CMAKE_DIR}/bin:${PATH}
-  - ${MASON} install tbb 2017_U7 && export LD_LIBRARY_PATH=$(${MASON} prefix tbb 2017_U7)/lib/:${LD_LIBRARY_PATH}
+  - ${MASON} install tbb 2017_20161128 && export LD_LIBRARY_PATH=$(${MASON} prefix tbb 2017_20161128)/lib/:${LD_LIBRARY_PATH}
  - ${MASON} install ccache ${CCACHE_VERSION} && export PATH=$(${MASON} prefix ccache ${CCACHE_VERSION})/bin:${PATH}
  - |
    if [[ ! -z ${CLANG_VERSION} ]]; then
@@ -399,8 +335,7 @@ install:
             -DENABLE_STXXL=${ENABLE_STXXL:-OFF} \
             -DBUILD_TOOLS=ON \
             -DENABLE_CCACHE=ON \
-             -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \
-             -DENABLE_GLIBC_WORKAROUND=${ENABLE_GLIBC_WORKAROUND:-OFF}
+             -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
  - echo "travis_fold:start:MAKE"
  - make --jobs=${JOBS}
  - make tests --jobs=${JOBS}
@@ -422,12 +357,11 @@ install:
 script:
  - if [[ $TARGET_ARCH == armhf ]] ; then echo "Skip tests for $TARGET_ARCH" && exit 0 ; fi
  - make -C test/data benchmark
-  - ./example/build/osrm-example test/data/mld/monaco.osrm
+  - ./example/build/osrm-example test/data/ch/monaco.osrm
  # All tests assume to be run from the build directory
  - pushd ${OSRM_BUILD_DIR}
  - ./unit_tests/library-tests
  - ./unit_tests/extractor-tests
-  - ./unit_tests/contractor-tests
  - ./unit_tests/engine-tests
  - ./unit_tests/util-tests
  - ./unit_tests/server-tests
@@ -1,154 +1,3 @@
-# 5.15.1
-  - Changes from 5.15.0:
-    - Bugfixes:
-      - FIXED: Segfault in map matching when RouteLeg collapsing code is run on a match with multiple submatches
-    - Guidance:
-      -  Set type of trivial intersections where classes change to Suppressed instead of NoTurn
-
-# 5.15.0
-  - Changes from 5.14.3:
-    - Bugfixes:
-      - FIXED #4704: Fixed regression in bearings reordering introduced in 5.13 [#4704](https://github.com/Project-OSRM/osrm-backend/issues/4704)
-      - FIXED #4781: Fixed overflow exceptions in percent-encoding parsing
-      - FIXED #4770: Fixed exclude flags for single toll road scenario
-      - FIXED #4283: Fix overflow on zero duration segments
-      - FIXED #4804: Ignore no_*_on_red turn restrictions
-    - Guidance:
-      - CHANGED #4706: Guidance refactoring step to decouple intersection connectivity analysis and turn instructions generation [#4706](https://github.com/Project-OSRM/osrm-backend/pull/4706)
-      - CHANGED #3491: Refactor `isThroughStreet`/Intersection options
-    - Profile:
-      - ADDED: `tunnel` as a new class in car profile so that sections of the route with tunnel tags will be marked as such
-
-# 5.14.3
-  - Changes from 5.14.2:
-    - Features:
-      - Added a `waypoints` parameter to the match service plugin that accepts indices to input coordinates and treats only those points as waypoints in the response format.
-    - Bugfixes:
-      - FIXED #4754: U-Turn penalties are applied to straight turns.
-      - FIXED #4756: Removed too restrictive road name check in the sliproad handler
-      - FIXED #4731: Use correct weights for edge-based graph duplicated via nodes.
-    - Profile:
-      - CHANGED: added Belarus speed limits
-      - CHANGED: set default urban speed in Ukraine to 50kmh
-
-# 5.14.2
-  - Changes from 5.14.1:
-    - Bugfixes:
-      - FIXED #4727: Erroring when a old .core file is present.
-      - FIXED #4642: Update checks for EMPTY_NAMEID to check for empty name strings
-      - FIXED #4738: Fix potential segmentation fault
-    - Node.js Bindings:
-      - ADDED: Exposed new `max_radiuses_map_matching` option from `EngingConfig` options
-    - Tools:
-      - ADDED: New osrm-routed `max_radiuses_map_matching` command line flag to optionally set a maximum radius for map matching
-
-# 5.14.1
-  - Changes from 5.14.0
-    - Bugfixes:
-      - FIXED: don't use removed alternative candidates in `filterPackedPathsByCellSharing`
-
-# 5.14.0
-  - Changes from 5.13
-    - API:
-      - ADDED: new RouteStep property `driving_side` that has either "left" or "right" for that step
-    - Misc:
-      - ADDED: Bundles a rough (please improve!) driving-side GeoJSON file for use with `osrm-extract --location-dependent-data data/driving_side.geojson`
-      - CHANGED: Conditional turn parsing is disabled by default now
-      - ADDED: Adds a tool to analyze turn instruction generation in a dataset.  Useful for tracking turn-by-turn heuristic changes over time.
-      - CHANGED: Internal refactoring of guidance code as a first step towards a re-runnable guidance pipeline
-      - ADDED: Now publishing Node 8.x LTS binary modules
-    - Profile:
-      - CHANGED: Remove dependency on turn types and turn modifier in the process_turn function in the `car.lua` profile. Guidance instruction types are not used to influence turn penalty anymore so this will break backward compatibility between profile version 3 and 4.
-    - Guidance:
-      - ADDED: New internal flag on "segregated intersections" - in the future, will should allow collapsing of instructions across complex intersection geometry where humans only perceive a single maneuver
-      - CHANGED: Decrease roundabout turn radius threshold from 25m to 15m - adds some "exit the roundabout" instructions for moderately sized roundabouts that were being missed previously
-    - Docker:
-      - CHANGED: switch to alpine 3.6, and use a multistage build to reduce image size
-    - Build:
-      - FIX: use LUA_LIBRARY_DIRS to propertly detect Lua on all platforms
-    - Docs:
-      - FIX: clarify description of roundabout exit instructions
-    - Bugfixes:
-      - FIXED: Fix bug where merge instructions got the wrong direction modifier ([PR #4670](https://github.com/Project-OSRM/osrm-backend/pull/4670))
-      - FIXED: Properly use the `profile.properties.left_hand_driving` property, there was a typo that meant it had no effect
-      - FIXED: undefined behaviour when alternative candidate via node is same as source node ([#4691](https://github.com/Project-OSRM/osrm-backend/issues/4691))
-      - FIXED: ensure libosrm.pc is pushed to the correct location for pkgconfig to find it on all platforms
-      - FIXED: don't consider empty names + empty refs as a valid name for u-turns
-
-# 5.13.0
-  - Changes from 5.12:
-    - Profile:
-      - Append cardinal directions from route relations to ref fields to improve instructions; off by default see `profile.cardinal_directions`
-      - Support of `distance` weight in foot and bicycle profiles
-      - Support of relations processing
-      - Added `way:get_location_tag(key)` method to get location-dependent tags https://github.com/Project-OSRM/osrm-backend/wiki/Using-location-dependent-data-in-profiles
-      - Added `forward_ref` and `backward_ref` support
-      - Left-side driving mode is specified by a local Boolean flag `is_left_hand_driving` in `ExtractionWay` and `ExtractionTurn`
-      - Support literal values for maxspeeds in NO, PL and ZA
-    - Infrastructure:
-      - Lua 5.1 support is removed due to lack of support in sol2 https://github.com/ThePhD/sol2/issues/302
-      - Fixed pkg-config version of OSRM
-      - Removed `.osrm.core` file since CoreCH is deprecated now.
-    - Tools:
-      - Because of boost/program_options#32 with boost 1.65+ we needed to change the behavior of the following flags to not accept `={true|false}` anymore:
-        - `--use-locations-cache=false` becomes `--disable-location-cache`
-        - `--parse-conditional-restrictions=true` becomes `--parse-conditional-restrictions`
-        - The deprecated options `--use-level-cache` and `--generate-edge-lookup`
-    - Bugfixes:
-      - Fixed #4348: Some cases of sliproads pre-processing were broken
-      - Fixed #4331: Correctly compute left/right modifiers of forks in case the fork is curved.
-      - Fixed #4472: Correctly count the number of lanes using the delimter in `turn:lanes` tag.
-      - Fixed #4214: Multiple runs of `osrm-partition` lead to crash.
-      - Fixed #4348: Fix assorted problems around slip roads.
-      - Fixed #4420: A bug that would result in unnecessary instructions, due to problems in suffix/prefix detection
-    - Algorithm
-      - Deprecate CoreCH functionality. Usage of CoreCH specific options will fall back to using CH with core_factor of 1.0
-      - MLD uses a unidirectional Dijkstra for 1-to-N and N-to-1 matrices which yields speedup.
-
-# 5.12.0
-  - Changes from 5.11:
-    - Guidance
-      - now announcing turning onto oneways at the end of a road (e.g. onto dual carriageways)
-      - Adds new instruction types at the exit of roundabouts and rotaries `exit roundabout` and `exit rotary`.
-    - HTTP:
-      - New query parameter for route/table/match/trip plugings:
-        `exclude=` that can be used to exclude certain classes (e.g. exclude=motorway, exclude=toll).
-        This is configurable in the profile.
-    - NodeJS:
-      - New query option `exclude` for the route/table/match/trip plugins. (e.g. `exclude: ["motorway", "toll"]`)
-    - Profile:
-      - New property for profile table: `excludable` that can be used to configure which classes are excludable at query time.
-      - New optional property for profile table: `classes` that allows you to specify which classes you expect to be used.
-        We recommend this for better error messages around classes, otherwise the possible class names are infered automatically.
-    - Traffic:
-      - If traffic data files contain an empty 4th column, they will update edge durations but not modify the edge weight.  This is useful for
-        updating ETAs returned, without changing route selection (for example, in a distance-based profile with traffic data loaded).
-    - Infrastructure:
-      - New file `.osrm.cell_metrics` created by `osrm-customize`.
-    - Debug tiles:
-      - Added new properties `type` and `modifier` to `turns` layer, useful for viewing guidance calculated turn types on the map
-
-# 5.11.0
-  - Changes from 5.10:
-    - Features
-      - BREAKING: Added support for conditional via-way restrictions. This features changes the file format of osrm.restrictions and requires re-extraction
-    - Internals
-      - BREAKING: Traffic signals will no longer be represented as turns internally. This requires re-processing of data but enables via-way turn restrictions across highway=traffic_signals
-      - Additional checks for empty segments when loading traffic data files
-      - Tunes the constants for turns in sharp curves just a tiny bit to circumvent a mix-up in fork directions at a specific intersection (https://github.com/Project-OSRM/osrm-backend/issues/4331)
-    - Infrastructure
-      - Refactor datafacade to make implementing additional DataFacades simpler
-    - Bugfixes
-      - API docs are now buildable again
-      - Suppress unnecessary extra turn instruction when exiting a motorway via a motorway_link onto a primary road (https://github.com/Project-OSRM/osrm-backend/issues/4348 scenario 4)
-      - Suppress unnecessary extra turn instruction when taking a tertiary_link road from a teritary onto a residential road (https://github.com/Project-OSRM/osrm-backend/issues/4348 scenario 2)
-      - Various MSVC++ build environment fixes
-      - Avoid a bug that crashes GCC6
-      - Re-include .npmignore to slim down published modules
-      - Fix a pre-processing bug where incorrect directions could be issued when two turns would have similar instructions and we tried to give them distinct values (https://github.com/Project-OSRM/osrm-backend/pull/4375)
-      - The entry bearing for correct the cardinality of a direction value (https://github.com/Project-OSRM/osrm-backend/pull/4353
-      - Change timezones in West Africa to the WAT zone so they're recognized on the Windows platform
-
 # 5.10.0
  - Changes from 5.9:
    - Profiles:
@@ -169,7 +18,7 @@
    - Bugfixes
      - Properly save/retrieve datasource annotations for road segments ([#4346](https://github.com/Project-OSRM/osrm-backend/issues/4346)
      - Fix conditional restriction grammer parsing so it works for single-day-of-week restrictions ([#4357](https://github.com/Project-OSRM/osrm-backend/pull/4357))
-    - Algorithm
+    - Algorithm)
      - BREAKING: the file format requires re-processing due to the changes on via-ways
      - Added support for via-way restrictions

@@ -31,13 +31,12 @@ option(ENABLE_LTO "Use LTO if available" OFF)
 option(ENABLE_FUZZING "Fuzz testing using LLVM's libFuzzer" OFF)
 option(ENABLE_GOLD_LINKER "Use GNU gold linker if available" ON)
 option(ENABLE_NODE_BINDINGS "Build NodeJs bindings" OFF)
-option(ENABLE_GLIBC_WORKAROUND "Workaround GLIBC symbol exports" OFF)

 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

 if(ENABLE_MASON)
  # versions in use
-  set(MASON_BOOST_VERSION "1.65.1")
+  set(MASON_BOOST_VERSION "1.63.0")
  set(MASON_STXXL_VERSION "1.4.1-1")
  set(MASON_EXPAT_VERSION "2.2.0")
  set(MASON_LUA_VERSION "5.2.4")
@@ -61,8 +60,8 @@ if (POLICY CMP0048)
 endif()
 project(OSRM C CXX)
 set(OSRM_VERSION_MAJOR 5)
-set(OSRM_VERSION_MINOR 15)
-set(OSRM_VERSION_PATCH 1)
+set(OSRM_VERSION_MINOR 10)
+set(OSRM_VERSION_PATCH 0)
 set(OSRM_VERSION "${OSRM_VERSION_MAJOR}.${OSRM_VERSION_MINOR}.${OSRM_VERSION_PATCH}")

 add_definitions(-DOSRM_PROJECT_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
@@ -103,11 +102,11 @@ if(WIN32 AND MSVC_VERSION LESS 1900)
 endif()

 # Strictly require GCC>=4.9 and Clang>=3.4 - GCC 4.8 is already too old for C++14.
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
    message(FATAL_ERROR "GCC>=4.9 required. In case you are on Ubuntu upgrade via ppa:ubuntu-toolchain-r/test")
  endif()
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
    message(FATAL_ERROR "Clang>=3.4 required. In case you are on Ubuntu upgrade via http://apt.llvm.org")
  endif()
@@ -183,7 +182,7 @@ endif()

 # Disable LTO when mason+gcc is detected before testing for / setting any flags.
 # Mason builds libraries with Clang, mixing does not work in the context of lto.
-if(ENABLE_MASON AND CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND ENABLE_LTO)
+if(ENABLE_MASON AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND ENABLE_LTO)
  set(ENABLE_LTO OFF)
  message(WARNING "Mason and GCC's LTO not work together. Disabling LTO.")
 endif()
@@ -212,19 +211,19 @@ endif()
 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()
+  endif()
 endif()

-if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fno-inline -fno-omit-frame-pointer")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-inline -fno-omit-frame-pointer")
-endif()
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-  set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ggdb")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og -ggdb")
-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")
  # Check if LTO is available
@@ -233,7 +232,7 @@ if(CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES MinRelSize OR CM
  if(ENABLE_LTO AND LTO_AVAILABLE)
    set(OLD_CXX_FLAGS ${CMAKE_CXX_FLAGS})
    # GCC in addition allows parallelizing LTO
-    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
      include(ProcessorCount)
      ProcessorCount(NPROC)
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto=${NPROC}")
@@ -256,7 +255,7 @@ if(CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES MinRelSize OR CM
    endif()

    # Since gcc 4.9 the LTO format is non-standart ('slim'), so we need to use the build-in tools
-    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
        NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0" AND NOT MINGW)
      find_program(GCC_AR gcc-ar)
      find_program(GCC_RANLIB gcc-ranlib)
@@ -272,7 +271,7 @@ if(CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES MinRelSize OR CM
    endif()

    # Same for clang LTO requires their own toolchain
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
      find_program(LLVM_AR llvm-ar)
      find_program(LLVM_RANLIB llvm-ranlib)
      if ("${LLVM_AR}" STREQUAL "LLVM_AR-NOTFOUND" OR "${LLVM_RANLIB}" STREQUAL "LLVM_RANLIB-NOTFOUND")
@@ -286,7 +285,7 @@ if(CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES MinRelSize OR CM
      endif()
    endif()

-    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0")
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0")
      message(STATUS "Disabling LTO on GCC < 4.9.0 since it is broken, see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57038")
      set(CMAKE_CXX_FLAGS "${OLD_CXX_FLAGS}")
      set(ENABLE_LTO Off)
@@ -304,11 +303,10 @@ if (ENABLE_COVERAGE)
  if (NOT CMAKE_BUILD_TYPE MATCHES "Debug")
    message(ERROR "ENABLE_COVERAGE=ON only make sense with a Debug build")
  endif()
-  message(STATUS "Enabling coverage")
+  message(INFO "Enabling coverage")
  set(MAYBE_COVERAGE_LIBRARIES "-lgcov")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ftest-coverage -fprofile-arcs")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs")
 endif()
-
 if (ENABLE_SANITIZER)
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
  set(OSRM_CXXFLAGS "${OSRM_CXXFLAGS} -fsanitize=address")
@@ -317,9 +315,9 @@ if (ENABLE_SANITIZER)
 endif()

 # Configuring compilers
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+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 -ftemplate-depth=1024 -Wno-unused-command-line-argument")
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
  set(COLOR_FLAG "-fdiagnostics-color=auto")
  check_cxx_compiler_flag("-fdiagnostics-color=auto" HAS_COLOR_FLAG)
  if(NOT HAS_COLOR_FLAG)
@@ -339,14 +337,13 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
  endif()

-elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
  # using Intel C++
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-intel -wd10237 -Wall -ipo -fPIC")
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
  # using Visual Studio C++
  set(BOOST_COMPONENTS ${BOOST_COMPONENTS} zlib)
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # avoid compiler error C1128 from scripting_environment_lua.cpp
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32_LEAN_AND_MEAN") # avoid compiler error C2011 from dual #include of winsock.h and winsock2.h
  add_dependency_defines(-DBOOST_LIB_DIAGNOSTIC)
  add_dependency_defines(-D_CRT_SECURE_NO_WARNINGS)
  add_dependency_defines(-DNOMINMAX) # avoid min and max macros that can break compilation
@@ -362,7 +359,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 MATCHES "MSVC" OR "${LD_AVOID_GC_SECTIONS}"))
+  if(NOT (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC" OR "${LD_AVOID_GC_SECTIONS}"))
    # 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
@@ -380,9 +377,9 @@ 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
-if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-  set(OSRM_CXXFLAGS "${OSRM_CXXFLAGS} -std=c++14")
+if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
+  set(OSRM_CXXFLAGS "${OSRM_CXXFLAGS} -std=c++1y")
 endif()

 # Configuring other platform dependencies
@@ -470,7 +467,7 @@ if(ENABLE_MASON)
    install(FILES ${TBBGlob} DESTINATION lib)
  endforeach()
  if(APPLE)
-    set(LINKER_FLAGS "${TBB_LINKER_RPATHS} -Wl,-rpath -Wl,@loader_path")
+    set(LINKER_FLAGS "${TBB_LINKER_RPATHS} -Wl,-rpath -Wl,@executable_path")
  elseif(UNIX)
    set(LINKER_FLAGS "${TBB_LINKER_RPATHS} '-Wl,-rpath,$ORIGIN' -Wl,-z,origin")
  endif()
@@ -519,10 +516,29 @@ else()
  find_package(BZip2 REQUIRED)
  add_dependency_includes(${BZIP2_INCLUDE_DIR})

-  find_package(Lua 5.2 REQUIRED)
-  if (LUA_FOUND)
-    message(STATUS "Using Lua ${LUA_VERSION_STRING}")
-  endif()
+  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()
+  ENDIF()

  set(USED_LUA_LIBRARIES ${LUA_LIBRARIES})
  add_dependency_includes(${LUA_INCLUDE_DIR})
@@ -552,7 +568,7 @@ else()
 endif()

 # prefix compilation with ccache by default if available and on clang or gcc
-if(ENABLE_CCACHE AND (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"))
+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")
@@ -675,10 +691,10 @@ set(UTIL_LIBRARIES
 # Libraries
 target_link_libraries(osrm ${ENGINE_LIBRARIES})
 target_link_libraries(osrm_update ${UPDATER_LIBRARIES})
-target_link_libraries(osrm_contract ${CONTRACTOR_LIBRARIES} osrm_update osrm_store)
+target_link_libraries(osrm_contract ${CONTRACTOR_LIBRARIES} osrm_update)
 target_link_libraries(osrm_extract ${EXTRACTOR_LIBRARIES})
 target_link_libraries(osrm_partition ${PARTITIONER_LIBRARIES})
-target_link_libraries(osrm_customize ${CUSTOMIZER_LIBRARIES} osrm_update osrm_store)
+target_link_libraries(osrm_customize ${CUSTOMIZER_LIBRARIES} osrm_update)
 target_link_libraries(osrm_store ${STORAGE_LIBRARIES})

 # BUILD_COMPONENTS
@@ -721,7 +737,7 @@ file(GLOB VariantGlob third_party/variant/include/mapbox/*.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/approach.hpp include/engine/phantom_node.hpp)
-set(UtilHeader include/util/coordinate.hpp include/util/json_container.hpp include/util/typedefs.hpp include/util/alias.hpp include/util/exception.hpp include/util/bearing.hpp)
+set(UtilHeader include/util/coordinate.hpp include/util/json_container.hpp include/util/typedefs.hpp include/util/alias.hpp include/util/exception.hpp)
 set(ExtractorHeader include/extractor/extractor.hpp include/storage/io_config.hpp include/extractor/extractor_config.hpp include/extractor/travel_mode.hpp)
 set(PartitionerHeader include/partition/partitioner.hpp include/partition/partition_config.hpp)
 set(ContractorHeader include/contractor/contractor.hpp include/contractor/contractor_config.hpp)
@@ -796,7 +812,7 @@ JOIN("-I${DEPENDENCIES_INCLUDE_DIRS}" " -I" PKGCONFIG_OSRM_INCLUDE_FLAGS)
 JOIN("${ENGINE_LIBRARIES}" " " PKGCONFIG_OSRM_DEPENDENT_LIBRARIES)

 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig.in libosrm.pc @ONLY)
-install(FILES ${PROJECT_BINARY_DIR}/libosrm.pc DESTINATION ${PKGCONFIG_LIBRARY_DIR}/pkgconfig)
+install(FILES ${PROJECT_BINARY_DIR}/libosrm.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

 # uninstall target
 configure_file(
@@ -812,10 +828,6 @@ add_custom_target(uninstall
 add_subdirectory(unit_tests)
 add_subdirectory(src/benchmarks)

-if (ENABLE_GLIBC_WORKAROUND)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGLIBC_WORKAROUND")
-endif()
-
 if (ENABLE_NODE_BINDINGS)
  add_subdirectory(src/nodejs)
 endif()
@@ -1,3 +0,0 @@
-# Code of conduct
-
-Everyone is invited to participate in Project OSRM’s open source projects and public discussions: we want to create a welcoming and friendly environment. Harassment of participants or other unethical and unprofessional behavior will not be tolerated in our spaces. The [Contributor Covenant](http://contributor-covenant.org) applies to all projects under the Project-OSRM organization and we ask that you please read [the full text](http://contributor-covenant.org/version/1/2/0/).
@@ -1,12 +1,8 @@
-# Everyone
-
-Please take some time to review our [code of conduct](CODE-OF-CONDUCT.md) to help guide your interactions with others on this project.
-
 # User

 Before you open a new issue, please search for older ones that cover the same issue.
 In general "me too" comments/issues are frowned upon.
-You can add a :+1: emoji reaction to the issue if you want to express interest in this.
+You can add a :+1: emoji to the issue if you want to express interest in this.

 # Developer

@@ -22,7 +18,7 @@ if [ x"$remote" = xorigin  ] ; then
        echo "Rejected push to $remote/master" ; exit 1
    fi

-    ./scripts/format.sh && ./scripts/error_on_dirty.sh
+    ./scripts/format.sh
    if [ $? -ne 0 ] ; then
        echo "Unstaged format changes" ; exit 1
    fi
@@ -1,4 +1,4 @@
-Copyright (c) 2017, Project OSRM contributors
+Copyright (c) 2016, Project OSRM contributors
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification,
@@ -19,6 +19,7 @@ To quickly try OSRM use our [demo server](http://map.project-osrm.org) which com
 For a quick introduction about how the road network is represented in OpenStreetMap and how to map specific road network features have a look at [this guide about mapping for navigation](https://www.mapbox.com/mapping/mapping-for-navigation/).

 Related [Project-OSRM](https://github.com/Project-OSRM) repositories:
+- [node-osrm](https://www.npmjs.com/package/osrm) - Production-ready NodeJs bindings for the routing engine
 - [osrm-frontend](https://github.com/Project-OSRM/osrm-frontend) - User-facing frontend with map. The demo server runs this on top of the backend
 - [osrm-text-instructions](https://github.com/Project-OSRM/osrm-text-instructions) - Text instructions from OSRM route response
 - [osrm-backend-docker](https://hub.docker.com/r/osrm/osrm-backend/) - Ready to use Docker images
@@ -40,14 +41,6 @@ Related [Project-OSRM](https://github.com/Project-OSRM) repositories:

 The easiest and quickest way to setup your own routing engine is to use Docker images we provide.

-There are two pre-processing pipelines available:
- Contraction Hierarchies (CH)
- Multi-Level Dijkstra (MLD)
-
-we recommend using MLD by default except for special use-cases such as very large distance matrices where CH is still a better fit for the time being.
-In the following we explain the MLD pipeline.
-If you want to use the CH pipeline instead replace `osrm-partition` and `osrm-customize` with a single `osrm-contract` and change the algorithm option for `osrm-routed` to `--algorithm ch`.
-
 ### Using Docker

 We base our Docker images ([backend](https://hub.docker.com/r/osrm/osrm-backend/), [frontend](https://hub.docker.com/r/osrm/osrm-frontend/)) on Alpine Linux and make sure they are as lightweight as possible.
@@ -59,10 +52,9 @@ Download OpenStreetMap extracts for example from [Geofabrik](http://download.geo
 Pre-process the extract with the car profile and start a routing engine HTTP server on port 5000

    docker run -t -v $(pwd):/data osrm/osrm-backend osrm-extract -p /opt/car.lua /data/berlin-latest.osm.pbf
-    docker run -t -v $(pwd):/data osrm/osrm-backend osrm-partition /data/berlin-latest.osrm
-    docker run -t -v $(pwd):/data osrm/osrm-backend osrm-customize /data/berlin-latest.osrm
+    docker run -t -v $(pwd):/data osrm/osrm-backend osrm-contract /data/berlin-latest.osrm

-    docker run -t -i -p 5000:5000 -v $(pwd):/data osrm/osrm-backend osrm-routed --algorithm mld /data/berlin-latest.osrm
+    docker run -t -i -p 5000:5000 -v $(pwd):/data osrm/osrm-backend osrm-routed /data/berlin-latest.osrm

 Make requests against the HTTP server

@@ -98,8 +90,8 @@ Install dependencies

 ```bash
 sudo apt install build-essential git cmake pkg-config \
-libbz2-dev libxml2-dev libzip-dev libboost-all-dev \
-lua5.2 liblua5.2-dev libtbb-dev
+libbz2-dev libstxxl-dev libstxxl1v5 libxml2-dev \
+libzip-dev libboost-all-dev lua5.2 liblua5.2-dev libtbb-dev
 ```

 Compile and install OSRM binaries
@@ -112,10 +104,29 @@ cmake --build .
 sudo cmake --build . --target install
 ```

+Grab a `.osm.pbf` extract from [Geofabrik](http://download.geofabrik.de/index.html) or [Mapzen's Metro Extracts](https://mapzen.com/data/metro-extracts/)
+
+```bash
+wget http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf
+```
+
+Pre-process the extract and start the HTTP server
+
+```
+osrm-extract berlin-latest.osm.pbf -p profiles/car.lua
+osrm-contract berlin-latest.osrm
+osrm-routed berlin-latest.osrm
+```
+
+Running Queries
+
+```
+curl "http://127.0.0.1:5000/route/v1/driving/13.388860,52.517037;13.385983,52.496891?steps=true"
+```
+
 ### Request Against the Demo Server

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

 ```
@@ -146,9 +157,7 @@ which will check and use pre-built binaries if they're available for this releas

 to always force building the Node.js bindings from source.

-For usage details have a look [these API docs](docs/nodejs/api.md). 
-
-An exemplary implementation by a 3rd party with Docker and Node.js can be found [here](https://github.com/door2door-io/osrm-express-server-demo).
+For usage details have a look [these API docs](docs/nodejs/api.md).


 ## References in publications
@@ -7,22 +7,19 @@ ECHO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 SET PROJECT_DIR=%CD%
 ECHO PROJECT_DIR^: %PROJECT_DIR%
 ECHO NUMBER_OF_PROCESSORS^: %NUMBER_OF_PROCESSORS%
-
-
-:: Check CMake version
-SET CMAKE_VERSION=3.9.2
-SET PATH=%PROJECT_DIR%\cmake-%CMAKE_VERSION%-win32-x86\bin;%PATH%
 ECHO cmake^: && cmake --version
 IF %ERRORLEVEL% NEQ 0 ECHO CMAKE not found && GOTO CMAKE_NOT_OK

-cmake --version | findstr /C:%CMAKE_VERSION% && GOTO CMAKE_OK
+cmake --version | findstr /C:"3.7.1" && GOTO CMAKE_OK

 :CMAKE_NOT_OK
+SET CMAKE_VERSION=3.7.1
 ECHO CMAKE NOT OK - downloading new CMake %CMAKE_VERSION%
-powershell Invoke-WebRequest https://cmake.org/files/v3.9/cmake-%CMAKE_VERSION%-win32-x86.zip -OutFile $env:PROJECT_DIR\cm.zip
+IF NOT EXIST cm.zip powershell Invoke-WebRequest https://cmake.org/files/v3.7/cmake-%CMAKE_VERSION%-win32-x86.zip -OutFile $env:PROJECT_DIR\cm.zip
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 IF NOT EXIST cmake-%CMAKE_VERSION%-win32-x86 7z -y x cm.zip | %windir%\system32\FIND "ing archive"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+SET PATH=%PROJECT_DIR%\cmake-%CMAKE_VERSION%-win32-x86\bin;%PATH%

 :CMAKE_OK
 ECHO CMAKE_OK
@@ -40,7 +37,7 @@ ECHO msbuild version
 msbuild /version

 :: HARDCODE "x64" as it is uppercase on AppVeyor and download from S3 is case sensitive
-SET DEPSPKG=osrm-deps-win-x64-14.0-2017.09.7z
+SET DEPSPKG=osrm-deps-win-x64-14.0.7z

 :: local development
 ECHO.
@@ -36,8 +36,6 @@
 # This is because, the lua location is not standardized and may exist in
 # locations other than lua/

-include(FindPkgConfig)
-
 unset(_lua_include_subdirs)
 unset(_lua_library_names)
 unset(_lua_append_versions)
@@ -83,16 +81,11 @@ function(_lua_set_version_vars)
             lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
             lua.${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
        )
-        pkg_check_modules(LUA QUIET "lua${ver}")
-        list(APPEND _lua_include_subdirs ${LUA_INCLUDE_DIRS})
-        list(APPEND _lua_library_names ${LUA_LIBRARIES})
-        list(APPEND _lua_library_dirs ${LUA_LIBRARY_DIRS})
    endforeach ()

    set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
    set(_lua_library_names "${_lua_library_names}" PARENT_SCOPE)
    set(_lua_append_versions "${_lua_append_versions}" PARENT_SCOPE)
-    set(_lua_library_dirs "${_lua_library_dirs}" PARENT_SCOPE)
 endfunction(_lua_set_version_vars)

 function(_lua_check_header_version _hdr_file)
@@ -165,7 +158,6 @@ find_library(LUA_LIBRARY
    ENV LUA_DIR
  PATH_SUFFIXES lib
  PATHS
-  ${_lua_library_dirs}
  ~/Library/Frameworks
  /Library/Frameworks
  /sw
@@ -4,7 +4,7 @@ libdir=@PKGCONFIG_LIBRARY_DIR@

 Name: libOSRM
 Description: Project OSRM library
-Version: @OSRM_VERSION@
+Version: v@OSRM_VERSION@
 Requires:
 Libs: -L${libdir} -losrm @PKGCONFIG_OSRM_LDFLAGS@
 Libs.private: @PKGCONFIG_OSRM_DEPENDENT_LIBRARIES@
@@ -1,7 +1,7 @@
 module.exports = {
-    default: '--strict --tags ~@stress --tags ~@todo --tags ~@mld-only --require features/support --require features/step_definitions',
-    verify: '--strict --tags ~@stress --tags ~@todo --tags ~@mld-only -f progress --require features/support --require features/step_definitions',
+    default: '--strict --tags ~@stress --tags ~@todo --require features/support --require features/step_definitions',
+    verify: '--strict --tags ~@stress --tags ~@todo -f progress --require features/support --require features/step_definitions',
    todo: '--strict --tags @todo --require features/support --require features/step_definitions',
    all: '--strict --require features/support --require features/step_definitions',
-    mld: '--strict --tags ~@stress --tags ~@todo --require features/support --require features/step_definitions -f progress'
-};
+    mld: '--strict --tags ~@stress --tags ~@todo --tags ~@alternative --require features/support --require features/step_definitions -f progress'
+}
@@ -1,20 +1,34 @@
-FROM alpine:3.6 as buildstage
+FROM alpine:3.5

-ARG DOCKER_TAG
-RUN mkdir -p /src  && mkdir -p /opt
-COPY . /src
-WORKDIR /src
+RUN mkdir /opt
+WORKDIR /opt

 RUN NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
    echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
    apk update && \
    apk upgrade && \
-    apk add git cmake wget make libc-dev gcc g++ bzip2-dev boost-dev zlib-dev expat-dev lua5.2-dev libtbb@testing libtbb-dev@testing && \
-    NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
+    apk add git cmake wget make libc-dev gcc g++ bzip2-dev boost-dev zlib-dev expat-dev lua5.1-dev libtbb@testing libtbb-dev@testing && \
+    \
+    echo "Building libstxxl" && \
+    cd /opt && \
+    git clone --depth 1 --branch 1.4.1 https://github.com/stxxl/stxxl.git && \
+    cd stxxl && \
+    mkdir build && \
+    cd build && \
+    cmake -DCMAKE_BUILD_TYPE=Release .. && \
+    make -j${NPROC} && \
+    make install
+
+ARG DOCKER_TAG
+RUN mkdir /src
+COPY . /src
+WORKDIR /src
+
+RUN NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
    echo "Building OSRM ${DOCKER_TAG}" && \
    git show --format="%H" | head -n1 > /opt/OSRM_GITSHA && \
    echo "Building OSRM gitsha $(cat /opt/OSRM_GITSHA)" && \
-    mkdir -p build && \
+    mkdir build && \
    cd build && \
    BUILD_TYPE="Release" && \
    ENABLE_ASSERTIONS="Off" && \
@@ -27,19 +41,13 @@ RUN NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
    cd ../profiles && \
    cp -r * /opt && \
    \
+    echo "Cleaning up" && \
    strip /usr/local/bin/* && \
-    rm -rf /src /usr/local/lib/libosrm*
-
-
-# Multistage build to reduce image size - https://docs.docker.com/engine/userguide/eng-image/multistage-build/#use-multi-stage-builds
-# Only the content below ends up in the image, this helps remove /src from the image (which is large)
-FROM alpine:3.6 as runstage
-RUN mkdir -p /src  && mkdir -p /opt
-RUN echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
-    apk update && \
-    apk add boost-filesystem boost-program_options boost-regex boost-iostreams boost-thread libgomp lua5.2 expat libtbb@testing
-COPY --from=buildstage /usr/local /usr/local
-COPY --from=buildstage /opt /opt
-WORKDIR /opt
+    rm /usr/local/lib/libstxxl* && \
+    cd /opt && \
+    apk del boost-dev && \
+    apk del g++ cmake libc-dev expat-dev zlib-dev bzip2-dev lua5.1-dev git make gcc && \
+    apk add boost-filesystem boost-program_options boost-regex boost-iostreams boost-thread libgomp lua5.1 expat && \
+    rm -rf /src /opt/stxxl /usr/local/bin/stxxl_tool /usr/local/lib/libosrm*

 EXPOSE 5000
@@ -20,7 +20,7 @@ A guard (ScopedGeojsonLoggerGuard) requires a logging policy. Per default we pro

 The initialisation to do so looks like this:
 `util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString> geojson_guard( "debug.geojson", data-for-conversion);`
-Make sure to give the guard a name, so it actually gets a lifetime.
+Make sure to give the guar a name, so it actually gets a lifetime.

 The field `data-for-conversion` can be an arbitrary long set of features and needs to match the parameters used for constructing our policy (in this case `util::NodeIdVectorToLineString`).

@@ -31,7 +31,6 @@ To pass parameters to each location some options support an array like encoding:
 |generate\_hints |`true` (default), `false`                               |Adds a Hint to the response which can be used in subsequent requests, see `hints` parameter.           |
 |hints           |`{hint};{hint}[;{hint} ...]`                            |Hint from previous request to derive position in street network.                                       |
 |approaches      |`{approach};{approach}[;{approach} ...]`                |Keep waypoints on curb side.                                                                           |
-|exclude         |`{class}[,{class}]`                                     |Additive list of classes to avoid, order does not matter.                                              |

 Where the elements follow the following format:

@@ -41,13 +40,12 @@ Where the elements follow the following format:
 |radius      |`double >= 0` or `unlimited` (default)                  |
 |hint        |Base64 `string`                                         |
 |approach    |`curb` or `unrestricted` (default)                      |
-|class       |A class name determined by the profile or `none`.       |

 ```
 {option}={element};{element}[;{element} ... ]
 ```

-The number of elements must match exactly the number of locations (except for `generate_hints` and `exclude`). If you don't want to pass a value but instead use the default you can pass an empty `element`.
+The number of elements must match exactly the number of locations. If you don't want to pass a value but instead use the default you can pass an empty `element`.

 Example: 2nd location use the default value for `option`:

@@ -61,9 +59,6 @@ Example: 2nd location use the default value for `option`:
 # Query on Berlin with three coordinates:
 curl 'http://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219?overview=false'

-# Query on Berlin excluding the usage of motorways:
-curl 'http://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.397634,52.529407?exclude=motorway'
-
 # Using polyline:
 curl 'http://router.project-osrm.org/route/v1/driving/polyline(ofp_Ik_vpAilAyu@te@g`E)?overview=false'
 ```
@@ -288,7 +283,6 @@ In addition to the [general options](#general-options) the following options are
 |radiuses    |`{radius};{radius}[;{radius} ...]`              |Standard deviation of GPS precision used for map matching. If applicable use GPS accuracy.|
 |gaps        |`split` (default), `ignore`                     |Allows the input track splitting based on huge timestamp gaps between points.             |
 |tidy        |`true`, `false` (default)                       |Allows the input track modification to obtain better matching quality for noisy tracks.   |
-|waypoints   | `{index};{index};{index}...`                   |Treats input coordinates indicated by given indices as waypoints in returned Match object. Default is to treat all input coordinates as waypoints.    |

 |Parameter   |Values                             |
 |------------|-----------------------------------|
@@ -438,8 +432,6 @@ Vector tiles contain two layers:
 | `turn_angle` | `integer` | the angle of the turn, relative to the `bearing_in`.  -180 to +180, 0 = straight ahead, 90 = 90-degrees to the right |
 | `cost`       | `float`   | the time we think it takes to make that turn, in seconds.  May be negative, depending on how the data model is constructed (some turns get a "bonus"). |
 | `weight`     | `float`   | the weight we think it takes to make that turn.  May be negative, depending on how the data model is constructed (some turns get a "bonus"). ACTUAL ROUTING USES THIS VALUE |
-| `type`       | `string`  | the type of this turn - values like `turn`, `continue`, etc.  See the `StepManeuver` for a partial list, this field also exposes internal turn types that are never returned with an API response |
-| `modifier`   | `string`  | the direction modifier of the turn (`left`, `sharp left`, etc) |


 ## Result objects
@@ -587,7 +579,7 @@ step.

 - `name`: The name of the way along which travel proceeds.
 - `ref`: A reference number or code for the way. Optionally included, if ref data is available for the given way.
- `pronunciation`: A string containing an [IPA](https://en.wikipedia.org/wiki/International_Phonetic_Alphabet) phonetic transcription indicating how to pronounce the name in the `name` property. This property is omitted if pronunciation data is unavailable for the step.
+- `pronunciation`: The pronunciation hint of the way name. Will be `undefined` if there is no pronunciation hit.
 - `destinations`: The destinations of the way. Will be `undefined` if there are no destinations.
 - `exits`: The exit numbers or names of the way. Will be `undefined` if there are no exit numbers or names.
 - `mode`: A string signifying the mode of transportation.
@@ -595,7 +587,6 @@ step.
 - `intersections`: A list of `Intersection` objects that are passed along the segment, the very first belonging to the StepManeuver
 - `rotary_name`: The name for the rotary. Optionally included, if the step is a rotary and a rotary name is available.
 - `rotary_pronunciation`: The pronunciation hint of the rotary name. Optionally included, if the step is a rotary and a rotary pronunciation is available.
- `driving_side`: The legal driving side at the location for this step.  Either `left` or `right`.

 #### Example

@@ -666,12 +657,10 @@ step.
 | `end of road`    | road ends in a T intersection turn in direction of `modifier`|
 | `use lane`       | **Deprecated** replaced by lanes on all intersection entries |
 | `continue`       | Turn in direction of `modifier` to stay on the same road     |
-| `roundabout`     | traverse roundabout, if the route leaves the roundabout there will be an additional property `exit` for exit counting. The modifier specifies the direction of entering the roundabout. |
+| `roundabout`     | traverse roundabout, has additional property `exit` with NR if the roundabout is left. The modifier specifies the direction of entering the roundabout. |
 | `rotary`         | a traffic circle. While very similar to a larger version of a roundabout, it does not necessarily follow roundabout rules for right of way. It can offer `rotary_name` and/or `rotary_pronunciation` parameters (located in the RouteStep object) in addition to the `exit` parameter (located on the StepManeuver object).  |
 | `roundabout turn`| Describes a turn at a small roundabout that should be treated as normal turn. The `modifier` indicates the turn direciton. Example instruction: `At the roundabout turn left`. |
 | `notification`   | not an actual turn but a change in the driving conditions. For example the travel mode or classes. If the road takes a turn itself, the `modifier` describes the direction |
-| `exit roundabout`| Describes a maneuver exiting a roundabout (usually preceeded by a `roundabout` instruction) |
-| `exit rotary`    | Describes the maneuver exiting a rotary (large named roundabout) |

  Please note that even though there are `new name` and `notification` instructions, the `mode` and `name` can change
  between all instructions. They only offer a fallback in case nothing else is to report.
@@ -6,7 +6,7 @@ OSRM supports "profiles". Profiles representing routing behavior for different t
 ## Available profiles
 Out-of-the-box OSRM comes with profiles for car, bicycle and foot. You can easily modify these or create new ones if you like.

-Profiles have a 'lua' extension, and are placed in 'profiles' directory.
+Profiles have a 'lua' extension, and are places in 'profiles' directory.

 When running OSRM preprocessing commands you specify the profile with the --profile (or the shorthand -p) option, for example:

@@ -17,8 +17,8 @@ It's important to understand that profiles are used when preprocessing the OSM d

 This means that after modifying a profile **you will need to extract, contract and reload the data again** and to see changes in the routing results. See [Processing Flow](https://github.com/Project-OSRM/osrm-backend/wiki/Processing-Flow) for more.

-## Profiles are written in Lua
-Profiles are not just configuration files. They are scripts written in the [Lua scripting language](http://www.lua.org). The reason for this is that OpenStreetMap data is complex, and it's not possible to simply define tag mappings. Lua scripting offers a powerful way to handle all the possible tag combinations found in OpenStreetMap nodes and ways.
+## Profiles are written in LUA
+Profiles are not just configuration files. They are scripts written in the [LUA scripting language](http://www.lua.org). The reason for this is that OpenStreetMap data is complex, and it's not possible to simply define tag mappings. LUA scripting offers a powerful way to handle all the possible tag combinations found in OpenStreetMap nodes and ways.

 ## Basic structure of profiles
 A profile will process every node and way in the OSM input data to determine what ways are routable in which direction, at what speed, etc.
@@ -35,40 +35,40 @@ A profile can also define various local functions it needs.

 Looking at [car.lua](../profiles/car.lua) as an example, at the top of the file the api version is defined and then required library files are included.

-Then follows the `setup` function, which is called once when the profile is loaded. It returns a big hash table of configurations, specifying things like what speed to use for different way types. The configurations are used later in the various processing functions. Many adjustments can be done just by modifying this configuration table.
+Then follows the `setup` functions, which is called once when the profile is loaded. It returns a big hash table of configurations, specifying things like what speed to use for different way types. The configurations are used later in the various processing functions. Many adjustments can be done just be modifying this configuration table.

-The setup function is also where you can do other setup, like loading an elevation data source if you want to consider that when processing ways.
+The setup function is also where you can do other setup, like loading elevation data source if you want to consider that when processing ways.

-Then come the `process_node` and `process_way` functions, which are called for each OSM node and way when extracting OpenStreetMap data with `osrm-extract`.
+Then comes the `process_node` and `process_way` functions, which are called for each OSM node and way when extracting OpenStreetMap data with `osrm-extract`.

 The `process_turn` function processes every possible turn in the network, and sets a penalty depending on the angle and turn of the movement.

 Profiles can also define a `process_segment` function to handle differences in speed along an OSM way, for example to handle elevation. As you can see, this is not currently used in the car profile.

-At the end of the file, a table is returned with references to the setup and processing functions the profile has defined.
+At the end of the file, a table if returned with references to the setup and processing functions the profile has defined.

-## Understanding speed, weight and rate
-When computing a route from A to B there can be different measures of what is the best route. That's why there's a need for different profiles.
+## Understanding speed, weight and rate 
+When computing a route from A to B there can be different measure of what is the best route. That's why there's a need for different profiles.

-Because speeds vary on different types of roads, the shortest and the fastest route are typically different. But there are many other possible preferences. For example a user might prefer a bicycle route that follow parks or other green areas, even though both duration and distance are a bit longer.
+Because speeds very on different types of roads, the shortest and the fastest route are typically different. But there are many other possible preferences. For example a user might prefer a bicycle route that follow parks or other green areas, even though both duration and distance are a bit longer.

-To handle this, OSRM doesn't simply choose the ways with the highest speed. Instead it uses the concepts of `weight` and `rate`. The rate is an abstract measure that you can assign to ways as you like to make some ways preferable to others. Routing will prefer ways with high rate.
+To handle this, OSRM doesn't simply choose the ways with the highest speed. Instead it uses the concept of `weight` and `rate`. The rate is an abstract measure that you can assign to  ways as you like to make some ways preferable to others. Routing will prefer ways with high rate.

-The weight of a way is normally computed as length / rate. The weight can be thought of as the resistance or cost when passing the way. Routing will prefer ways with low weight.
+The weight of a way normally computed as length / rate. The weight can be thought of as the resistance or cost when passing the way. Routing will prefer ways with low weight.

-You can also set the weight of a way to a fixed value. In this case it's not calculated based on the length or rate, and the rate is ignored.
+You can also set the weight of a way to a fixed value, In this case it's not calculated based on the length or rate, and the rate is ignored.

-You should set the speed to your best estimate of the actual speed that will be used on a particular way. This will result in the best estimated travel times.
+You should set the speed to you best estimate of the actual speed that will be used on a particular way. This will result in the best estimated travel times.

-If you want to prefer certain ways due to other factors than the speed, adjust the rate accordingly. If you adjust the speed, the time estimation will be skewed.
+If you want to prefer certain ways due to other factors than the speed, adjust the rate accordingly. If you adjust the speed, the time time estimation will be skewed.

 If you set the same rate on all ways, the result will be shortest path routing.
 If you set rate = speed on all ways, the result will be fastest path routing.
-If you want to prioritize certain streets, increase the rate on these.
+If you want to prioritize certain street, increase the rate on these.

 ## Elements
 ### api_version
-A profile should set `api_version` at the top of your profile. This is done to ensure that older profiles are still supported when the api changes. If `api_version` is not defined, 0 will be assumed. The current api version is 2.
+A profile should set api_version at the top of your profile. This is done to ensure that older profiles are still supported when the api changes. If api_version is not defined, 0 will be assumed. The current api version is 2.

 ### Library files
 The folder [profiles/lib/](../profiles/lib/) contains LUA library files for handling many common processing tasks.
@@ -81,17 +81,17 @@ set.lua           | Defines the Set helper for handling sets of values
 sequence.lua      | Defines the Sequence helper for handling sequences of values
 access.lua        | Function for finding relevant access tags
 destination.lua   | Function for finding relevant destination tags
-maxspeed.lua      | Function for determining maximum speed
+destination.lua   | Function for determining maximum speed
 guidance.lua      | Function for processing guidance attributes

-They all return a table of functions when you use `require` to load them. You can either store this table and reference its functions later, or if you need only a single function you can store that directly.
+They all return a table of functions when you use `require` to load them. You can either store this table and reference it's functions later, of if you need only a single you can store that directly.

 ### setup()
 The `setup` function is called once when the profile is loaded and must return a table of configurations. It's also where you can do other global setup, like loading data sources that are used during processing.

-Note that processing of data is parallelized and several unconnected LUA interpreters will be running at the same time. The `setup` function will be called once for each. Each LUA iinterpreter will have its own set of globals.
+Note that processing of data is parallelized and several unconnected LUA interpreters will be running at the same time. The `setup` function will be called once for each. Each LUA iinterpreter will have it's own set of globals.

-The following global properties can be set under `properties` in the hash you return in the `setup` function:
+The following global properties can be set under `properties` in the hash you return in the `setup` function: 

 Attribute                            | Type     | Notes
 -------------------------------------|----------|----------------------------------------------------------------------------
@@ -104,18 +104,7 @@ max_speed_for_map_matching           | Float    | Maximum vehicle speed to be as
 max_turn_weight                      | Float    | Maximum turn penalty weight
 force_split_edges                    | Boolean  | True value forces a split of forward and backward edges of extracted ways and guarantees that `process_segment` will be called for all segments (default `false`)

-
-The following additional global properties can be set in the hash you return in the `setup` function:
-
-Attribute                            | Type             | Notes
-------------------------------------|------------------|----------------------------------------------------------------------------
-excludable                           | Sequence of Sets | Determines which class-combinations are supported by the `exclude` option at query time. E.g. `Sequence{Set{"ferry", "motorway"}, Set{"motorway"}}` will allow you to exclude ferries and motorways, or only motorways.
-classes                              | Sequence         | Determines the allowed classes that can be referenced using `{forward,backward}_classes` on the way in the `process_way` function.
-restrictions                         | Sequence         | Determines which turn restrictions will be used for this profile.
-suffix_list                          | Set              | List of name suffixes needed for determining if "Highway 101 NW" the same road as "Highway 101 ES".
-relation_types                       | Sequence         | Determines wich relations should be cached for processing in this profile. It contains relations types
-
-### process_node(profile, node, result, relations)
+### process_node(profile, node, result)
 Process an OSM node to determine whether this node is a barrier or can be passed and whether passing it incurs a delay.

 Argument | Description
@@ -123,7 +112,6 @@ Argument | Description
 profile  | The configuration table you returned in `setup`.
 node     | The input node to process (read-only).
 result   | The output that you will modify.
-relations| Storage of relations to access relations, where `node` is a member.

 The following attributes can be set on `result`:

@@ -132,7 +120,7 @@ Attribute       | Type    | Notes
 barrier         | Boolean | Is it an impassable barrier?
 traffic_lights  | Boolean | Is it a traffic light (incurs delay in `process_turn`)?

-### process_way(profile, way, result, relations)
+## process_way(profile, way, result)
 Given an OpenStreetMap way, the `process_way` function will either return nothing (meaning we are not going to route over this way at all), or it will set up a result hash.

 Argument | Description
@@ -140,39 +128,36 @@ Argument | Description
 profile  | The configuration table you returned in `setup`.
 node     | The input way to process (read-only).
 result   | The output that you will modify.
-relations| Storage of relations to access relations, where `way` is a member.

 Importantly it will set `result.forward_mode` and `result.backward_mode` to indicate the travel mode in each direction, as well as set `result.forward_speed` and `result.backward_speed` to integer values representing the speed for traversing the way.

 It will also set a number of other attributes on `result`.

-Using the power of the scripting language you wouldn't typically see something as simple as a `result.forward_speed = 20` line within the `process_way` function. Instead `process_way` will examine the tag set on the way, process this information in various ways, calling other local functions and referencing the configuration in `profile`, etc., before arriving at the result.
+Using the power of the scripting language you wouldn't typically see something as simple as a `result.forward_speed = 20` line within the `process_way` function. Instead `process_way` will examine the tag set on the way, process this information in various ways, calling other local functions and referencing the configuration in `profile`, etc, before arriving at the result.

 The following attributes can be set on the result in `process_way`:

 Attribute                               | Type     | Notes
 ----------------------------------------|----------|--------------------------------------------------------------------------
 forward_speed                           | Float    | Speed on this way in km/h. Mandatory.
-backward_speed                          | Float    |  ""
+backward_speed                          | Float    |  "   "
 forward_rate                            | Float    | Routing weight, expressed as meters/*weight* (e.g. for a fastest-route weighting, you would want this to be meters/second, so set it to forward_speed/3.6)
-backward_rate                           | Float    |  ""
+backward_rate                           | Float    |  "   "
 forward_mode                            | Enum     | Mode of travel (e.g. `car`, `ferry`). Mandatory. Defined in `include/extractor/travel_mode.hpp`.
-backward_mode                           | Enum     |  ""
+backward_mode                           | Enum     |  "   "
 forward_classes                         | Table    | Mark this way as being of a specific class, e.g. `result.classes["toll"] = true`. This will be exposed in the API as `classes` on each `RouteStep`.
-backward_classes                        | Table    |  ""
+backward_classes                        | Table    |  "   "
 duration                                | Float    | Alternative setter for duration of the whole way in both directions
 weight                                  | Float    | Alternative setter for weight of the whole way in both directions
 turn_lanes_forward                      | String   | Directions for individual lanes (normalized OSM `turn:lanes` value)
-turn_lanes_backward                     | String   |  ""
+turn_lanes_backward                     | String   |  "   "
 forward_restricted                      | Boolean  | Is this a restricted access road? (e.g. private, or deliveries only; used to enable high turn penalty, so that way is only chosen for start/end of route)
-backward_restricted                     | Boolean  |  ""
+backward_restricted                     | Boolean  |  "   "
 is_startpoint                           | Boolean  | Can a journey start on this way? (e.g. ferry; if `false`, prevents snapping the start point to this way)
 roundabout                              | Boolean  | Is this part of a roundabout?
 circular                                | Boolean  | Is this part of a non-roundabout circular junction?
 name                                    | String   | Name of the way
-ref                                     | String   | Road number (equal to set `forward_ref` and `backward_ref` with one value)
-forward_ref                             | String   | Road number in forward way direction
-backward_ref                            | String   | Road number in backward way direction
+ref                                     | String   | Road number
 destinations                            | String   | The road's destinations
 exits                                   | String   | The ramp's exit numbers or names
 pronunciation                           | String   | Name pronunciation
@@ -183,22 +168,22 @@ road_classification.may_be_ignored      | Boolean  | Guidance: way is non-highwa
 road_classification.num_lanes           | Unsigned | Guidance: total number of lanes in way

 ### process_segment(profile, segment)
-The `process_segment` function is called for every segment of OSM ways. A segment is a straight line between two OSM nodes.
+The `process_segment` function is called for every segment of OSM ways. A segment is a straight line between two OSM nodes. 

-On OpenStreetMap way cannot have different tags on different parts of a way. Instead you would split the way into several smaller ways. However many ways are long. For example, many ways pass hills without any change in tags.
+On OpenStreetMap way cannot have different tags on different parts of a way. Instead you would split the way into several smaller ways. However many ways are long. For example, many ways pass hills without any change in tags. 

-Processing each segment of an OSM way makes it possible to have different speeds on different parts of a way based on external data like data about elevation, pollution, noise or scenic value and adjust weight and duration of the segment accordingly.
+Processing each segment of an OSM way makes it possible to have different speeds on different parts of a way based on external data like data about elevation, pollution, noise or scenic value and adjust weight and duration of the segment.

-In the `process_segment` function you don't have access to OSM tags. Instead you use the geographical location of the start and end point of the way to look up information from another data source, like elevation data. See [rasterbot.lua](../profiles/rasterbot.lua) for an example.
+In the `process_segment` you don't have access to OSM tags. Instead you use the geographical location of the start and end point of the way to lookup other data source, like elevation data. See [rasterbot.lua](../profiles/rasterbot.lua) for an example.

 The following attributes can be read and set on the result in `process_segment`:

 Attribute          | Read/write? | Type    | Notes
 -------------------|-------------|---------|----------------------------------------
 source.lon         | Read        | Float   | Co-ordinates of segment start
-source.lat         | Read        | Float   |  ""
+source.lat         | Read        | Float   |  "   "
 target.lon         | Read        | Float   | Co-ordinates of segment end
-target.lat         | Read        | Float   |  ""
+target.lat         | Read        | Float   |  "   "
 target.distance    | Read        | Float   | Length of segment
 weight             | Read/write  | Float   | Routing weight for this segment
 duration           | Read/write  | Float   | Duration for this segment
@@ -208,19 +193,16 @@ The `process_turn` function is called for every possible turn in the network. Ba

 The following attributes can be read and set on the result in `process_turn`:

-Attribute            | Read/write? | Type    | Notes
---------------------|-------------|---------|------------------------------------------------------
-angle                | Read        | Float   | Angle of turn in degrees (`0-360`: `0`=u-turn, `180`=straight on)
-number_of_roads      | Read        | Integer | Number of ways at the intersection of the turn
-is_u_turn            | Read        | Boolean | Is the turn a u-turn?
-has_traffic_light    | Read        | Boolean | Is a traffic light present at this turn?
-source_restricted    | Read        | Boolean | Is it from a restricted access road? (See definition in `process_way`)
-target_restricted    | Read        | Boolean | Is it to a restricted access road? (See definition in `process_way`)
-is_left_hand_driving | Read        | Boolean | Is left-hand traffic? 
-weight               | Read/write  | Float   | Penalty to be applied for this turn (routing weight)
-duration             | Read/write  | Float   | Penalty to be applied for this turn (duration in deciseconds)
-source_mode          | Read        | Enum    | Travel mode before the turn. Defined in `include/extractor/travel_mode.hpp`
-target_mode          | Read        | Enum    | Travel mode after the turn. Defined in `include/extractor/travel_mode.hpp`
+Attribute          | Read/write? | Type    | Notes
+-------------------|-------------|---------|------------------------------------------------------
+direction_modifier | Read        | Enum    | Geometry of turn. Defined in `include/extractor/guidance/turn_instruction.hpp`
+turn_type          | Read        | Enum    | Priority of turn. Defined in `include/extractor/guidance/turn_instruction.hpp`
+has_traffic_light  | Read        | Boolean | Is a traffic light present at this turn?
+source_restricted  | Read        | Boolean | Is it from a restricted access road? (See definition in `process_way`)
+target_restricted  | Read        | Boolean | Is it to a restricted access road? (See definition in `process_way`)
+angle              | Read        | Float   | Angle of turn in degrees (`0-360`: `0`=u-turn, `180`=straight on)
+duration           | Read/write  | Float   | Penalty to be applied for this turn (duration in deciseconds)
+weight             | Read/write  | Float   | Penalty to be applied for this turn (routing weight)

 ## Guidance
 The guidance parameters in profiles are currently a work in progress. They can and will change.
@@ -233,7 +215,7 @@ The priority-category influences the decision which road is considered the obvio
 Forks can be emitted between roads of similar priority category only. Obvious choices follow a major priority road, if the priority difference is large.

 ### Using raster data
-OSRM has built-in support for loading an interpolating raster data in ASCII format. This can be used e.g. for factoring in elevation when computing routes.
+OSRM has build-in support for loading an interpolating raster data in ASCII format. This can be used e.g. for factoring in elevation when computing routes.

 Use `raster:load()` in your `setup` function to load data and store the source in your configuration hash:

@@ -273,7 +255,7 @@ Example:
 function process_segment (profile, segment)
  local sourceData = raster:query(profile.raster_source, segment.source.lon, segment.source.lat)
  local targetData = raster:query(profile.raster_source, segment.target.lon, segment.target.lat)
-
+  
  local invalid = sourceData.invalid_data()
  if sourceData.datum ~= invalid and targetData.datum ~= invalid then
      -- use values to adjust weight and duration
@@ -286,8 +268,8 @@ See [rasterbot.lua](../profiles/rasterbot.lua) and [rasterbotinterp.lua](../prof
 ### Helper functions
 There are a few helper functions defined in the global scope that profiles can use:

- `durationIsValid`
- `parseDuration`
- `trimLaneString`
- `applyAccessTokens`
- `canonicalizeStringList`
+durationIsValid
+parseDuration
+trimLaneString
+applyAccessTokens
+canonicalizeStringList
@@ -53,4 +53,4 @@ We may introduce forward-compatible changes: query parameters and response prope
 10. Wait until the travis build has been completed and check if the node binaries were published by doing:
    `rm -rf node_modules && npm install` locally.
 11. For final releases run `npm publish` or `npm publish --tag next` for release candidates.
-12. Bump version in `package.json` to `{MAJOR}.{MINOR+1}.0-latest.1` on the `master` branch after the release.
+
@@ -30,17 +30,9 @@ int main(int argc, const char *argv[])

    // Configure based on a .osrm base path, and no datasets in shared mem from osrm-datastore
    EngineConfig config;
-
    config.storage_config = {argv[1]};
    config.use_shared_memory = false;

-    // We support two routing speed up techniques:
-    // - Contraction Hierarchies (CH): requires extract+contract pre-processing
-    // - Multi-Level Dijkstra (MLD): requires extract+partition+customize pre-processing
-    //
-    // config.algorithm = EngineConfig::Algorithm::CH;
-    config.algorithm = EngineConfig::Algorithm::MLD;
-
    // Routing machine with several services (such as Route, Table, Nearest, Trip, Match)
    const OSRM osrm{config};

@@ -10,7 +10,6 @@ Feature: Barriers
            |                | x     |
            | bollard        | x     |
            | gate           | x     |
-            | lift_gate      | x     |
            | cycle_barrier  | x     |
            | cattle_grid    | x     |
            | border_control | x     |
@@ -21,6 +21,13 @@ Feature: Bicycle - Handle cycling
        When I route I should get
            | from | to | route           | modes                           |
            | a    | g  | abc,cde,efg,efg | cycling,cycling,cycling,cycling |
+            | b    | f  | abc,cde,efg,efg | cycling,cycling,cycling,cycling |
+            | e    | c  | cde,cde         | cycling,cycling                 |
+            | e    | b  | cde,abc,abc     | cycling,cycling,cycling         |
+            | e    | a  | cde,abc,abc     | cycling,cycling,cycling         |
+            | c    | e  | cde,cde         | cycling,cycling                 |
+            | c    | f  | cde,efg,efg     | cycling,cycling,cycling         |
+            | c    | g  | cde,efg,efg     | cycling,cycling,cycling         |

    Scenario: Bicycle - Properly handle durations
        Given the node map
@@ -21,15 +21,15 @@ Feature: Bike - Destination only, no passing through
            | axye  |             |

        When I route I should get
-            | from | to | route     |
-            | a    | b  | ab,ab     |
-            | a    | c  | ab,bcd    |
-            | a    | d  | ab,bcd    |
-            | a    | e  | axye,axye |
-            | e    | d  | de,de     |
-            | e    | c  | de,bcd    |
-            | e    | b  | de,bcd    |
-            | e    | a  | axye,axye |
+            | from | to | route      |
+            | a    | b  | ab,ab      |
+            | a    | c  | ab,bcd,bcd |
+            | a    | d  | ab,bcd,bcd |
+            | a    | e  | axye,axye  |
+            | e    | d  | de,de      |
+            | e    | c  | de,bcd,bcd |
+            | e    | b  | de,bcd,bcd |
+            | e    | a  | axye,axye  |

    Scenario: Bike - Destination only street
        Given the node map
@@ -49,15 +49,15 @@ Feature: Bike - Destination only, no passing through
            | axye  |             |

        When I route I should get
-            | from | to | route     |
-            | a    | b  | ab,ab     |
-            | a    | c  | ab,bc     |
-            | a    | d  | ab,bc,cd  |
-            | a    | e  | axye,axye |
-            | e    | d  | de,de     |
-            | e    | c  | de,cd,cd  |
-            | e    | b  | de,cd,bc  |
-            | e    | a  | axye,axye |
+            | from | to | route       |
+            | a    | b  | ab,ab       |
+            | a    | c  | ab,bc,bc    |
+            | a    | d  | ab,bc,cd,cd |
+            | a    | e  | axye,axye   |
+            | e    | d  | de,de       |
+            | e    | c  | de,cd,cd    |
+            | e    | b  | de,cd,bc,bc |
+            | e    | a  | axye,axye   |

    Scenario: Bike - Routing inside a destination only area
        Given the node map
@@ -76,8 +76,8 @@ Feature: Bike - Destination only, no passing through
            | axye  |             |

        When I route I should get
-            | from | to | route       |
-            | a    | e  | ab,bc,cd,de |
-            | e    | a  | de,cd,bc,ab |
-            | b    | d  | bc,cd       |
-            | d    | b  | cd,bc       |
+            | from | to | route          |
+            | a    | e  | ab,bc,cd,de,de |
+            | e    | a  | de,cd,bc,ab,ab |
+            | b    | d  | bc,cd,cd       |
+            | d    | b  | cd,bc,bc       |
@@ -1,35 +0,0 @@
-@routing @bicycle
-Feature: Bike - Use distance weight
-
-    Background:
-        Given a grid size of 200 meters
-
-    Scenario: Bike - Check distance weight
-        Given the profile file
-        """
-        local functions = require('bicycle')
-        functions.setup_testbot = functions.setup
-
-        functions.setup = function()
-          local profile = functions.setup_testbot()
-          profile.properties.weight_name = 'distance'
-          return profile
-        end
-
-        return functions
-        """
-
-        Given the node map
-            """
-            a-b-c
-            """
-
-
-        And the ways
-            | nodes | highway     |
-            | abc   | residential |
-
-        When I route I should get
-            | from | to | route   | weight | time | distance |
-            | a    | b  | abc,abc |    200 | 48s  | 200m +-1 |
-            | a    | c  | abc,abc |    400 | 96s  | 400m +-1 |
@@ -21,7 +21,12 @@ Feature: Bike - Handle ferry routes
        When I route I should get
            | from | to | route           |
            | a    | g  | abc,cde,efg,efg |
+            | b    | f  | abc,cde,efg,efg |
+            | e    | c  | cde,cde         |
+            | e    | b  | cde,abc,abc     |
+            | e    | a  | cde,abc,abc     |
            | c    | e  | cde,cde         |
+            | c    | f  | cde,efg,efg     |
            | c    | g  | cde,efg,efg     |

    Scenario: Bike - Ferry duration, single node
@@ -20,8 +20,11 @@ Feature: Bike - Mode flag
    	When I route I should get
    	 | from | to | route       | modes                         |
    	 | a    | d  | ab,bc,cd,cd | cycling,ferry,cycling,cycling |
+    	 | d    | a  | cd,bc,ab,ab | cycling,ferry,cycling,cycling |
    	 | c    | a  | bc,ab,ab    | ferry,cycling,cycling         |
    	 | d    | b  | cd,bc,bc    | cycling,ferry,ferry           |
+    	 | a    | c  | ab,bc,bc    | cycling,ferry,ferry           |
+    	 | b    | d  | bc,cd,cd    | ferry,cycling,cycling         |

     Scenario: Bike - Mode when using a train
     	Given the node map
@@ -39,10 +42,12 @@ Feature: Bike - Mode flag
     	When I route I should get
     	 | from | to | route       | modes                         |
     	 | a    | d  | ab,bc,cd,cd | cycling,train,cycling,cycling |
+     	 | d    | a  | cd,bc,ab,ab | cycling,train,cycling,cycling |
     	 | c    | a  | bc,ab,ab    | train,cycling,cycling         |
     	 | d    | b  | cd,bc,bc    | cycling,train,train           |
+     	 | a    | c  | ab,bc,bc    | cycling,train,train           |
+     	 | b    | d  | bc,cd,cd    | train,cycling,cycling         |

-     #representative test for all pushes (and mode changes). Where a bike is pushed is tested over in access.feature
     Scenario: Bike - Mode when pushing bike against oneways
     	Given the node map
     	 """
@@ -65,6 +70,96 @@ Feature: Bike - Mode flag
     	 | d    | a  | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling |
     	 | c    | a  | bc,ab,ab    | pushing bike,cycling,cycling         |
     	 | d    | b  | cd,bc,bc    | cycling,pushing bike,pushing bike    |
+     	 | a    | c  | ab,bc,bc    | cycling,cycling,cycling              |
+     	 | b    | d  | bc,cd,cd    | cycling,cycling,cycling              |
+
+     Scenario: Bike - Mode when pushing on pedestrain streets
+     	Given the node map
+     	 """
+     	 a b
+     	   c d
+     	 """
+
+     	And the ways
+     	 | nodes | highway    |
+     	 | ab    | primary    |
+     	 | bc    | pedestrian |
+     	 | cd    | primary    |
+
+     	When I route I should get
+     	 | from | to | route       | modes                                |
+     	 | a    | d  | ab,bc,cd,cd | cycling,pushing bike,cycling,cycling |
+     	 | d    | a  | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling |
+     	 | c    | a  | bc,ab,ab    | pushing bike,cycling,cycling         |
+     	 | d    | b  | cd,bc,bc    | cycling,pushing bike,pushing bike    |
+     	 | a    | c  | ab,bc,bc    | cycling,pushing bike,pushing bike    |
+     	 | b    | d  | bc,cd,cd    | pushing bike,cycling,cycling         |
+
+     Scenario: Bike - Mode when pushing on pedestrain areas
+     	Given the node map
+     	 """
+     	 a b
+     	   c d f
+     	 """
+
+     	And the ways
+     	 | nodes | highway    | area |
+     	 | ab    | primary    |      |
+     	 | bcd   | pedestrian | yes  |
+     	 | df    | primary    |      |
+
+     	When I route I should get
+     	 | from | to | route        | modes                                |
+     	 | a    | f  | ab,bcd,df,df | cycling,pushing bike,cycling,cycling |
+     	 | f    | a  | df,bcd,ab,ab | cycling,pushing bike,cycling,cycling |
+     	 | d    | a  | bcd,ab,ab    | pushing bike,cycling,cycling         |
+     	 | f    | b  | df,bcd,bcd   | cycling,pushing bike,pushing bike    |
+     	 | a    | d  | ab,bcd,bcd   | cycling,pushing bike,pushing bike    |
+     	 | b    | f  | bcd,df,df    | pushing bike,cycling,cycling         |
+
+     Scenario: Bike - Mode when pushing on steps
+     	Given the node map
+     	 """
+     	 a b
+     	   c d f
+     	 """
+
+     	And the ways
+    	 | nodes | highway |
+    	 | ab    | primary |
+    	 | bc    | steps   |
+    	 | cd    | primary |
+
+     	When I route I should get
+    	 | from | to | route       | modes                                |
+    	 | a    | d  | ab,bc,cd,cd | cycling,pushing bike,cycling,cycling |
+    	 | d    | a  | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling |
+    	 | c    | a  | bc,ab,ab    | pushing bike,cycling,cycling         |
+    	 | d    | b  | cd,bc,bc    | cycling,pushing bike,pushing bike    |
+    	 | a    | c  | ab,bc,bc    | cycling,pushing bike,pushing bike    |
+    	 | b    | d  | bc,cd,cd    | pushing bike,cycling,cycling         |
+
+     Scenario: Bike - Mode when bicycle=dismount
+     	Given the node map
+     	 """
+     	 a b
+     	   c d f
+     	 """
+
+     	And the ways
+    	 | nodes | highway | bicycle  |
+    	 | ab    | primary |          |
+    	 | bc    | primary | dismount |
+    	 | cd    | primary |          |
+
+     	When I route I should get
+    	 | from | to | route       | modes                                |
+    	 | a    | d  | ab,bc,cd,cd | cycling,pushing bike,cycling,cycling |
+    	 | d    | a  | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling |
+    	 | c    | a  | bc,ab,ab    | pushing bike,cycling,cycling         |
+    	 | d    | b  | cd,bc,bc    | cycling,pushing bike,pushing bike    |
+    	 | a    | c  | ab,bc,bc    | cycling,pushing bike,pushing bike    |
+         | b    | d  | bc,cd,cd  | pushing bike,cycling,cycling         |

    Scenario: Bicycle - Modes when starting on forward oneway
        Given the node map
@@ -0,0 +1,47 @@
+@routing @bicycle @ref @name
+Feature: Bike - Way ref
+
+    Background:
+        Given the profile "bicycle"
+
+    Scenario: Bike - Way with both name and ref
+        Given the node map
+            """
+            a b
+            """
+
+        And the ways
+            | nodes | name         | ref |
+            | ab    | Utopia Drive | E7  |
+
+        When I route I should get
+            | from | to | route                               | ref   |
+            | a    | b  | Utopia Drive,Utopia Drive           | E7,E7 |
+
+    Scenario: Bike - Way with only ref
+        Given the node map
+            """
+            a b
+            """
+
+        And the ways
+            | nodes | name | ref |
+            | ab    |      | E7  |
+
+        When I route I should get
+            | from | to | route | ref   |
+            | a    | b  | ,     | E7,E7 |
+
+    Scenario: Bike - Way with only name
+        Given the node map
+            """
+            a b
+            """
+
+        And the ways
+            | nodes | name         |
+            | ab    | Utopia Drive |
+
+        When I route I should get
+            | from | to | route                     |
+            | a    | b  | Utopia Drive,Utopia Drive |
@@ -7,8 +7,6 @@ Feature: Bike - Turn restrictions
        Given the profile "bicycle"
        Given a grid size of 200 meters

-    # check to see if bicycle profiles handle relations. The code path is the same as in cars.
-    # If relations are passed, all variants tested in car also work for bike
    @no_turning
    Scenario: Bike - No left turn
        Given the node map
@@ -35,7 +33,188 @@ Feature: Bike - Turn restrictions
            | s    | n  | sj,nj,nj |
            | s    | e  | sj,ej,ej |

-    ## exceptions are different for bike over car and need to be tested here
+    @no_turning
+    Scenario: Bike - No right turn
+        Given the node map
+            """
+              n
+            w j e
+              s
+            """
+
+        And the ways
+            | nodes | oneway | foot |
+            | sj    | yes    | no   |
+            | nj    | -1     | no   |
+            | wj    | -1     | no   |
+            | ej    | -1     | no   |
+
+        And the relations
+            | type        | way:from | way:to | node:via | restriction   |
+            | restriction | sj       | ej     | j        | no_right_turn |
+
+        When I route I should get
+            | from | to | route    |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |
+
+    @no_turning
+    Scenario: Bike - No u-turn
+        Given the node map
+            """
+              n
+            w j e
+              s
+            """
+
+        And the ways
+            | nodes | oneway | foot |
+            | sj    | yes    | no   |
+            | nj    | -1     | no   |
+            | wj    | -1     | no   |
+            | ej    | -1     | no   |
+
+        And the relations
+            | type        | way:from | way:to | node:via | restriction |
+            | restriction | sj       | wj     | j        | no_u_turn   |
+
+        When I route I should get
+            | from | to | route    |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |
+
+    @no_turning
+    Scenario: Bike - Handle any no_* relation
+        Given the node map
+            """
+              n
+            w j e
+              s
+            """
+
+        And the ways
+            | nodes | oneway | foot |
+            | sj    | yes    | no   |
+            | nj    | -1     | no   |
+            | wj    | -1     | no   |
+            | ej    | -1     | no   |
+
+        And the relations
+            | type        | way:from | way:to | node:via | restriction      |
+            | restriction | sj       | wj     | j        | no_weird_zigzags |
+
+        When I route I should get
+            | from | to | route    |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |
+
+    @only_turning
+    Scenario: Bike - Only left turn
+        Given the node map
+            """
+              n
+            w j e
+              s
+            """
+
+        And the ways
+            | nodes | oneway | foot |
+            | sj    | yes    | no   |
+            | nj    | -1     | no   |
+            | wj    | -1     | no   |
+            | ej    | -1     | no   |
+
+        And the relations
+            | type        | way:from | way:to | node:via | restriction    |
+            | restriction | sj       | wj     | j        | only_left_turn |
+
+        When I route I should get
+            | from | to | route    |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |
+
+    @only_turning
+    Scenario: Bike - Only right turn
+        Given the node map
+            """
+              n
+            w j e
+              s
+            """
+
+        And the ways
+            | nodes | oneway | foot |
+            | sj    | yes    | no   |
+            | nj    | -1     | no   |
+            | wj    | -1     | no   |
+            | ej    | -1     | no   |
+
+        And the relations
+            | type        | way:from | way:to | node:via | restriction     |
+            | restriction | sj       | ej     | j        | only_right_turn |
+
+        When I route I should get
+            | from | to | route    |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |
+
+    @only_turning
+    Scenario: Bike - Only straight on
+        Given the node map
+            """
+              n
+            w j e
+              s
+            """
+
+        And the ways
+            | nodes | oneway | foot |
+            | sj    | yes    | no   |
+            | nj    | -1     | no   |
+            | wj    | -1     | no   |
+            | ej    | -1     | no   |
+
+        And the relations
+            | type        | way:from | way:to | node:via | restriction      |
+            | restriction | sj       | nj     | j        | only_straight_on |
+
+        When I route I should get
+            | from | to | route    |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |
+
+    @no_turning
+    Scenario: Bike - Handle any only_* restriction
+        Given the node map
+            """
+              n
+            w j e
+              s
+            """
+
+        And the ways
+            | nodes | oneway | foot |
+            | sj    | yes    | no   |
+            | nj    | -1     | no   |
+            | wj    | -1     | no   |
+            | ej    | -1     | no   |
+
+        And the relations
+            | type        | way:from | way:to | node:via | restriction        |
+            | restriction | sj       | nj     | j        | only_weird_zigzags |
+
+        When I route I should get
+            | from | to | route    |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |
+
    @except
    Scenario: Bike - Except tag and on no_ restrictions
        Given the node map
@@ -157,16 +157,15 @@ Feature: Car - Restricted access

    Scenario: Car - Access combinations
        Then routability should be
-            | highway      | access       | vehicle    | motor_vehicle | motorcar    | forw | backw | # |
-            | runway       | private      |            |               | permissive  | x    | x     |   |
-            | primary      | forestry     |            | yes           |             | x    | x     |   |
-            | cycleway     |              |            | designated    |             | x    | x     |   |
-            | unclassified |              |            | destination   | destination | x    | x     |   |
-            | residential  |              | yes        | no            |             |      |       |   |
-            | motorway     | yes          | permissive |               | private     | x    |       | implied oneway  |
-            | trunk        | agricultural | designated | permissive    | no          |      |       |   |
-            | pedestrian   |              |            |               |             |      |       |   |
-            | pedestrian   |              |            |               | destination |      |       | temporary disabled #3773 |
+            | highway     | access       | vehicle    | motor_vehicle | motorcar    | forw | backw | # |
+            | runway      | private      |            |               | permissive  | x    | x     |   |
+            | primary     | forestry     |            | yes           |             | x    | x     |   |
+            | cycleway    |              |            | designated    |             | x    | x     |   |
+            | residential |              | yes        | no            |             |      |       |   |
+            | motorway    | yes          | permissive |               | private     | x    |       | implied oneway  |
+            | trunk       | agricultural | designated | permissive    | no          |      |       |   |
+            | pedestrian  |              |            |               |             |      |       |   |
+            | pedestrian  |              |            |               | destination |      |       | temporary disabled #3773 |

    Scenario: Car - Ignore access tags for other modes
        Then routability should be
@@ -1,23 +0,0 @@
-@routing @car @way
-Feature: Car - Avoid defined areas
-
-    Background:
-        Given the profile file "car" initialized with
-        """
-        profile.avoid = Set { 'motorway', 'motorway_link' }
-        profile.speeds = Sequence {
-            highway = {
-                motorway      = 90,
-                motorway_link = 45,
-                primary       = 50
-            }
-        }
-        """
-
-    Scenario: Car - Avoid motorways
-        Then routability should be
-            | highway        | bothw |
-            | motorway       |       |
-            | motorway_link  |       |
-            | primary        | x     |
-
@@ -20,9 +20,15 @@ Feature: Car - Handle driving
            | efg   | primary |         |         |

        When I route I should get
-            | from | to | route           | modes                           | turns                                      |
-            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving | depart,new name right,new name left,arrive |
-            | e    | a  | cde,abc,abc     | driving,driving,driving         | depart,new name left,arrive                |
+            | from | to | route           | modes                           |
+            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving |
+            | b    | f  | abc,cde,efg,efg | driving,driving,driving,driving |
+            | e    | c  | cde,cde         | driving,driving                 |
+            | e    | b  | cde,abc,abc     | driving,driving,driving         |
+            | e    | a  | cde,abc,abc     | driving,driving,driving         |
+            | c    | e  | cde,cde         | driving,driving                 |
+            | c    | f  | cde,efg,efg     | driving,driving,driving         |
+            | c    | g  | cde,efg,efg     | driving,driving,driving         |

    Scenario: Car - Control test without durations, osrm uses movable bridge speed to calculate duration
        Given the node map
@@ -39,9 +45,11 @@ Feature: Car - Handle driving
            | efg   | primary |         |

        When I route I should get
-            | from | to | route           | modes                           | speed   | time     | turns                                      |
-            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving | 13 km/h | 332s +-1 | depart,new name right,new name left,arrive |
-            | e    | c  | cde,cde         | driving,driving                 | 5 km/h  | 288s +-1 | depart,arrive                              |
+            | from | to | route           | modes                           | speed   | time     |
+            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving | 13 km/h | 340s +-1 |
+            | b    | f  | abc,cde,efg,efg | driving,driving,driving,driving | 9 km/h  | 318s +-1 |
+            | c    | e  | cde,cde         | driving,driving                 | 5 km/h  | 295s +-1 |
+            | e    | c  | cde,cde         | driving,driving                 | 5 km/h  | 295s +-1 |

    Scenario: Car - Properly handle durations
        Given the node map
@@ -58,7 +66,8 @@ Feature: Car - Handle driving
            | efg   | primary |         |          |

        When I route I should get
-            | from | to | route           | modes                           | speed  | turns                                      |
-            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving | 7 km/h | depart,new name right,new name left,arrive |
-            | c    | e  | cde,cde         | driving,driving                 | 2 km/h | depart,arrive                              |
-            | e    | c  | cde,cde         | driving,driving                 | 2 km/h | depart,arrive                              |
+            | 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 |
@@ -82,7 +82,7 @@ Feature: Car - Mode flag
            | from | to | route | turns        | classes                                      |
            | a    | d  | ab,cd | depart,arrive| [(restricted),(motorway,restricted),()],[()] |

-    Scenario: Car - We tag toll with a class
+    Scenario: Car - We toll restricted with a class
        Given the node map
            """
            a b
@@ -99,45 +99,6 @@ Feature: Car - Mode flag
            | from | to | route    | turns         | classes                          |
            | a    | d  | ab,cd    | depart,arrive | [(toll),(motorway,toll),()],[()] |

-    Scenario: Car - We tag tunnel with a class
-        Background:
-            Given a grid size of 200 meters
-
-        Given the node map
-            """
-            a b
-              c d
-            """
-
-        And the ways
-            | nodes | tunnel               |
-            | ab    | no                   |
-            | bc    | yes                  |
-            | cd    |                      |
-
-        When I route I should get
-            | from | to | route       | turns                                      | classes                   |
-            | a    | d  | ab,bc,cd,cd | depart,new name right,new name left,arrive | [()],[(tunnel)],[()],[()] |
-
-    Scenario: Car - We tag classes without intersections
-        Background:
-            Given a grid size of 200 meters
-
-        Given the node map
-            """
-            a b c d
-            """
-
-        And the ways
-            | nodes | name | tunnel |
-            | ab    | road |        |
-            | bc    | road | yes    |
-            | cd    | road |        |
-
-        When I route I should get
-          | from | to | route     | turns         | classes               |
-          | a    | d  | road,road | depart,arrive | [(),(tunnel),()],[()] |
-
    Scenario: Car - From roundabout on toll road
        Given the node map
            """
@@ -161,5 +122,6 @@ Feature: Car - Mode flag
            | df    | yes    | motorway|            | yes      |

        When I route I should get
-            | from | to | route       | turns                                                        | classes                                     |
-            | a    | f  | ab,df,df,df | depart,roundabout-exit-2,exit roundabout slight right,arrive | [()],[(),(motorway)],[(toll,motorway)],[()] |
+            | from | to | route    | turns                           | classes                                   |
+            | a    | f  | ab,df,df | depart,roundabout-exit-2,arrive | [()],[(),(motorway),(toll,motorway)],[()] |
+
@@ -17,27 +17,27 @@ Feature: Car - Turn restrictions
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            p j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
-            | bj    | yes    |
-            | jd    | yes    |
+            | nj    | no     |
+            | js    | no     |
+            | ej    | yes    |
+            | jp    | yes    |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional                |
-            | restriction | bj       | aj     | j        | only_right_turn @ (has_pygmies > 10 p) |
+            | restriction | ej       | nj     | j        | only_right_turn @ (has_pygmies > 10 p) |

        When I route I should get
            | from | to | route    |
-            | b    | c  | bj,jc,jc |
-            | b    | a  | bj,aj,aj |
-            | b    | d  | bj,jd,jd |
+            | e    | s  | ej,js,js |
+            | e    | n  | ej,nj,nj |
+            | e    | p  | ej,jp,jp |

    @no_turning @conditionals
    Scenario: Car - Restriction would be on, but the restriction was badly tagged
@@ -48,98 +48,29 @@ Feature: Car - Turn restrictions

        Given the node map
            """
-              a
+              n
           p  |
            \ |
              j
              | \
-              c  m
+              s  m
            """

        And the ways
            | nodes |
-            | aj    |
-            | jc    |
+            | nj    |
+            | js    |
            | pjm   |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional             |
-            | restriction | aj       | pjm    | j        | no_left_turn @ (Mo-Fr 07:00-10:30)  |
-            | restriction | jc       | pjm    | j        | no_right_turn @ (Mo-Fr 07:00-10:30) |
+            | restriction | nj       | pjm    | j        | no_left_turn @ (Mo-Fr 07:00-10:30)  |
+            | restriction | js       | pjm    | j        | no_right_turn @ (Mo-Fr 07:00-10:30) |

        When I route I should get
            | from | to | route      |
-            | a    | m  | aj,pjm,pjm |
-            | c    | m  | jc,pjm,pjm |
-
-    @no_turning @conditionals
-    Scenario: Car - Restriction With Compressed Geometry
-        Given the extract extra arguments "--parse-conditional-restrictions"
-                                            # time stamp for 10am on Tues, 02 May 2017 GMT
-        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
-        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
-
-        Given the node map
-            """
-            n
-            |
-            i
-            |
-            j-k-l-m
-            |
-            s
-            """
-
-        And the ways
-            | nodes |
-            | nij   |
-            | js    |
-            | jklm  |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction:conditional             |
-            | restriction | nij      | jklm   | j        | no_left_turn @ (Mo-Fr 07:00-10:30)  |
-
-        When I route I should get
-            | from | to | route               |
-            | n    | m  | nij,js,js,jklm,jklm |
-
-    @no_turning @conditionals
-    Scenario: Car - Restriction With Compressed Geometry and Traffic Signal
-        Given the extract extra arguments "--parse-conditional-restrictions"
-                                            # time stamp for 10am on Tues, 02 May 2017 GMT
-        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
-        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
-
-        Given the node map
-            """
-            n
-            |
-            i
-            |
-            j-k-l-m
-            |
-            s
-            """
-
-        And the ways
-            | nodes |
-            | nij   |
-            | js    |
-            | jklm  |
-
-        And the nodes
-            | node | highway        |
-            | i    | traffic_signal |
-            | k    | traffic_signal |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction:conditional             |
-            | restriction | nij      | jklm   | j        | no_left_turn @ (Mo-Fr 07:00-10:30)  |
-
-        When I route I should get
-            | from | to | route               |
-            | n    | m  | nij,js,js,jklm,jklm |
+            | n    | m  | nj,pjm,pjm |
+            | s    | m  | js,pjm,pjm |

    @no_turning @conditionals
    Scenario: Car - ignores except restriction
@@ -149,29 +80,29 @@ Feature: Car - Turn restrictions
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            p j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
-            | bj    | no     |
-            | jd    | no     |
+            | nj    | no     |
+            | js    | no     |
+            | ej    | no     |
+            | jp    | no     |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional               | except   |
-            | restriction | bj       | aj     | j        | only_right_turn @ (Mo-Su 08:00-12:00) | motorcar |
-            | restriction | jd       | aj     | j        | only_left_turn @ (Mo-Su 08:00-12:00)  | bus      |
+            | restriction | ej       | nj     | j        | only_right_turn @ (Mo-Su 08:00-12:00) | motorcar |
+            | restriction | jp       | nj     | j        | only_left_turn @ (Mo-Su 08:00-12:00)  | bus      |

        When I route I should get
            | from | to | route          | # |
-            | b    | c  | bj,jc,jc       |   |
-            | b    | a  | bj,aj,aj       | restriction does not apply to cars |
-            | b    | d  | bj,jd,jd       |   |
-            | d    | c  | jd,aj,aj,jc,jc | restriction excepting busses still applies to cars  |
+            | e    | s  | ej,js,js       |   |
+            | e    | n  | ej,nj,nj       | restriction does not apply to cars |
+            | e    | p  | ej,jp,jp       |   |
+            | p    | s  | jp,nj,nj,js,js | restriction excepting busses still applies to cars  |

    @no_turning @conditionals
    Scenario: Car - only_right_turn
@@ -181,27 +112,27 @@ Feature: Car - Turn restrictions
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            p j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
-            | bj    | yes    |
-            | jd    | yes    |
+            | nj    | no     |
+            | js    | no     |
+            | ej    | yes    |
+            | jp    | yes    |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional               |
-            | restriction | bj       | aj     | j        | only_right_turn @ (Mo-Su 07:00-14:00) |
+            | restriction | ej       | nj     | j        | only_right_turn @ (Mo-Su 07:00-14:00) |

        When I route I should get
            | from | to | route          |
-            | b    | c  | bj,aj,aj,jc,jc |
-            | b    | a  | bj,aj,aj       |
-            | b    | d  | bj,aj,aj,jd,jd |
+            | e    | s  | ej,nj,nj,js,js |
+            | e    | n  | ej,nj,nj       |
+            | e    | p  | ej,nj,nj,jp,jp |

    @no_turning @conditionals
    Scenario: Car - No right turn
@@ -211,27 +142,27 @@ Feature: Car - Turn restrictions
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            p j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
-            | bj    | yes    |
-            | jd    | yes    |
+            | nj    | no     |
+            | js    | no     |
+            | ej    | yes    |
+            | jp    | yes    |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional               |
-            | restriction | bj       | aj     | j        | no_right_turn @ (Mo-Fr 07:00-13:00)   |
+            | restriction | ej       | nj     | j        | no_right_turn @ (Mo-Fr 07:00-13:00)   |

        When I route I should get
            | from | to | route          | # |
-            | b    | c  | bj,jc,jc       | normal turn |
-            | b    | a  | bj,jc,jc,aj,aj | avoids right turn |
-            | b    | d  | bj,jd,jd       | normal maneuver |
+            | e    | s  | ej,js,js       | normal turn |
+            | e    | n  | ej,js,js,nj,nj | avoids right turn |
+            | e    | p  | ej,jp,jp       | normal maneuver |

    @only_turning @conditionals
    Scenario: Car - only_left_turn
@@ -241,27 +172,27 @@ Feature: Car - Turn restrictions
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            p j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
-            | bj    | yes    |
-            | jd    | yes    |
+            | nj    | no     |
+            | js    | no     |
+            | ej    | yes    |
+            | jp    | yes    |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional              |
-            | restriction | bj       | jc     | j        | only_left_turn @ (Mo-Fr 07:00-16:00) |
+            | restriction | ej       | js     | j        | only_left_turn @ (Mo-Fr 07:00-16:00) |

        When I route I should get
            | from | to | route          |
-            | b    | c  | bj,jc,jc       |
-            | b    | a  | bj,jc,jc,aj,aj |
-            | b    | d  | bj,jc,jc,jd,jd |
+            | e    | s  | ej,js,js       |
+            | e    | n  | ej,js,js,nj,nj |
+            | e    | p  | ej,js,js,jp,jp |

    @no_turning @conditionals
    Scenario: Car - No left turn
@@ -271,27 +202,27 @@ Feature: Car - Turn restrictions
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            p j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
-            | bj    | yes    |
-            | jd    | yes    |
+            | nj    | no     |
+            | js    | no     |
+            | ej    | yes    |
+            | jp    | yes    |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional            |
-            | restriction | bj       | jc     | j        | no_left_turn @ (Mo-Su 00:00-23:59) |
+            | restriction | ej       | js     | j        | no_left_turn @ (Mo-Su 00:00-23:59) |

        When I route I should get
            | from | to | route          |
-            | b    | c  | bj,aj,aj,jc,jc |
-            | b    | a  | bj,aj,aj       |
-            | b    | d  | bj,jd,jd       |
+            | e    | s  | ej,nj,nj,js,js |
+            | e    | n  | ej,nj,nj       |
+            | e    | p  | ej,jp,jp       |

    @no_turning @conditionals
    Scenario: Car - Conditional restriction is off
@@ -301,27 +232,27 @@ Feature: Car - Turn restrictions
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            p j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
-            | bj    | yes    |
-            | jd    | yes    |
+            | nj    | no     |
+            | js    | no     |
+            | ej    | yes    |
+            | jp    | yes    |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional             |
-            | restriction | bj       | aj     | j        | no_right_turn @ (Mo-Su 16:00-20:00) |
+            | restriction | ej       | nj     | j        | no_right_turn @ (Mo-Su 16:00-20:00) |

        When I route I should get
            | from | to | route    |
-            | b    | c  | bj,jc,jc |
-            | b    | a  | bj,aj,aj |
-            | b    | d  | bj,jd,jd |
+            | e    | s  | ej,js,js |
+            | e    | n  | ej,nj,nj |
+            | e    | p  | ej,jp,jp |

    @no_turning @conditionals
    Scenario: Car - Conditional restriction is on
@@ -331,27 +262,27 @@ Feature: Car - Turn restrictions
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493805600"
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            p j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
-            | bj    | yes    |
-            | jd    | yes    |
+            | nj    | no     |
+            | js    | no     |
+            | ej    | yes    |
+            | jp    | yes    |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional             |
-            | restriction | bj       | aj     | j        | no_right_turn @ (Mo-Fr 07:00-14:00) |
+            | restriction | ej       | nj     | j        | no_right_turn @ (Mo-Fr 07:00-14:00) |

        When I route I should get
            | from | to | route          |
-            | b    | c  | bj,jc,jc       |
-            | b    | a  | bj,jc,jc,aj,aj |
-            | b    | d  | bj,jd,jd       |
+            | e    | s  | ej,js,js       |
+            | e    | n  | ej,js,js,nj,nj |
+            | e    | p  | ej,jp,jp       |

    @no_turning @conditionals
    Scenario: Car - Conditional restriction with multiple time windows
@@ -362,28 +293,28 @@ Feature: Car - Turn restrictions

        Given the node map
            """
-              a
+              n
           p  |
            \ |
              j
              | \
-              c  m
+              s  m
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
+            | nj    | no     |
+            | js    | no     |
            | jp    | yes    |
            | mj    | yes    |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional                         |
-            | restriction | aj       | jp     | j        | no_right_turn @ (Mo-Fr 07:00-11:00,16:00-18:30) |
+            | restriction | nj       | jp     | j        | no_right_turn @ (Mo-Fr 07:00-11:00,16:00-18:30) |

        When I route I should get
            | from | to | route          |
-            | a    | p  | aj,jc,jc,jp,jp |
+            | n    | p  | nj,js,js,jp,jp |
            | m    | p  | mj,jp,jp       |

    @no_turning @conditionals
@@ -394,27 +325,27 @@ Feature: Car - Turn restrictions
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            p j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
-            | bj    | yes    |
-            | jd    | yes    |
+            | nj    | no     |
+            | js    | no     |
+            | ej    | yes    |
+            | jp    | yes    |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional               |
-            | restriction | bj       | aj     | j        | only_right_turn @ (Mo-Su 07:00-14:00) |
+            | restriction | ej       | nj     | j        | only_right_turn @ (Mo-Su 07:00-14:00) |

        When I route I should get
            | from | to | route          |
-            | b    | c  | bj,aj,aj,jc,jc |
-            | b    | a  | bj,aj,aj       |
-            | b    | d  | bj,aj,aj,jd,jd |
+            | e    | s  | ej,nj,nj,js,js |
+            | e    | n  | ej,nj,nj       |
+            | e    | p  | ej,nj,nj,jp,jp |

    @no_turning @conditionals
    Scenario: Car - No right turn
@@ -424,27 +355,27 @@ Feature: Car - Turn restrictions
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            p j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
-            | bj    | yes    |
-            | jd    | yes    |
+            | nj    | no     |
+            | js    | no     |
+            | ej    | yes    |
+            | jp    | yes    |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional               |
-            | restriction | bj       | aj     | j        | no_right_turn @ (Mo-Fr 07:00-13:00)   |
+            | restriction | ej       | nj     | j        | no_right_turn @ (Mo-Fr 07:00-13:00)   |

        When I route I should get
            | from | to | route          | # |
-            | b    | c  | bj,jc,jc       | normal turn |
-            | b    | a  | bj,jc,jc,aj,aj | avoids right turn |
-            | b    | d  | bj,jd,jd       | normal maneuver |
+            | e    | s  | ej,js,js       | normal turn |
+            | e    | n  | ej,js,js,nj,nj | avoids right turn |
+            | e    | p  | ej,jp,jp       | normal maneuver |

    @only_turning @conditionals
    Scenario: Car - only_left_turn
@@ -454,27 +385,27 @@ Feature: Car - Turn restrictions
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            p j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
-            | bj    | yes    |
-            | jd    | yes    |
+            | nj    | no     |
+            | js    | no     |
+            | ej    | yes    |
+            | jp    | yes    |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional              |
-            | restriction | bj       | jc     | j        | only_left_turn @ (Mo-Fr 07:00-16:00) |
+            | restriction | ej       | js     | j        | only_left_turn @ (Mo-Fr 07:00-16:00) |

        When I route I should get
            | from | to | route          |
-            | b    | c  | bj,jc,jc       |
-            | b    | a  | bj,jc,jc,aj,aj |
-            | b    | d  | bj,jc,jc,jd,jd |
+            | e    | s  | ej,js,js       |
+            | e    | n  | ej,js,js,nj,nj |
+            | e    | p  | ej,js,js,jp,jp |

    @no_turning @conditionals
    Scenario: Car - No left turn
@@ -484,27 +415,27 @@ Feature: Car - Turn restrictions
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            p j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
-            | bj    | yes    |
-            | jd    | yes    |
+            | nj    | no     |
+            | js    | no     |
+            | ej    | yes    |
+            | jp    | yes    |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional            |
-            | restriction | bj       | jc     | j        | no_left_turn @ (Mo-Su 00:00-23:59) |
+            | restriction | ej       | js     | j        | no_left_turn @ (Mo-Su 00:00-23:59) |

        When I route I should get
            | from | to | route          |
-            | b    | c  | bj,aj,aj,jc,jc |
-            | b    | a  | bj,aj,aj       |
-            | b    | d  | bj,jd,jd       |
+            | e    | s  | ej,nj,nj,js,js |
+            | e    | n  | ej,nj,nj       |
+            | e    | p  | ej,jp,jp       |

    @no_turning @conditionals
    Scenario: Car - Conditional restriction is off
@@ -514,27 +445,27 @@ Feature: Car - Turn restrictions
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            p j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
-            | bj    | yes    |
-            | jd    | yes    |
+            | nj    | no     |
+            | js    | no     |
+            | ej    | yes    |
+            | jp    | yes    |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional             |
-            | restriction | bj       | aj     | j        | no_right_turn @ (Mo-Su 16:00-20:00) |
+            | restriction | ej       | nj     | j        | no_right_turn @ (Mo-Su 16:00-20:00) |

        When I route I should get
            | from | to | route    |
-            | b    | c  | bj,jc,jc |
-            | b    | a  | bj,aj,aj |
-            | b    | d  | bj,jd,jd |
+            | e    | s  | ej,js,js |
+            | e    | n  | ej,nj,nj |
+            | e    | p  | ej,jp,jp |

    @no_turning @conditionals
    Scenario: Car - Conditional restriction is on
@@ -544,27 +475,27 @@ Feature: Car - Turn restrictions
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493805600"
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            p j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
-            | bj    | yes    |
-            | jd    | yes    |
+            | nj    | no     |
+            | js    | no     |
+            | ej    | yes    |
+            | jp    | yes    |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional             |
-            | restriction | jb       | aj     | j        | no_right_turn @ (Mo-Fr 07:00-14:00) |
+            | restriction | ej       | nj     | j        | no_right_turn @ (Mo-Fr 07:00-14:00) |

        When I route I should get
            | from | to | route          |
-            | b    | c  | bj,jc,jc       |
-            | b    | a  | bj,jc,jc,aj,aj |
-            | b    | d  | bj,jd,jd       |
+            | e    | s  | ej,js,js       |
+            | e    | n  | ej,js,js,nj,nj |
+            | e    | p  | ej,jp,jp       |

    @no_turning @conditionals
    Scenario: Car - Conditional restriction with multiple time windows
@@ -575,109 +506,34 @@ Feature: Car - Turn restrictions

        Given the node map
            """
-              a
+              n
           p  |
            \ |
              j
              | \
-              c  m
+              s  m
            """

        And the ways
            | nodes | oneway |
-            | aj    | no     |
-            | jc    | no     |
+            | nj    | no     |
+            | js    | no     |
            | jp    | yes    |
            | mj    | yes    |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional                         |
-            | restriction | aj       | jp     | j        | no_right_turn @ (Mo-Fr 07:00-11:00,16:00-18:30) |
+            | restriction | nj       | jp     | j        | no_right_turn @ (Mo-Fr 07:00-11:00,16:00-18:30) |

        When I route I should get
            | from | to | route          |
-            | a    | p  | aj,jc,jc,jp,jp |
+            | n    | p  | nj,js,js,jp,jp |
            | m    | p  | mj,jp,jp       |

-    @restriction-way
-    Scenario: Car - prohibit turn
-        Given the extract extra arguments "--parse-conditional-restrictions"
-        # 5pm Wed 02 May, 2017 GMT
-        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
-        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
-
-        Given the node map
-            """
-            c
-            |
-            |   f
-            |   |
-            b---e
-            |   |
-            a   d
-            """
-
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | be    |
-            | de    |
-            | ef    |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction:conditional                         |
-            | restriction | ab       | be      | de     | no_right_turn @ (Mo-Fr 07:00-11:00,16:00-18:30) |
-
-        When I route I should get
-            | from | to | route             | turns                                                               | locations   |
-            | a    | d  | ab,be,ef,ef,de,de | depart,turn right,turn left,continue uturn,new name straight,arrive | a,b,e,f,e,d |
-            | a    | f  | ab,be,ef,ef       | depart,turn right,turn left,arrive                                  | a,b,e,f     |
-            | c    | d  | bc,be,de,de       | depart,turn left,turn right,arrive                                  | c,b,e,d     |
-            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |
-
-    # condition is off
-    @restriction-way
-    Scenario: Car - prohibit turn
-        Given the extract extra arguments "--parse-conditional-restrictions"
-        # time stamp for 12am on Tues, 02 May 2017 GMT
-        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493726400"
-        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493726400"
-
-        Given the node map
-            """
-            c
-            |
-            |   f
-            |   |
-            b---e
-            |   |
-            a   d
-            """
-
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | be    |
-            | de    |
-            | ef    |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction:conditional                         |
-            | restriction | ab       | be      | de     | no_right_turn @ (Mo-Fr 07:00-11:00,16:00-18:30) |
-
-        When I route I should get
-            | from | to | route       |
-            | a    | d  | ab,be,de,de |
-            | a    | f  | ab,be,ef,ef |
-            | c    | d  | bc,be,de,de |
-            | c    | f  | bc,be,ef,ef |
-
    # https://www.openstreetmap.org/#map=18/38.91099/-77.00888
    @no_turning @conditionals
    Scenario: Car - DC North capitol situation, two on one off
-        Given the extract extra arguments "--parse-conditional-restrictions"
+        Given the extract extra arguments "--parse-conditional-restrictions=1"
        # 9pm Wed 02 May, 2017 UTC, 5pm EDT
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493845200"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493845200"
@@ -724,7 +580,7 @@ Feature: Car - Turn restrictions

    @no_turning @conditionals
    Scenario: Car - DC North capitol situation, one on two off
-        Given the extract extra arguments "--parse-conditional-restrictions"
+        Given the extract extra arguments "--parse-conditional-restrictions=1"
        # 10:30am utc, wed, 6:30am est
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493807400"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/dc.geojson --parse-conditionals-from-now=1493807400"
@@ -848,7 +704,7 @@ Feature: Car - Turn restrictions

    @only_turning @conditionals
    Scenario: Car - Somewhere in London, the UK, GMT timezone
-        Given the extract extra arguments "--parse-conditional-restrictions"
+        Given the extract extra arguments "--parse-conditional-restrictions=1"
        # 9am UTC, 10am BST
        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/london.geojson --parse-conditionals-from-now=1493802000"
        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/london.geojson --parse-conditionals-from-now=1493802000"
@@ -884,7 +740,7 @@ Feature: Car - Turn restrictions
            | a    | c  | albic,dobe,dobe,albic,albic | depart,turn left,continue uturn,turn left,arrive |
            | a    | e  | albic,dobe,dobe             | depart,turn left,arrive                          |

-    @no_turning @conditionals @restriction-way
+    @no_turning @conditionals
    Scenario: Car - Conditional restriction with multiple time windows
        Given the extract extra arguments "--parse-conditional-restrictions"
        # 5pm Wed 02 May, 2017 GMT
@@ -913,144 +769,15 @@ Feature: Car - Turn restrictions
            | dg    |

        And the relations
-            | type        | way:from | way:via | way:to | restriction:conditional                    |
-            | restriction | ab       | be      | ef     | no_uturn @ (Mo-Fr 07:00-11:00,16:00-18:30) |
+            | type        | way:from | way:to | way:via | restriction:conditional                    |
+            | restriction | ab       | be     | ef      | no_uturn @ (Mo-Fr 07:00-11:00,16:00-18:30) |

        And the relations
            | type        | way:from | way:to | node:via | restriction:conditional                    |
            | restriction | ed       | dg     | d        | no_uturn @ (Mo-Fr 07:00-11:00,16:00-18:30) |

        When I route I should get
-            | from | to | route             |
-            | a    | f  | ab,bc,bc,be,ef,ef |
-            | f    | 1  | ef,eh,gh,dg,dg    |
+            | from | to | route          | #                                                                                         |
+            | a    | f  | ab,be,ef,ef    | currently we do not handle conditional via-ways, this test will have to change when we do |
+            | f    | 1  | ef,eh,gh,dg,dg |                                                                                           |

-    @restriction-way @overlap
-    Scenario: Car - prohibit turn
-        Given the extract extra arguments "--parse-conditional-restrictions"
-        # 5pm Wed 02 May, 2017 GMT
-        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
-        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
-
-        Given the node map
-            """
-            c
-            |
-            |   f
-            |   |
-            b---e
-            |   |
-            a   d
-            """
-
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | be    |
-            | de    |
-            | ef    |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction:conditional             |
-            | restriction | ab       | be      | de     | no_right_turn @ (Mo-Fr 07:00-11:00) |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction   |
-            | restriction | ab       | be      | de     | no_right_turn |
-
-        # condition is off, but the general restriction should take precedence
-        When I route I should get
-            | from | to | route             | turns                                                               | locations   |
-            | a    | d  | ab,be,ef,ef,de,de | depart,turn right,turn left,continue uturn,new name straight,arrive | a,b,e,f,e,d |
-            | a    | f  | ab,be,ef,ef       | depart,turn right,turn left,arrive                                  | a,b,e,f     |
-            | c    | d  | bc,be,de,de       | depart,turn left,turn right,arrive                                  | c,b,e,d     |
-            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |
-
-    @restriction-way @overlap
-    Scenario: Car - prohibit turn
-        Given the extract extra arguments "--parse-conditional-restrictions"
-        # 5pm Wed 02 May, 2017 GMT
-        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
-        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
-
-        Given the node map
-            """
-            c
-            |
-            |   f
-            |   |
-            b---e
-            |   |
-            |   d
-            |
-            a
-            """
-
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | be    |
-            | de    |
-            | ef    |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction:conditional             |
-            | restriction | ab       | be      | de     | no_right_turn @ (Mo-Fr 07:00-11:00) |
-
-        And the relations
-            | type        | way:from | node:via | way:to | restriction:conditional             |
-            | restriction | be       | e        | de     | no_right_turn @ (Mo-Fr 16:00-18:00) |
-
-        # way restriction is off, node-restriction is on
-        When I route I should get
-            | from | to | route             | turns                                                               | locations   |
-            | a    | d  | ab,be,ef,ef,de,de | depart,turn right,turn left,continue uturn,new name straight,arrive | a,b,e,f,e,d |
-            | a    | f  | ab,be,ef,ef       | depart,turn right,turn left,arrive                                  | a,b,e,f     |
-            | c    | d  | bc,be,ef,ef,de,de | depart,turn left,turn left,continue uturn,new name straight,arrive  | c,b,e,f,e,d |
-            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |
-
-    @restriction-way @overlap
-    Scenario: Car - prohibit turn
-        Given the extract extra arguments "--parse-conditional-restrictions"
-        # 5pm Wed 02 May, 2017 GMT
-        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
-        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
-
-        Given the node map
-            """
-            c
-            |
-            |   f
-            |   |
-            b---e
-            |   |
-            |   d
-            |
-            a
-            """
-
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | be    |
-            | de    |
-            | ef    |
-
-        And the relations
-            | type        | way:from | way:via | way:to | restriction:conditional             |
-            | restriction | ab       | be      | de     | no_right_turn @ (Mo-Fr 16:00-18:00) |
-
-        And the relations
-            | type        | way:from | node:via | way:to | restriction:conditional             |
-            | restriction | be       | e        | de     | no_right_turn @ (Mo-Fr 07:00-11:00) |
-
-        # node restrictino is off, way restriction is on
-        When I route I should get
-            | from | to | route             | turns                                                               | locations   |
-            | a    | d  | ab,be,ef,ef,de,de | depart,turn right,turn left,continue uturn,new name straight,arrive | a,b,e,f,e,d |
-            | a    | f  | ab,be,ef,ef       | depart,turn right,turn left,arrive                                  | a,b,e,f     |
-            | c    | d  | bc,be,de,de       | depart,turn left,turn right,arrive                                  | c,b,e,d     |
-            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |
@@ -50,7 +50,6 @@ Feature: Car - Handle ferry routes
            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 9 km/h  | 162.4s  |
            | c    | e  | cde,cde         | ferry,ferry                   | 5 km/h  | 151.4s  |
            | e    | c  | cde,cde         | ferry,ferry                   | 5 km/h  | 151.4s  |
-
    Scenario: Car - Properly handle simple durations
        Given the node map
            """
@@ -92,20 +91,3 @@ Feature: Car - Handle ferry routes
            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 18 km/h | 78.4s |
            | c    | e  | cde,cde         | ferry,ferry                   | 11 km/h | 67.4s |
            | e    | c  | cde,cde         | ferry,ferry                   | 11 km/h | 67.4s |
-
-	@snapping
-    Scenario: Car - Snapping when using a ferry
-        Given the node map
-            """
-            a b   c d   e f
-            """
-
-        And the ways
-            | nodes | highway | route | duration |
-            | ab    | primary |       |          |
-            | bcde  |         | ferry | 0:10     |
-            | ef    | primary |       |          |
-
-        When I route I should get
-            | from | to | route     | modes       | time  |
-            | c    | d  | bcde,bcde | ferry,ferry | 600s  |
@@ -0,0 +1,44 @@
+@routing @car @mode
+Feature: Car - Mode flag
+    Background:
+        Given the profile "car"
+
+    Scenario: Car - Mode when using a ferry
+        Given the node map
+            """
+            a b
+              c d
+            """
+
+        And the ways
+            | nodes | highway | route | duration |
+            | ab    | primary |       |          |
+            | bc    |         | ferry | 0:01     |
+            | cd    | primary |       |          |
+
+        When I route I should get
+            | from | to | route       | modes                         |
+            | a    | d  | ab,bc,cd,cd | driving,ferry,driving,driving |
+            | d    | a  | cd,bc,ab,ab | driving,ferry,driving,driving |
+            | c    | a  | bc,ab,ab    | ferry,driving,driving         |
+            | d    | b  | cd,bc,bc    | driving,ferry,ferry           |
+            | a    | c  | ab,bc,bc    | driving,ferry,ferry           |
+            | b    | d  | bc,cd,cd    | ferry,driving,driving         |
+
+    Scenario: Car - Snapping when using a ferry
+        Given the node map
+            """
+            a b   c d   e f
+            """
+
+        And the ways
+            | nodes | highway | route | duration |
+            | ab    | primary |       |          |
+            | bcde  |         | ferry | 0:10     |
+            | ef    | primary |       |          |
+
+        When I route I should get
+            | from | to | route     | modes       | time  |
+            | c    | d  | bcde,bcde | ferry,ferry | 600s  |
+
+
@@ -5,6 +5,22 @@ Feature: Car - Street names in instructions
        Given the profile "car"
        Given a grid size of 5 meters

+    Scenario: Car - A named street
+        Given the node map
+            """
+            a b
+              c
+            """
+
+        And the ways
+            | nodes | name     | ref |
+            | ab    | My Way   |     |
+            | bc    | Your Way | A1  |
+
+        When I route I should get
+            | from | to | route           | ref  |
+            | a    | c  | My Way,Your Way | ,A1|
+
    Scenario: Car - A named street with pronunciation
        Given the node map
            """
@@ -1,45 +0,0 @@
-@routing @car
-Feature: Car - Handle physical limitation
-
-    Background:
-        Given the profile "car"
-
-    Scenario: Car - Use a narrow way
-        Then routability should be
-            | highway | width  | narrow | bothw |
-            | primary |        |        | x     |
-            | primary | narrow |        | x     |
-            | primary |        | yes    | x     |
-            | primary | 1.8    |        |       |
-            | primary | 1.9    |        |       |
-            | primary | 2.0    |        | x     |
-            | primary | 2.1    |        | x     |
-            | primary | 1m     |        |       |
-            | primary | 1 m    |        |       |
-            | primary | 3 m    |        | x     |
-            | primary | 6'     |        |       |
-            | primary | 6'0"   |        |       |
-            | primary | 6'2"   |        |       |
-            | primary | 6'3"   |        | x     |
-            | primary | 7'     |        | x     |
-            | primary | 7'0"   |        | x     |
-
-    Scenario: Car - Limited by width
-        Then routability should be
-            | highway | maxwidth:physical | maxwidth | width | est_width | bothw |
-            | primary | 1                 |          |       |           |       |
-            | primary | 3                 |          |       |           | x     |
-            | primary |                   | 1        |       |           |       |
-            | primary |                   | 3        |       |           | x     |
-            | primary |                   |          | 1     |           |       |
-            | primary |                   |          | 3     |           | x     |
-            | primary |                   |          |       | 1         |       |
-            | primary |                   |          |       | 3         | x     |
-
-    Scenario: Car - Limited by height
-        Then routability should be
-            | highway | maxheight:physical | maxheight | bothw |
-            | primary | 1                  |           |       |
-            | primary | 3                  |           | x     |
-            | primary |                    | 1         |       |
-            | primary |                    | 3         | x     |
@@ -11,27 +11,27 @@ Feature: Car - Turn restrictions
    Scenario: Car - No left turn
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            w j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | cj    | yes    |
-            | aj    | -1     |
-            | dj    | -1     |
-            | bj    | -1     |
+            | sj    | yes    |
+            | nj    | -1     |
+            | wj    | -1     |
+            | ej    | -1     |

        And the relations
            | type        | way:from | way:to | node:via | restriction  |
-            | restriction | cj       | dj     | j        | no_left_turn |
+            | restriction | sj       | wj     | j        | no_left_turn |

        When I route I should get
            | from | to | route    |
-            | c    | d  |          |
-            | c    | a  | cj,aj,aj |
-            | c    | b  | cj,bj,bj |
+            | s    | w  |          |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |

    @no_turning
    Scenario: Car - No straight on
@@ -67,286 +67,253 @@ Feature: Car - Turn restrictions
    Scenario: Car - No right turn
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            w j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | cj    | yes    |
-            | aj    | -1     |
-            | dj    | -1     |
-            | bj    | -1     |
+            | sj    | yes    |
+            | nj    | -1     |
+            | wj    | -1     |
+            | ej    | -1     |

        And the relations
            | type        | way:from | way:to | node:via | restriction   |
-            | restriction | cj       | bj     | j        | no_right_turn |
+            | restriction | sj       | ej     | j        | no_right_turn |

        When I route I should get
            | from | to | route    |
-            | c    | d  | cj,dj,dj |
-            | c    | a  | cj,aj,aj |
-            | c    | b  |          |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  |          |

    @no_turning
    Scenario: Car - No u-turn
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            w j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | cj    | yes    |
-            | aj    | -1     |
-            | dj    | -1     |
-            | bj    | -1     |
+            | sj    | yes    |
+            | nj    | -1     |
+            | wj    | -1     |
+            | ej    | -1     |

        And the relations
            | type        | way:from | way:to | node:via | restriction |
-            | restriction | cj       | dj     | j        | no_u_turn   |
+            | restriction | sj       | wj     | j        | no_u_turn   |

        When I route I should get
            | from | to | route    |
-            | c    | d  |          |
-            | c    | a  | cj,aj,aj |
-            | c    | b  | cj,bj,bj |
+            | s    | w  |          |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |

    @no_turning
    Scenario: Car - Handle any no_* relation
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            w j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | cj    | yes    |
-            | aj    | -1     |
-            | dj    | -1     |
-            | bj    | -1     |
+            | sj    | yes    |
+            | nj    | -1     |
+            | wj    | -1     |
+            | ej    | -1     |

        And the relations
            | type        | way:from | way:to | node:via | restriction      |
-            | restriction | cj       | dj     | j        | no_weird_zigzags |
+            | restriction | sj       | wj     | j        | no_weird_zigzags |

        When I route I should get
            | from | to | route    |
-            | c    | d  |          |
-            | c    | a  | cj,aj,aj |
-            | c    | b  | cj,bj,bj |
-
-    @no_turning
-    Scenario: Car - Ignore no_*_on_red relations
-        Given the node map
-            """
-              a
-            d j b
-              c
-            """
-
-        And the ways
-            | nodes | oneway |
-            | cj    | yes    |
-            | aj    | -1     |
-            | dj    | -1     |
-            | bj    | -1     |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction          |
-            | restriction | cj       | dj     | j        | no_turn_on_red       |
-            | restriction | cj       | bj     | j        | no_right_turn_on_red |
-
-        When I route I should get
-            | from | to | route    |
-            | c    | d  | cj,dj,dj |
-            | c    | a  | cj,aj,aj |
-            | c    | b  | cj,bj,bj |
+            | s    | w  |          |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |

    @only_turning
    Scenario: Car - Only left turn
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            w j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | cj    | yes    |
-            | aj    | -1     |
-            | dj    | -1     |
-            | bj    | -1     |
+            | sj    | yes    |
+            | nj    | -1     |
+            | wj    | -1     |
+            | ej    | -1     |

        And the relations
            | type        | way:from | way:to | node:via | restriction    |
-            | restriction | cj       | dj     | j        | only_left_turn |
-
-        When I route I should get
-            | from | to | route    |
-            | c    | a  |          |
-            | c    | b  |          |
-            | c    | d  | cj,dj,dj |
+            | restriction | sj       | wj     | j        | only_left_turn |

    Scenario: Car - Only right turn, invalid
        Given the node map
            """
-              a
-            d j b r
-              c
+              n
+            w j e r
+              s
            """

        And the ways
            | nodes | oneway |
-            | cj    | yes    |
-            | aj    | -1     |
-            | dj    | -1     |
-            | bj    | -1     |
-            | rb    | -1     |
+            | sj    | yes    |
+            | nj    | -1     |
+            | wj    | -1     |
+            | ej    | -1     |
+            | re    | -1     |

        And the relations
            | type        | way:from | way:to | node:via | restriction   |
-            | restriction | cj       | br     | j        | only_right_on |
+            | restriction | sj       | er     | j        | only_right_on |

        When I route I should get
            | from | to | route       |
-            | c    | r  | cj,bj,rb,rb |
+            | s    | r  | sj,ej,re,re |

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

        And the ways
            | nodes | oneway |
-            | cj    | yes    |
-            | aj    | -1     |
-            | dj    | -1     |
-            | bj    | -1     |
+            | sj    | yes    |
+            | nj    | -1     |
+            | wj    | -1     |
+            | ej    | -1     |

        And the relations
            | type        | way:from | way:to | node:via | restriction     |
-            | restriction | cj       | bj     | j        | only_right_turn |
+            | restriction | sj       | ej     | j        | only_right_turn |

        When I route I should get
            | from | to | route    |
-            | c    | d  |          |
-            | c    | a  |          |
-            | c    | b  | cj,bj,bj |
+            | s    | w  |          |
+            | s    | n  |          |
+            | s    | e  | sj,ej,ej |

    @only_turning
    Scenario: Car - Only straight on
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            w j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | cj    | yes    |
-            | aj    | -1     |
-            | dj    | -1     |
-            | bj    | -1     |
+            | sj    | yes    |
+            | nj    | -1     |
+            | wj    | -1     |
+            | ej    | -1     |

        And the relations
            | type        | way:from | way:to | node:via | restriction      |
-            | restriction | cj       | aj     | j        | only_straight_on |
+            | restriction | sj       | nj     | j        | only_straight_on |

        When I route I should get
            | from | to | route    |
-            | c    | d  |          |
-            | c    | a  | cj,aj,aj |
-            | c    | b  |          |
+            | s    | w  |          |
+            | s    | n  | sj,nj,nj |
+            | s    | e  |          |

    @no_turning
    Scenario: Car - Handle any only_* restriction
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            w j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | cj    | yes    |
-            | aj    | -1     |
-            | dj    | -1     |
-            | bj    | -1     |
+            | sj    | yes    |
+            | nj    | -1     |
+            | wj    | -1     |
+            | ej    | -1     |

        And the relations
            | type        | way:from | way:to | node:via | restriction        |
-            | restriction | cj       | aj     | j        | only_weird_zigzags |
+            | restriction | sj       | nj     | j        | only_weird_zigzags |

        When I route I should get
            | from | to | route    |
-            | c    | d  |          |
-            | c    | a  | cj,aj,aj |
-            | c    | b  |          |
+            | s    | w  |          |
+            | s    | n  | sj,nj,nj |
+            | s    | e  |          |

    @specific
    Scenario: Car - :hgv-qualified on a standard turn restriction
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            w j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | cj    | yes    |
-            | aj    | -1     |
-            | dj    | -1     |
-            | bj    | -1     |
+            | sj    | yes    |
+            | nj    | -1     |
+            | wj    | -1     |
+            | ej    | -1     |

        And the relations
            | type        | way:from | way:to | node:via | restriction:hgv |
-            | restriction | cj       | aj     | j        | no_straight_on  |
+            | restriction | sj       | nj     | j        | no_straight_on  |

        When I route I should get
            | from | to | route    |
-            | c    | d  | cj,dj,dj |
-            | c    | a  | cj,aj,aj |
-            | c    | b  | cj,bj,bj |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |

    @specific
    Scenario: Car - :motorcar-qualified on a standard turn restriction
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            w j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | cj    | yes    |
-            | aj    | -1     |
-            | dj    | -1     |
-            | bj    | -1     |
+            | sj    | yes    |
+            | nj    | -1     |
+            | wj    | -1     |
+            | ej    | -1     |

        And the relations
            | type        | way:from | way:to | node:via | restriction:motorcar |
-            | restriction | cj       | aj     | j        | no_straight_on       |
+            | restriction | sj       | nj     | j        | no_straight_on       |

        When I route I should get
            | from | to | route    |
-            | c    | d  | cj,dj,dj |
-            | c    | a  |          |
-            | c    | b  | cj,bj,bj |
+            | s    | w  | sj,wj,wj |
+            | s    | n  |          |
+            | s    | e  | sj,ej,ej |

    @except
    Scenario: Car - Except tag and on no_ restrictions
@@ -517,27 +484,27 @@ Feature: Car - Turn restrictions
    Scenario: Car - Ignore unrecognized restriction
        Given the node map
            """
-              a
-            d j b
-              c
+              n
+            w j e
+              s
            """

        And the ways
            | nodes | oneway |
-            | cj    | yes    |
-            | aj    | -1     |
-            | dj    | -1     |
-            | bj    | -1     |
+            | sj    | yes    |
+            | nj    | -1     |
+            | wj    | -1     |
+            | ej    | -1     |

        And the relations
            | type        | way:from | way:to | node:via | restriction  |
-            | restriction | cj       | dj     | j        | yield        |
+            | restriction | sj       | wj     | j        | yield        |

        When I route I should get
            | from | to | route    |
-            | c    | d  | cj,dj,dj |
-            | c    | a  | cj,aj,aj |
-            | c    | b  | cj,bj,bj |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |

    @restriction @compression
    Scenario: Restriction On Compressed Geometry
@@ -602,7 +569,7 @@ Feature: Car - Turn restrictions
            | c    | d  | bc,be,de,de       | depart,turn left,turn right,arrive                                  | c,b,e,d     |
            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |

-    @restriction-way @overlap
+    @restriction @overlap
    Scenario: Car - prohibit turn
        Given the node map
            """
@@ -737,7 +704,7 @@ Feature: Car - Turn restrictions
            | a    | j  | left,first,right,right |
            | f    | e  | right,third,left,left  |

-    @restriction-way
+    @restriction
    Scenario: Car - allow only turn
        Given the node map
            """
@@ -769,7 +736,7 @@ Feature: Car - Turn restrictions
            | c    | d  | bc,be,de,de       | depart,turn left,turn right,arrive                                  | c,b,e,d     |
            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |

-    @restriction-way
+    @restriction
    Scenario: Car - allow only turn
        Given the node map
            """
@@ -798,7 +765,7 @@ Feature: Car - Turn restrictions
            | from | to | route       |
            | a    | d  | ab,be,de,de |

-    @restriction-way
+    @restriction
    Scenario: Multi Way restriction
        Given the node map
            """
@@ -835,7 +802,7 @@ Feature: Car - Turn restrictions
            | from | to | route                  |
            | a    | h  | horiz,vert,horiz,horiz |

-    @restriction-way
+    @restriction
    Scenario: Multi-Way overlapping single-way
        Given the node map
            """
@@ -874,7 +841,7 @@ Feature: Car - Turn restrictions
            | h    | d  | hfb,abcd,abcd        | depart,end of road right,arrive                  | h,b,d     |


-    @restriction-way
+    @restriction
    Scenario: Car - prohibit turn, traffic lights
        Given the node map
            """
@@ -917,7 +884,7 @@ Feature: Car - Turn restrictions
            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |


-      @restriction-way @overlap @geometry
+      @restriction @overlap @geometry
      Scenario: Geometry
        Given the node map
            """
@@ -952,7 +919,7 @@ Feature: Car - Turn restrictions
            | c    | d  | bc,bge,de,de       |
            | c    | f  | bc,bge,de,de,ef,ef |

-      @restriction-way @overlap @geometry @traffic-signals
+      @restriction @overlap @geometry @traffic-signals
      Scenario: Geometry
        Given the node map
            """
@@ -987,14 +954,14 @@ Feature: Car - Turn restrictions
        # this case is currently not handling the via-way restrictions and we need support for looking across traffic signals.
        # It is mainly included to show limitations and to prove that we don't crash hard here
        When I route I should get
-            | from | to | route              |
-            | a    | d  | ab,bge,ef,ef,de,de |
-            | a    | f  | ab,bge,ef,ef       |
-            | c    | d  | bc,bge,de,de       |
-            | c    | f  | bc,bge,de,de,ef,ef |
+            | from | to | route        |
+            | a    | d  | ab,bge,de,de |
+            | a    | f  | ab,bge,ef,ef |
+            | c    | d  | bc,bge,de,de |
+            | c    | f  | bc,bge,ef,ef |

      # don't crash hard on invalid restrictions
-      @restriction-way @invalid
+      @restriction @invalid
      Scenario: Geometry
        Given the node map
            """
@@ -1026,7 +993,7 @@ Feature: Car - Turn restrictions
            | a    | f  | ab,be,ef,ef |


-    @restriction @restriction-way @overlap @geometry
+    @restriction @overlap @geometry
    Scenario: Duplicated restriction
        Given the node map
            """
@@ -1,329 +0,0 @@
-@routing @car @relations
-Feature: Car - route relations
-    Background:
-        Given the profile "car"
-
-    Scenario: Assignment using relation membership roles
-        Given the profile file "car" initialized with
-        """
-        profile.cardinal_directions = true
-        """
-
-        Given the node map
-            """
-              a----------------b
-              c----------------d
-            """
-
-        And the ways
-            | nodes | name        | highway  | ref         |
-            | ba    | westbound   | motorway | I 80        |
-            | cd    | eastbound   | motorway | I 80;CO 93  |
-
-        And the relations
-            | type        | way:east | way:west | route | ref | network |
-            | route       | cd       | ba       | road  | 80  | US:I    |
-            | route       | cd       | ba       | road  | 93  | US:CO   |
-
-
-        When I route I should get
-            | waypoints | route                | ref                                              |
-            | b,a       | westbound,westbound  | I 80 $west,I 80 $west                            |
-            | c,d       | eastbound,eastbound  | I 80 $east; CO 93 $east,I 80 $east; CO 93 $east  |
-
-    Scenario: No cardinal directions by default
-        Given the profile file "car" initialized with
-        """
-        profile.cardinal_directions = false
-        """
-        Given the node map
-            """
-              a----------------b
-              c----------------d
-            """
-
-        And the ways
-            | nodes | name        | highway  | ref         |
-            | ba    | westbound   | motorway | I 80        |
-            | cd    | eastbound   | motorway | I 80;CO 93  |
-
-        And the relations
-            | type        | way:east | way:west | route | ref | network |
-            | route       | cd       | ba       | road  | 80  | US:I    |
-            | route       | cd       | ba       | road  | 93  | US:CO   |
-
-
-        When I route I should get
-            | waypoints | route                | ref                     |
-            | b,a       | westbound,westbound  | I 80,I 80               |
-            | c,d       | eastbound,eastbound  | I 80; CO 93,I 80; CO 93 |
-
-    Scenario: No cardinal directions by default
-        Given the node map
-            """
-              a----------------b
-              c----------------d
-            """
-
-        And the ways
-            | nodes | name        | highway  | ref         |
-            | ba    | westbound   | motorway | I 80        |
-            | cd    | eastbound   | motorway | I 80;CO 93  |
-
-        And the relations
-            | type        | way:east | way:west | route | ref | network |
-            | route       | cd       | ba       | road  | 80  | US:I    |
-            | route       | cd       | ba       | road  | 93  | US:CO   |
-
-
-        When I route I should get
-            | waypoints | route                | ref                     |
-            | b,a       | westbound,westbound  | I 80,I 80               |
-            | c,d       | eastbound,eastbound  | I 80; CO 93,I 80; CO 93 |
-
-
-    Scenario: Assignment using relation direction property (no role on members)
-        Given the profile file "car" initialized with
-        """
-        profile.cardinal_directions = true
-        """
-
-        Given the node map
-            """
-              a----------------b
-              c----------------d
-            """
-
-        And the ways
-            | nodes | name        | highway  | ref         |
-            | ba    | westbound   | motorway | I 80        |
-            | cd    | eastbound   | motorway | I 80;CO 93  |
-
-        And the relations
-            | type        | direction | way | route | ref | network |
-            | route       | west      | ba  | road  | 80  | US:I    |
-            | route       | east      | cd  | road  | 80  | US:I    |
-            | route       | east      | cd  | road  | 93  | US:CO   |
-
-        When I route I should get
-            | waypoints | route                | ref                                             |
-            | b,a       | westbound,westbound  | I 80 $west,I 80 $west                           |
-            | c,d       | eastbound,eastbound  | I 80 $east; CO 93 $east,I 80 $east; CO 93 $east |
-
-
-    Scenario: Forward assignment on one-way roads using relation direction property
-        Given the profile file "car" initialized with
-        """
-        profile.cardinal_directions = true
-        """
-
-        Given the node map
-            """
-              a----------------b
-              c----------------d
-            """
-
-        And the ways
-            | nodes | name        | highway  | ref         |
-            | ba    | westbound   | motorway | I 80        |
-            | cd    | eastbound   | motorway | I 80;CO 93  |
-
-        And the relations
-            | type        | direction | way:forward | route | ref | network |
-            | route       | west      | ba          | road  | 80  | US:I    |
-            | route       | east      | cd          | road  | 80  | US:I    |
-            | route       | east      | cd          | road  | 93  | US:CO   |
-
-        When I route I should get
-            | waypoints | route                | ref                                             |
-            | b,a       | westbound,westbound  | I 80 $west,I 80 $west                           |
-            | c,d       | eastbound,eastbound  | I 80 $east; CO 93 $east,I 80 $east; CO 93 $east |
-
-
-    Scenario: Forward/backward assignment on non-divided roads with role direction tag
-        Given the profile file "car" initialized with
-        """
-        profile.cardinal_directions = true
-        """
-
-        Given the node map
-            """
-              a----------------b
-            """
-
-        And the ways
-            | nodes | name      | highway  | ref   | oneway |
-            | ab    | mainroad  | motorway | I 80  | no     |
-
-        And the relations
-            | type        | direction | way:forward | route | ref | network |
-            | route       | west      | ab          | road  | 80  | US:I    |
-
-        And the relations
-            | type        | direction | way:backward | route | ref | network |
-            | route       | east      | ab           | road  | 80  | US:I    |
-
-        When I route I should get
-            | waypoints | route              | ref                    |
-            | a,b       | mainroad,mainroad  | I 80 $west,I 80 $west  |
-            | b,a       | mainroad,mainroad  | I 80 $east,I 80 $east  |
-
-
-    Scenario: Conflict between role and direction
-        Given the profile file "car" initialized with
-        """
-        profile.cardinal_directions = true
-        """
-
-        Given the node map
-            """
-              a----------------b
-            """
-
-        And the ways
-            | nodes | name       | highway  | ref   |
-            | ab    | eastbound  | motorway | I 80  |
-
-        And the relations
-            | type        | direction | way:east | route | ref | network |
-            | route       | west      | ab       | road  | 80  | US:I    |
-
-        When I route I should get
-            | waypoints | route                | ref       |
-            | a,b       | eastbound,eastbound  | I 80,I 80 |
-
-
-    Scenario: Conflict between role and superrelation direction
-        Given the profile file "car" initialized with
-        """
-        profile.cardinal_directions = true
-        """
-
-        Given the node map
-            """
-              a----------------b
-            """
-
-        And the ways
-            | nodes | name       | highway  | ref   |
-            | ab    | eastbound  | motorway | I 80  |
-
-        And the relations
-            | type        | way:east | route | ref | network | name         |
-            | route       | ab       | road  | 80  | US:I    | baserelation |
-
-        And the relations
-            | type        | direction | relation     | route | ref | network | name          |
-            | route       | west      | baserelation | road  | 80  | US:I    | superrelation |
-
-        When I route I should get
-            | waypoints | route               | ref       |
-            | a,b       | eastbound,eastbound | I 80,I 80 |
-
-    Scenario: Conflict between role and superrelation role
-        Given the profile file "car" initialized with
-        """
-        profile.cardinal_directions = true
-        """
-
-        Given the node map
-            """
-              a----------------b
-            """
-
-        And the ways
-            | nodes | name       | highway  | ref   |
-            | ab    | eastbound  | motorway | I 80  |
-
-        And the relations
-            | type        | way:east | route | ref | network | name         |
-            | route       | ab       | road  | 80  | US:I    | baserelation |
-
-        And the relations
-            | type        | relation:west  | route | ref | network | name          |
-            | route       | baserelation   | road  | 80  | US:I    | superrelation |
-
-        When I route I should get
-            | waypoints | route                | ref       |
-            | a,b       | eastbound,eastbound  | I 80,I 80 |
-
-    Scenario: Direction only available via superrelation role
-        Given the profile file "car" initialized with
-        """
-        profile.cardinal_directions = true
-        """
-
-        Given the node map
-            """
-              a----------------b
-            """
-
-        And the ways
-            | nodes | name       | highway  | ref   |
-            | ab    | eastbound  | motorway | I 80  |
-
-        And the relations
-            | type        | way:forward | route | ref | network | name         |
-            | route       | ab          | road  | 80  | US:I    | baserelation |
-
-        And the relations
-            | type        | relation:east  | route | ref | network | name          |
-            | route       | baserelation   | road  | 80  | US:I    | superrelation |
-
-        When I route I should get
-            | waypoints | route                | ref                   |
-            | a,b       | eastbound,eastbound  | I 80 $east,I 80 $east |
-
-    Scenario: Direction only available via superrelation direction
-        Given the profile file "car" initialized with
-        """
-        profile.cardinal_directions = true
-        """
-
-        Given the node map
-            """
-              a----------------b
-            """
-
-        And the ways
-            | nodes | name       | highway  | ref   |
-            | ab    | eastbound  | motorway | I 80  |
-
-        And the relations
-            | type        | way:forward | route | ref | network | name         |
-            | route       | ab          | road  | 80  | US:I    | baserelation |
-
-        And the relations
-            | type        | direction | relation     | route | ref | network | name          |
-            | route       | east      | baserelation | road  | 80  | US:I    | superrelation |
-
-        When I route I should get
-            | waypoints | route                | ref                   |
-            | a,b       | eastbound,eastbound  | I 80 $east,I 80 $east |
-
-
-#    Scenario: Three levels of indirection
-#        Given the node map
-#            """
-#              a----------------b
-#            """
-#
-#        And the ways
-#            | nodes | name       | highway  | ref   |
-#            | ab    | eastbound  | motorway | I 80  |
-#
-#        And the relations
-#            | type        | way:forward | route | ref | network | name         |
-#            | route       | ab          | road  | 80  | US:I    | baserelation |
-#
-#        And the relations
-#            | type        | relation     | route | ref | network | name           |
-#            | route       | baserelation | road  | 80  | US:I    | superrelation1 |
-#
-#        And the relations
-#            | type        | direction | relation       | route | ref | network | name           |
-#            | route       | east      | superrelation1 | road  | 80  | US:I    | superrelation2 |
-#
-#        When I route I should get
-#            | waypoints | route                | ref                   |
-#            | a,b       | eastbound,eastbound  | I 80 $east,I 80 $east |
@@ -4,7 +4,30 @@ Feature: Testbot - side bias
    Scenario: Left-hand bias
        Given the profile file "car" initialized with
        """
-        profile.properties.left_hand_driving = true
+        profile.left_hand_driving = true
+        profile.turn_bias = 1/1.075
+        """
+        Given the node map
+            """
+            a   b   c
+
+                d
+            """
+        And the ways
+            | nodes |
+            | ab    |
+            | bc    |
+            | bd    |
+
+        When I route I should get
+            | from | to | route    | time       |
+            | d    | a  | bd,ab,ab | 24s +-1    |
+            | d    | c  | bd,bc,bc | 27s +-1    |
+
+    Scenario: Right-hand bias
+        Given the profile file "car" initialized with
+        """
+        profile.left_hand_driving = true
        profile.turn_bias = 1.075
        """
        And the node map
@@ -20,37 +43,16 @@ Feature: Testbot - side bias
            | bd    |

        When I route I should get
-            | from | to | route    | time       | driving_side   |
-            | d    | a  | bd,ab,ab | 24s +-1    | left,left,left |
-            | d    | c  | bd,bc,bc | 27s +-1    | left,left,left |
-
-    Scenario: Right-hand bias
-        Given the profile file "car" initialized with
-        """
-        profile.properties.left_hand_driving = true
-        profile.turn_bias = 1 / 1.075
-        """
-        And the node map
-            """
-            a   b   c
-
-                d
-            """
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | bd    |
-
-        When I route I should get
-            | from | to | route    | time    | driving_side   | #                                   |
-            | d    | a  | bd,ab,ab | 27s +-1 | left,left,left | should be inverse of left hand bias |
-            | d    | c  | bd,bc,bc | 24s +-1 | left,left,left |                                     |
+            | from | to | route    | time       |
+            | d    | a  | bd,ab,ab | 27s +-1    |
+                                            # should be inverse of left hand bias
+            | d    | c  | bd,bc,bc | 24s +-1    |

    Scenario: Roundabout exit counting for left sided driving
-        Given the profile file "car" initialized with
+        Given the profile file "testbot" initialized with
        """
-        profile.properties.left_hand_driving = true
+        profile.left_hand_driving = true
+        profile.turn_bias = 1/1.075
        """
        And a grid size of 10 meters
        And the node map
@@ -70,74 +72,7 @@ Feature: Testbot - side bias
            | bcegb  | roundabout |

        When I route I should get
-           | waypoints | route    | driving_side   | turns                                         |
-           | a,d       | ab,cd,cd | left,left,left | depart,roundabout turn left exit-1,arrive     |
-           | a,f       | ab,ef,ef | left,left,left | depart,roundabout turn straight exit-2,arrive |
-           | a,h       | ab,gh,gh | left,left,left | depart,roundabout turn right exit-3,arrive    |
-
-
-    Scenario: Left-hand bias via location-dependent tags
-        Given the profile "car"
-        And the node map
-            """
-            a   b   c
-
-                d
-            """
-        And the ways with locations
-            | nodes |
-            | ab    |
-            | bc    |
-            | bd    |
-        And the extract extra arguments "--location-dependent-data test/data/regions/null-island.geojson"
-
-        When I route I should get
-            | from | to | route    | driving_side   | time       |
-            | d    | a  | bd,ab,ab | left,left,left | 24s +-1    |
-            | d    | c  | bd,bc,bc | left,left,left | 27s +-1    |
-
-
-    Scenario: Left-hand bias via OSM tags
-        Given the profile "car"
-        And the node map
-            """
-            a   b   c
-
-                d
-            """
-        And the ways with locations
-            | nodes | driving_side |
-            | ab    | right        |
-            | bc    | right        |
-            | bd    | right        |
-        And the extract extra arguments "--location-dependent-data test/data/regions/null-island.geojson"
-
-        When I route I should get
-            | from | to | route    | driving_side      | time       |
-            | d    | a  | bd,ab,ab | right,right,right | 27s +-1    |
-            | d    | c  | bd,bc,bc | right,right,right | 24s +-1    |
-
-    Scenario: changing sides
-        Given the profile "car"
-
-        # Note - the boundary in null-island.geojson is at lon = 2.0,
-        # and we use the "last node of the way" as the heuristic to detect
-        # whether the way is in our out of the driving_side polygon
-        And the node locations
-            | node | lat | lon  |
-            | a    | 0   | 0.5  |
-            | b    | 0   | 1.5  |
-            | c    | 0   | 2.5  |
-            | d    | 0   | 3.5  |
-
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | cd    |
-
-        And the extract extra arguments "--location-dependent-data test/data/regions/null-island.geojson"
-        When I route I should get
-            | from | to | route       | driving_side           |
-            | d    | a  | cd,bc,ab,ab | right,right,left,left  |
-            | a    | d  | ab,bc,cd,cd | left,right,right,right |
+           | waypoints | route    | turns                                         |
+           | a,d       | ab,cd,cd | depart,roundabout turn left exit-1,arrive     |
+           | a,f       | ab,ef,ef | depart,roundabout turn straight exit-2,arrive |
+           | a,h       | ab,gh,gh | depart,roundabout turn right exit-3,arrive    |
@@ -37,57 +37,3 @@ Feature: Car - Handle traffic lights
            | 3    | 4  |  13.1s | no turn with traffic light    |
            | g    | j  |  18.7s | turn with no traffic light    |
            | k    | n  |  20.7s | turn with traffic light       |
-
-
-    Scenario: Tarrif Signal Geometry
-        Given the query options
-            | overview   | full      |
-            | geometries | polyline  |
-
-        Given the node map
-            """
-            a - b - c
-            """
-
-        And the ways
-            | nodes | highway |
-            | abc   | primary |
-
-        And the nodes
-            | node | highway         |
-            | b    | traffic_signals |
-
-        When I route I should get
-            | from | to | route   | geometry       |
-            | a    | c  | abc,abc | _ibE_ibE?gJ?gJ |
-
-    @traffic
-    Scenario: Traffic update on the edge with a traffic signal
-        Given the node map
-            """
-            a - b - c
-            """
-
-        And the ways
-          | nodes | highway |
-          | abc   | primary |
-
-
-        And the nodes
-            | node | highway         |
-            | b    | traffic_signals |
-
-        And the contract extra arguments "--segment-speed-file {speeds_file}"
-        And the customize extra arguments "--segment-speed-file {speeds_file}"
-        And the speed file
-        """
-        1,2,65
-        2,1,65
-        """
-        And the query options
-          | annotations | datasources,nodes,speed,duration,weight |
-
-        When I route I should get
-          | from | to | route   | speed   | weights | time  | distances | a:datasources | a:nodes | a:speed | a:duration |  a:weight |
-          | a    | c  | abc,abc | 59 km/h | 24.2,0  | 24.2s | 399.9m,0m |           1:0 |  1:2:3  |   18:18 |  11.1:11.1 | 11.1:11.1 |
-          | c    | a  | abc,abc | 59 km/h | 24.2,0  | 24.2s | 399.9m,0m |           0:1 |  3:2:1  |   18:18 |  11.1:11.1 | 11.1:11.1 |
@@ -6,9 +6,9 @@ Feature: Car - weights
        And the node map
            """
            a--b--c
-               |  |
-               d  |
-               |  |
+               |
+               d
+               |
            e--f--g
            """
        And the ways
@@ -19,7 +19,7 @@ Feature: Car - weights
            | bdf   | service     |
        When I route I should get
            | from | to | route          | speed   | weight |
-            | a    | e  | abc,cg,efg,efg | 29 km/h | 122.4  |
+            | a    | e  | abc,cg,efg,efg | 28 km/h | 126.6  |
            | a    | d  | abc,bdf,bdf    | 18 km/h | 71.7   |

    Scenario: Does not jump off the highway to go down service road
@@ -59,7 +59,7 @@ Feature: Car - weights
        When I route I should get
            | from | to | route       | speed   | weight |
            | a    | d  | ab,bc,cd,cd | 65 km/h | 44.4   |
-            | a    | e  | ab,be,be    | 14 km/h | 111.8  |
+            | a    | e  | ab,be,be    | 14 km/h | 112    |

    Scenario: Distance weights
        Given the profile file "car" initialized with
@@ -10,7 +10,6 @@ Feature: Barriers
            |                | x     |
            | bollard        | x     |
            | gate           | x     |
-            | lift_gate      | x     |
            | cycle_barrier  | x     |
            | cattle_grid    | x     |
            | border_control | x     |
@@ -1,35 +0,0 @@
-@routing @foot
-Feature: Foot - Use distance weight
-
-    Background:
-        Given a grid size of 200 meters
-
-    Scenario: Foot - Check distance weight
-        Given the profile file
-        """
-        local functions = require('foot')
-        functions.setup_testbot = functions.setup
-
-        functions.setup = function()
-          local profile = functions.setup_testbot()
-          profile.properties.weight_name = 'distance'
-          return profile
-        end
-
-        return functions
-        """
-
-        Given the node map
-            """
-            a-b-c
-            """
-
-
-        And the ways
-            | nodes | highway     |
-            | abc   | residential |
-
-        When I route I should get
-            | from | to | route   | weight | time | distance |
-            | a    | b  | abc,abc |    200 | 144s | 200m +-1 |
-            | a    | c  | abc,abc |    400 | 288s | 400m +-1 |
@@ -21,7 +21,13 @@ Feature: Foot - Handle ferry routes
        When I route I should get
            | from | to | route           | modes                         |
            | a    | g  | abc,cde,efg,efg | walking,ferry,walking,walking |
+            | b    | f  | abc,cde,efg,efg | walking,ferry,walking,walking |
+            | e    | c  | cde,cde         | ferry,ferry                   |
+            | e    | b  | cde,abc,abc     | ferry,walking,walking         |
            | e    | a  | cde,abc,abc     | ferry,walking,walking         |
+            | c    | e  | cde,cde         | ferry,ferry                   |
+            | c    | f  | cde,efg,efg     | ferry,walking,walking         |
+            | c    | g  | cde,efg,efg     | ferry,walking,walking         |

    Scenario: Foot - Ferry duration, single node
        Given the node map
@@ -14,9 +14,25 @@ Feature: Foot - Street names in instructions

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

        When I route I should get
-            | from | to | route    | ref    |
-            | a    | c  | My Way,, | ,A7,A7 |
+            | 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
+        Given the node map
+            """
+            a b c d
+            """
+
+        And the ways
+            | nodes | highway | name |
+            | ab    | footway |      |
+            | bcd   | track   |      |
+
+        When I route I should get
+            | from | to | route |
+            | a    | d  | ,     |
@@ -0,0 +1,47 @@
+@routing @foot @ref @name
+Feature: Foot - Way ref
+
+    Background:
+        Given the profile "foot"
+
+    Scenario: Foot - Way with both name and ref
+        Given the node map
+            """
+            a b
+            """
+
+        And the ways
+            | nodes | name         | ref |
+            | ab    | Utopia Drive | E7  |
+
+        When I route I should get
+            | from | to | route                     | ref   |
+            | a    | b  | Utopia Drive,Utopia Drive | E7,E7 |
+
+    Scenario: Foot - Way with only ref
+        Given the node map
+            """
+            a b
+            """
+
+        And the ways
+            | nodes | name | ref |
+            | ab    |      | E7  |
+
+        When I route I should get
+            | from | to | route | ref   |
+            | a    | b  | ,     | E7,E7 |
+
+    Scenario: Foot - Way with only name
+        Given the node map
+            """
+            a b
+            """
+
+        And the ways
+            | nodes | name         |
+            | ab    | Utopia Drive |
+
+        When I route I should get
+            | from | to | route                     |
+            | a    | b  | Utopia Drive,Utopia Drive |
@@ -32,6 +32,84 @@ Feature: Foot - Turn restrictions
            | s    | n  | sj,nj,nj |
            | s    | e  | sj,ej,ej |

+    @no_turning
+    Scenario: Foot - No right turn
+        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       | ej     | j        | no_right_turn |
+
+        When I route I should get
+            | from | to | route    |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |
+
+    @no_turning
+    Scenario: Foot - No u-turn
+        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        | no_u_turn   |
+
+        When I route I should get
+            | from | to | route    |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |
+
+    @no_turning
+    Scenario: Foot - Handle any no_* relation
+        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        | no_weird_zigzags |
+
+        When I route I should get
+            | from | to | route    |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |
+
    @only_turning
    Scenario: Foot - Only left turn
        Given the node map
@@ -58,6 +136,84 @@ Feature: Foot - Turn restrictions
            | s    | n  | sj,nj,nj |
            | s    | e  | sj,ej,ej |

+    @only_turning
+    Scenario: Foot - Only right turn
+        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       | ej     | j        | only_right_turn |
+
+        When I route I should get
+            | from | to | route    |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |
+
+    @only_turning
+    Scenario: Foot - Only straight on
+        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       | nj     | j        | only_straight_on |
+
+        When I route I should get
+            | from | to | route    |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |
+
+    @no_turning
+    Scenario: Foot - Handle any only_* 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       | nj     | j        | only_weird_zigzags |
+
+        When I route I should get
+            | from | to | route    |
+            | s    | w  | sj,wj,wj |
+            | s    | n  | sj,nj,nj |
+            | s    | e  | sj,ej,ej |
+
    @except
    Scenario: Foot - Except tag and on no_ restrictions
        Given the node map
@@ -90,6 +246,30 @@ Feature: Foot - Turn restrictions
            | s    | c  | sj,cj,cj |
            | s    | d  | sj,dj,dj |

+    @except
+    Scenario: Foot - Except tag and on only_ restrictions
+        Given the node map
+            """
+            a   b
+              j
+              s
+            """
+
+        And the ways
+            | nodes | oneway |
+            | sj    | yes    |
+            | aj    | no     |
+            | bj    | no     |
+
+        And the relations
+            | type        | way:from | way:to | node:via | restriction      | except |
+            | restriction | sj       | aj     | j        | only_straight_on | foot   |
+
+        When I route I should get
+            | from | to | route    |
+            | s    | a  | sj,aj,aj |
+            | s    | b  | sj,bj,bj |
+
    @except
    Scenario: Foot - Multiple except tag values
        Given the node map
@@ -1,9 +1,10 @@
-@routing @foot @roundabout @instruction @todo
+@routing @foot @roundabout @instruction
 Feature: Roundabout Instructions

    Background:
        Given the profile "foot"

+    @todo
    Scenario: Foot - Roundabout instructions
    # You can walk in both directions on a roundabout, bu the normal roundabout instructions don't
    # make sense when you're going the opposite way around the roundabout.
@@ -26,7 +27,7 @@ Feature: Roundabout Instructions
            | abcda | roundabout |

        When I route I should get
-            | from | to | route | turns                           |
+            | from | to | route | turns                            |
            | s    | t  | sa,tb | depart,roundabout-exit-1,arrive |
            | s    | u  | sa,uc | depart,roundabout-exit-2,arrive |
            | s    | v  | sa,vd | depart,roundabout-exit-3,arrive |
@@ -47,7 +47,7 @@ Feature: Turn Lane Guidance
                          e
            a . . b . . . c g
                    `     .
-                      `   .
+                       `  .
                        ` d
                          f
            """
@@ -52,9 +52,9 @@ Feature: Turn Lane Guidance
            | dy    |                       |                     | YSt  |

       When I route I should get
-            | waypoints | route               | turns                                       | lanes                                                         |
-            | a,e       | MySt,MySt,MySt,MySt | depart,continue right,continue right,arrive | ,straight:false right:false right:true,left:false right:true, |
-            | e,a       | MySt,MySt,MySt,MySt | depart,continue left,continue left,arrive   | ,left:true left:false straight:false,left:true right:false,   |
+            | 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
@@ -553,8 +553,8 @@ Feature: Turn Lane Guidance
            | fy    |                            | primary |            |

        When I route I should get
-            | waypoints | route       | turns                                                 | lanes    |
-            | a,h       | ab,gh,gh,gh | depart,roundabout-exit-5,exit roundabout right,arrive |  ,;;;;,, |
+            | waypoints | route    | turns                           | lanes    |
+            | a,h       | ab,gh,gh | depart,roundabout-exit-5,arrive |  ,;;;;;, |

    @anticipate
    Scenario: No Lanes for Roundabouts, see #2626
@@ -569,16 +569,16 @@ Feature: Turn Lane Guidance
            | nodes | turn:lanes:forward         | highway | junction   | name       |
            | xb    | slight_right\|slight_right | primary |            | xb         |
            | dy    |                            | primary |            | dy         |
-            | ab    |                            | primary | roundabout | rotary     |
-            | bc    |                            | primary | roundabout | rotary     |
-            | cd    | left\|slight_right         | primary | roundabout | rotary     |
-            | da    |                            | primary | roundabout | rotary     |
+            | 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,dy      | depart,rotary-exit-1,exit rotary right,arrive | ,,,   |
-            | x,c       | xb,rotary,rotary | depart,rotary-exit-undefined,arrive           | ,,    |
-            | x,a       | xb,rotary,rotary | depart,rotary-exit-undefined,arrive           | ,;,   |
+            | 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
@@ -614,8 +614,8 @@ Feature: Turn Lane Guidance
            | fy    |                            | primary |            |

        When I route I should get
-            | waypoints | route       | turns                                                | lanes      |
-            | a,h       | ab,ch,ch,ch | depart,roundabout-exit-5,exit roundabout left,arrive | ,;;;;,,    |
+            | waypoints | route      | turns                           | lanes      |
+            | a,h       | ab,ch,ch   | depart,roundabout-exit-5,arrive | ,;;;;;,    |

    @anticipate
    Scenario: No Lanes for Roundabouts, see #2626
@@ -635,16 +635,16 @@ Feature: Turn Lane Guidance
            | nodes | turn:lanes:forward         | highway | junction   | name       |
            | xb    | slight_right\|slight_right | primary |            | xb         |
            | dy    |                            | primary |            | dy         |
-            | ab    |                            | primary | roundabout | rotary     |
-            | bc    |                            | primary | roundabout | rotary     |
-            | cd    | left\|slight_right         | primary | roundabout | rotary     |
-            | da    |                            | primary | roundabout | rotary     |
+            | 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,dy      | depart,rotary-exit-1,exit rotary right,arrive | ,,,   |
-            | x,c       | xb,rotary,rotary | depart,rotary-exit-undefined,arrive           | ,,    |
-            | x,a       | xb,rotary,rotary | depart,rotary-exit-undefined,arrive           | ,;,   |
+            | 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
@@ -780,8 +780,8 @@ Feature: Turn Lane Guidance
            | dy    |                                | YSt  |

       When I route I should get
-            | waypoints | route               | turns                                       | lanes                                                                        |
-            | a,e       | MySt,MySt,MySt,MySt | depart,continue right,continue right,arrive | ,straight:false straight:false right:false right:true,left:false right:true, |
+            | waypoints | route               | turns                                   | lanes                                                                        |
+            | a,e       | MySt,MySt,MySt,MySt | depart,continue right,turn right,arrive | ,straight:false straight:false right:false right:true,left:false right:true, |

    @anticipate
    Scenario: Don't Overdo It
@@ -98,11 +98,11 @@ Feature: Car - Guidance - Bridges and Tunnels
            | dce   | primary |        | Nebenstraße        |

        When I route I should get
-            | from | to | route                                      | turns                           |
-            | a    | d  | Hauptstraße,Nebenstraße,Nebenstraße        | depart,end of road left,arrive  |
-            | a    | e  | Hauptstraße,Nebenstraße,Nebenstraße        | depart,end of road 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        |
+            | 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
@@ -129,3 +129,4 @@ Feature: Car - Guidance - Bridges and Tunnels
            | 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,8 +1,5 @@
@routing  @guidance
-Feature: Circular
-
-    # Circular tags are treated just as rotaries. We can rely on the rotary tests for their handling on special cases.
-    # Here we only ensure that the `circular` tag is handled and assigned a rotary type
+Feature: Rotary

    Background:
        Given the profile "car"
@@ -27,16 +24,259 @@ Feature: Circular
            | bgecb  | circular |

       When I route I should get
-           | waypoints | route       | turns                                        |
-           | a,d       | ab,cd,cd,cd | depart,bgecb-exit-3,exit rotary right,arrive |
-           | a,f       | ab,ef,ef,ef | depart,bgecb-exit-2,exit rotary right,arrive |
-           | a,h       | ab,gh,gh,gh | depart,bgecb-exit-1,exit rotary right,arrive |
-           | d,f       | cd,ef,ef,ef | depart,bgecb-exit-3,exit rotary right,arrive |
-           | d,h       | cd,gh,gh,gh | depart,bgecb-exit-2,exit rotary right,arrive |
-           | d,a       | cd,ab,ab,ab | depart,bgecb-exit-1,exit rotary right,arrive |
-           | f,h       | ef,gh,gh,gh | depart,bgecb-exit-3,exit rotary right,arrive |
-           | f,a       | ef,ab,ab,ab | depart,bgecb-exit-2,exit rotary right,arrive |
-           | f,d       | ef,cd,cd,cd | depart,bgecb-exit-1,exit rotary right,arrive |
-           | h,a       | gh,ab,ab,ab | depart,bgecb-exit-3,exit rotary right,arrive |
-           | h,d       | gh,cd,cd,cd | depart,bgecb-exit-2,exit rotary right,arrive |
-           | h,f       | gh,ef,ef,ef | depart,bgecb-exit-1,exit rotary right,arrive |
+           | waypoints | route    | turns                      |
+           | a,d       | ab,cd,cd | depart,bgecb-exit-3,arrive |
+           | a,f       | ab,ef,ef | depart,bgecb-exit-2,arrive |
+           | a,h       | ab,gh,gh | depart,bgecb-exit-1,arrive |
+           | d,f       | cd,ef,ef | depart,bgecb-exit-3,arrive |
+           | d,h       | cd,gh,gh | depart,bgecb-exit-2,arrive |
+           | d,a       | cd,ab,ab | depart,bgecb-exit-1,arrive |
+           | f,h       | ef,gh,gh | depart,bgecb-exit-3,arrive |
+           | f,a       | ef,ab,ab | depart,bgecb-exit-2,arrive |
+           | f,d       | ef,cd,cd | depart,bgecb-exit-1,arrive |
+           | h,a       | gh,ab,ab | depart,bgecb-exit-3,arrive |
+           | h,d       | gh,cd,cd | depart,bgecb-exit-2,arrive |
+           | h,f       | gh,ef,ef | depart,bgecb-exit-1,arrive |
+
+    Scenario: Only Enter
+        Given the node map
+            """
+                a
+                b
+            d c   g h
+                e
+                f
+            """
+
+       And the ways
+            | nodes  | junction |
+            | ab     |          |
+            | cd     |          |
+            | ef     |          |
+            | gh     |          |
+            | bcegb  | circular |
+
+       When I route I should get
+           | waypoints | route          | turns                              |
+           | a,c       | ab,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | a,e       | ab,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | a,g       | ab,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | d,e       | cd,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | d,g       | cd,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | d,b       | cd,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | f,g       | ef,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | f,b       | ef,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | f,c       | ef,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | h,b       | gh,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | h,c       | gh,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | h,e       | gh,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+
+    Scenario: Only Exit
+        Given the node map
+            """
+                a
+                b
+            d c   g h
+                e
+                f
+            """
+
+       And the ways
+            | nodes  | junction |
+            | ab     |          |
+            | cd     |          |
+            | ef     |          |
+            | gh     |          |
+            | bcegb  | circular |
+
+       When I route I should get
+           | waypoints | route       | turns                      |
+           | b,d       | bcegb,cd,cd | depart,bcegb-exit-1,arrive |
+           | b,f       | bcegb,ef,ef | depart,bcegb-exit-2,arrive |
+           | b,h       | bcegb,gh,gh | depart,bcegb-exit-3,arrive |
+           | c,f       | bcegb,ef,ef | depart,bcegb-exit-1,arrive |
+           | c,h       | bcegb,gh,gh | depart,bcegb-exit-2,arrive |
+           | c,a       | bcegb,ab,ab | depart,bcegb-exit-3,arrive |
+           | e,h       | bcegb,gh,gh | depart,bcegb-exit-1,arrive |
+           | e,a       | bcegb,ab,ab | depart,bcegb-exit-2,arrive |
+           | e,d       | bcegb,cd,cd | depart,bcegb-exit-3,arrive |
+           | g,a       | bcegb,ab,ab | depart,bcegb-exit-1,arrive |
+           | g,d       | bcegb,cd,cd | depart,bcegb-exit-2,arrive |
+           | g,f       | bcegb,ef,ef | depart,bcegb-exit-3,arrive |
+      #phantom node snapping can result in a full round-trip here, therefore we cannot test b->a and the other direct exits
+
+    Scenario: Drive Around
+        Given the node map
+            """
+                a
+                b
+            d c   g h
+                e
+                f
+            """
+
+       And the ways
+            | nodes  | junction   |
+            | ab     |            |
+            | cd     |            |
+            | ef     |            |
+            | gh     |            |
+            | bcegb  | circular   |
+
+       When I route I should get
+           | waypoints | route       | turns         |
+           | b,c       | bcegb,bcegb | depart,arrive |
+           | b,e       | bcegb,bcegb | depart,arrive |
+           | b,g       | bcegb,bcegb | depart,arrive |
+           | c,e       | bcegb,bcegb | depart,arrive |
+           | c,g       | bcegb,bcegb | depart,arrive |
+           | c,b       | bcegb,bcegb | depart,arrive |
+           | e,g       | bcegb,bcegb | depart,arrive |
+           | e,b       | bcegb,bcegb | depart,arrive |
+           | e,c       | bcegb,bcegb | depart,arrive |
+           | g,b       | bcegb,bcegb | depart,arrive |
+           | g,c       | bcegb,bcegb | depart,arrive |
+           | g,e       | bcegb,bcegb | depart,arrive |
+
+     #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
+           """
+
+        And the ways
+           | nodes | junction | oneway |
+           | abc   |          | yes    |
+           | def   |          | yes    |
+           | ghi   |          | yes    |
+           | jkl   |          | yes    |
+           | bkheb | circular | yes    |
+
+        When I route I should get
+           | waypoints | route       | turns                       |
+           | a,c       | abc,abc,abc | depart,rotary-exit-1,arrive |
+           | a,l       | abc,jkl,jkl | depart,bkheb-exit-2,arrive  |
+           | a,i       | abc,ghi,ghi | depart,bkheb-exit-3,arrive  |
+           | a,f       | abc,def,def | depart,bkheb-exit-4,arrive  |
+           | d,f       | def,def,def | depart,rotary-exit-1,arrive |
+           | d,c       | def,abc,abc | depart,bkheb-exit-2,arrive  |
+           | d,l       | def,jkl,jkl | depart,bkheb-exit-3,arrive  |
+           | d,i       | def,ghi,ghi | depart,bkheb-exit-4,arrive  |
+           | g,i       | ghi,ghi,ghi | depart,rotary-exit-1,arrive |
+           | g,f       | ghi,def,def | depart,bkheb-exit-2,arrive  |
+           | g,c       | ghi,abc,abc | depart,bkheb-exit-3,arrive  |
+           | g,l       | ghi,jkl,jkl | depart,bkheb-exit-4,arrive  |
+           | j,l       | jkl,jkl,jkl | depart,rotary-exit-1,arrive |
+           | j,i       | jkl,ghi,ghi | depart,bkheb-exit-2,arrive  |
+           | j,f       | jkl,def,def | depart,bkheb-exit-3,arrive  |
+           | j,c       | jkl,abc,abc | depart,bkheb-exit-4,arrive  |
+
+       Scenario: Collinear in X,Y
+        Given the node map
+            """
+            a
+            b
+            c d f
+            e
+            """
+
+        And the ways
+            | nodes | junction |
+            | ab    |          |
+            | bcdb  | circular |
+            | 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
+            """
+            a
+            d
+            b c f
+            e
+            """
+
+        And the ways
+            | nodes | junction |
+            | ad    |          |
+            | bcdb  | circular |
+            | 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  | circular |
+            | 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
+            """
+
+        And the ways
+            | nodes | junction |
+            | ab    |          |
+            | bcdb  | circular |
+            | 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  | circular |
+            | 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 |
@@ -147,32 +147,3 @@ Feature: Collapse
            | waypoints | route            | turns                    |
            | a,d       | road,left,left   | depart,turn left,arrive  |
            | a,e       | road,right,right | depart,turn right,arrive |
-
-    # https://www.openstreetmap.org/#map=18/53.89755/27.54306
-    Scenario: Wide turn into invalid u-turn
-        Given the node map
-            """
-                      g
-                      |
-                      |
-                      f - - - - e
-                      |
-                      |
-                      |
-                h - - d
-                      |
-                      |
-                      |
-            a - - - - b - - - - c
-            """
-
-        And the ways
-            | nodes | highway   | name |
-            | abc   | secondary | road |
-            | bdfg  | service   |      |
-            | hd    | service   |      |
-            | fe    | service   |      |
-
-        When I route I should get
-            | waypoints | route   | turns                               |
-            | c,e       | road,,, | depart,turn right,turn right,arrive |
@@ -50,32 +50,6 @@ Feature: Collapse
            | i,h       | second,first,first   | depart,turn left,arrive      | i,f,h     |
            | i,l       | second,second,second | depart,continue uturn,arrive | i,f,l     |

-   	Scenario: Segregated Intersection, Cross Belonging to Single Street
-        Given the node map
-            """
-                  g
-
-            c     b   a
-            d     e   f
-
-                  h   i
-            """
-
-        And the ways
-            | nodes | highway | name   | oneway |
-            | ab    | primary | first  | yes    |
-            | bc    | primary | first  | yes    |
-            | de    | primary | first  | yes    |
-            | ef    | primary | first  | yes    |
-            | gb    | primary | second | no     |
-            | be    | primary | second | no     |
-            | eh    | primary | second | yes    |
-            | ei    | primary | third  | yes    |
-
-        When I route I should get
-            | waypoints | route                      | turns                                      | locations |
-            | a,i       | first,second,third,third   | depart,turn left,turn slight left,arrive   | a,b,e,i   |
-
    Scenario: Segregated Intersection, Cross Belonging to Correct Street
        Given the node map
            """
@@ -654,9 +628,9 @@ Feature: Collapse
            | cf    | secondary | bottom |

        When I route I should get
-            | waypoints | turns                                       | route               | locations |
-            | a,d       | depart,continue right,continue right,arrive | road,road,road,road | a,b,c,d   |
-            | d,a       | depart,continue left,continue left,arrive   | road,road,road,road | d,c,b,a   |
+            | waypoints | turns                                   | route               | locations |
+            | a,d       | depart,continue right,turn right,arrive | road,road,road,road | a,b,c,d   |
+            | d,a       | depart,continue left,turn left,arrive   | road,road,road,road | d,c,b,a   |

    Scenario: Forking before a turn
        Given the node map
@@ -1100,27 +1074,3 @@ Feature: Collapse
        When I route I should get
            | waypoints | bearings | route          | turns                                             | locations |
            | 1,2       | 90 270   | ab,bd,bd,ab,ab | depart,turn left,continue uturn,turn right,arrive | _,b,d,b,_ |
-
-
-    # https://www.openstreetmap.org/#map=18/37.74844/-122.40275
-    Scenario: Don't use destinations as names
-        Given the node map
-            """
-            f - - - - e - - - - d
-                      |
-                      |
-                      |
-                      |
-                      |
-            a - - - - b - - - - c
-            """
-
-        And the ways
-            | nodes | highway       | name  | oneway | destination:ref |
-            | abc   | residential   | road  | yes    |                 |
-            | def   | motorway_link |       | yes    | US 101          |
-            | be    | residential   | cross | no     |                 |
-
-        When I route I should get
-            | waypoints | route        | turns                                |
-            | a,f       | road,cross,, | depart,turn left,on ramp left,arrive |
@@ -22,40 +22,6 @@ Feature: Continue Instructions
            | a,c       | abc,abc,abc | depart,continue left,arrive |
            | a,d       | abc,bd,bd   | depart,turn straight,arrive |

-    Scenario: Road turning left, Suffix changes
-        Given the node map
-            """
-                c
-            a - b-d
-            """
-
-        And the ways
-            | nodes  | highway | name                    |
-            | ab     | primary | North Capitol Northeast |
-            | bc     | primary | North Capitol Northwest |
-            | bd     | primary | some random street      |
-
-       When I route I should get
-            | waypoints | route                                                                   | turns                       |
-            | a,c       | North Capitol Northeast,North Capitol Northwest,North Capitol Northwest | depart,continue left,arrive |
-
-    Scenario: Road turning left, Suffix changes, no-spaces
-        Given the node map
-            """
-                c
-            a - b-d
-            """
-
-        And the ways
-            | nodes  | highway | name                   |
-            | ab     | primary | North CapitolNortheast |
-            | bc     | primary | North CapitolNorthwest |
-            | bd     | primary | some random street     |
-
-       When I route I should get
-            | waypoints | route                                                                | turns                       |
-            | a,c       | North CapitolNortheast,North CapitolNorthwest,North CapitolNorthwest | depart,continue left,arrive |
-
    Scenario: Road turning left and straight
        Given the node map
            """
@@ -170,24 +136,3 @@ Feature: Continue Instructions
          | 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 |
-
-    Scenario: End-Of-Road Continue
-        Given the node map
-            """
-            a - b - c
-                |
-                d - e
-                |
-                f
-            """
-
-        And the ways
-            | nodes | highway | name |
-            | abc   | primary | road |
-            | bdf   | primary | road |
-            | ed    | primary | turn |
-
-
-        When I route I should get
-            | waypoints | route               | turns                                  |
-            | e,a       | turn,road,road,road | depart,turn right,continue left,arrive |
@@ -863,8 +863,8 @@ Feature: Slipways and Dedicated Turn Lanes
            | af    | primary | sliproad | yes    |

       When I route I should get
-            | waypoints | route                         | turns                                     | locations |
-            | s,g       | main,sliproad,another,another | depart,turn right,turn slight left,arrive | s,a,f,g   |
+            | waypoints | route                         | turns                              | locations |
+            | s,g       | main,sliproad,another,another | depart,turn right,turn left,arrive | s,a,f,g   |

    @sliproads:
    Scenario: Throughabout-Sliproad
@@ -905,8 +905,8 @@ Feature: Slipways and Dedicated Turn Lanes
            | restriction | yb       | be     | b        | only_straight |

        When I route I should get
-            | waypoints | route                | turns                                                              | locations |
-            | z,t       | through,,out,out,out | depart,off ramp slight right,round-exit-3,exit rotary right,arrive | z,s,c,e,t |
+            | waypoints | route            | turns                                            | locations |
+            | z,t       | through,,out,out | depart,off ramp slight right,round-exit-3,arrive | z,s,c,t   |

    Scenario: Sliproad before a roundabout
        Given the node map
@@ -942,158 +942,5 @@ Feature: Slipways and Dedicated Turn Lanes
            | restriction | bc       | cd     | c        | only_straight |

        When I route I should get
-            | waypoints | route    | turns                                                 | locations |
-            | a,k       | road,,,  | depart,turn right,roundabout turn right exit-1,arrive | a,b,h,k   |
-
-    @sliproads
-    Scenario: Sliproad with 4 roads at target
-        Given the node map
-            """
-                    d
-                    .
-            s . a . b  . c . t
-                 `  .   '
-                  ` .  '
-                   '.'
-                    e
-                    .
-                    f
-            """
-
-        And the ways
-            | nodes | highway      | name  | oneway |
-            | sabct | primary      | sabct |        |
-            | dbef  | primary      | dbef  |        |
-            | ae    | primary_link | ae    | yes    |
-            | ec    | primary_link | ec    | yes    |
-
-       When I route I should get
-            | waypoints | route            | turns                    | locations |
-            | s,f       | sabct,dbef,dbef  | depart,turn right,arrive | s,a,f     |
-            | f,t       | dbef,sabct,sabct | depart,turn right,arrive | f,e,t     |
-
-    @sliproads
-    Scenario: Sliproad and acute angle (50°) at the main intersection
-        Given the node map
-            """
-                          d
-                         /
-            s . a . .  b  . c
-                 `    /
-                  ' /
-                  e
-                 /
-                f
-            """
-
-        And the ways
-            | nodes | highway      | name  | oneway |
-            | sabc  | primary      | sabc  |        |
-            | dbef  | primary      | dbef  |        |
-            | ae    | primary_link | ae    | yes    |
-
-       When I route I should get
-            | waypoints | route          | turns                    | locations |
-            | s,f       | sabc,dbef,dbef | depart,turn right,arrive | s,a,f     |
-
-
-    @sliproads
-    Scenario: Sliproad from link via link to primary
-        Given the node map
-            """
-                    d
-                    .
-            s . a . b
-                 `  .
-                  ` .
-                   '.
-                    c
-                    .
-                    f
-            """
-
-        And the ways
-            | nodes | highway      | name | oneway |
-            | sab   | primary_link | sab  |        |
-            | dbcf  | primary      | dbcf |        |
-            | ac    | primary_link | ae   | yes    |
-
-       When I route I should get
-            | waypoints | route         | turns                    | locations |
-            | s,f       | sab,dbcf,dbcf | depart,turn right,arrive | s,a,f     |
-
-
-    @sliproads
-    Scenario: Sliproad with a single intersection in a cross-road
-        Given the node map
-            """
-                    d
-                    .
-            s . a . b
-                 `  .
-                  ' c . g
-                   ..
-                    e
-                    .
-                    f
-            """
-
-        And the ways
-            | nodes | highway      | name  | oneway |
-            | sab   | primary      | sab   |        |
-            | dbcef | primary      | dbcef |        |
-            | ae    | primary_link | sab   | yes    |
-            | cg    | primary      | cg    |        |
-
-       When I route I should get
-            | waypoints | route           | turns                    | locations |
-            | s,f       | sab,dbcef,dbcef | depart,turn right,arrive | s,a,f     |
-
-
-    @sliproads
-    Scenario: Sliproad converted from a fork
-        Given the node map
-            """
-                     d
-                     .
-                     b
-              s . a '.
-                    `c
-                     .
-                     f
-            """
-
-        And the ways
-            | nodes | highway  | name | ref   | oneway |
-            | sa    | tertiary |      | D 60A | yes    |
-            | ab    | tertiary | ab   | D 60A | yes    |
-            | ac    | tertiary |      | D 60A | yes    |
-            | dbcf  | tertiary | dbcf | D 543 | yes    |
-
-       When I route I should get
-            | waypoints | route      | turns                    | locations |
-            | s,f       | ,dbcf,dbcf | depart,turn right,arrive | s,a,f     |
-
-
-    @sliproads
-    Scenario: Sliproad to a road with a reference only
-        Given the node map
-            """
-            s . a . b . d
-                 `  .
-                  ' .
-                   ..
-                    c
-                    .
-                    f
-            """
-
-        And the ways
-            | nodes | highway      | name | ref  | oneway |
-            | sabd  | primary      | road |      |        |
-            | bcf   | primary      |      | K108 |        |
-            | ac    | primary_link |      |      | yes    |
-
-       When I route I should get
-            | waypoints | route  | turns                    | locations |
-            | s,f       | road,, | depart,turn right,arrive | s,a,f     |
+            | waypoints | route     | turns                                                 | locations |
+            | a,k       | road,,,   | depart,turn right,roundabout turn right exit-1,arrive | a,b,h,k   |
@@ -1,102 +0,0 @@
-@routing  @guidance
-Feature: Divided road entry
-
-    Background:
-        Given the profile "car"
-        Given a grid size of 5 meters
-
-    Scenario: Join on a divided road named after the main road
-        Given the node map
-            """
-            a-------b-----c
-                    |
-            d-------e-----f
-                    |
-                    |
-                    g
-            """
-
-        And the ways
-            | nodes  | name    | highway     | oneway |
-            | abc    | main st | residential | -1     |
-            | def    | main st | residential | yes    |
-            | be     | main st | residential |        |
-            | eg     | side st | residential |        |
-
-       When I route I should get
-            | waypoints | route                  | turns                   |
-            | g,a       | side st,main st,main st| depart,end of road left,arrive |
-
-
-    # Similar to previous one, but the joining way is tagged with the side-street name
-    Scenario: Join on a divided road, named after the side street
-        Given the node map
-            """
-            a-------b-----c
-                    |
-            d-------e-----f
-                    |
-                    |
-                    g
-            """
-
-        And the ways
-            | nodes  | name    | highway     | oneway |
-            | abc    | main st | residential | -1     |
-            | def    | main st | residential | yes    |
-            | beg    | side st | residential |        |
-
-       When I route I should get
-            | waypoints | route    | turns                           |
-            | g,a       | side st,main st,main st| depart,end of road left,arrive |
-
-
-    # Center join named after crossroad
-    Scenario: Crossing a divided road, named after side-street
-        Given the node map
-            """
-                    h
-                    |
-            a-------b-----c
-                    |
-            d-------e-----f
-                    |
-                    |
-                    g
-            """
-
-        And the ways
-            | nodes  | name    | highway     | oneway |
-            | abc    | main st | residential | -1     |
-            | def    | main st | residential | yes    |
-            | hbeg   | side st | residential |        |
-
-       When I route I should get
-            | waypoints | route    | turns                           |
-            | g,a       | side st,main st,main st| depart,turn left,arrive |
-
-    # Join named after divided road
-    Scenario: Crossing a divided road, named after main street
-        Given the node map
-            """
-                    h
-                    |
-            a-------b-----c
-                    |
-            d-------e-----f
-                    |
-                    |
-                    g
-            """
-
-        And the ways
-            | nodes  | name    | highway     | oneway |
-            | abc    | main st | residential | -1     |
-            | def    | main st | residential | yes    |
-            | be     | main st | residential |        |
-            | hb     | side st | residential |        |
-            | eg     | side st | residential |        |
-
-       When I route I should get
-            | waypoints | route    | turns                           |
-            | g,a       | side st,main st,main st| depart,turn left,arrive |
@@ -24,25 +24,6 @@ Feature: End Of Road Instructions
            | a,c       | aeb,cbd,cbd | depart,end of road left,arrive  |
            | a,d       | aeb,cbd,cbd | depart,end of road right,arrive |

-    # http://map.project-osrm.org/?z=18&center=38.906632%2C-77.008265&loc=38.906463%2C-77.007621&loc=38.906822%2C-77.008860&hl=en&alt=0
-    Scenario: End of Road, unnamed oneway
-        Given the node map
-            """
-                c
-            a e b
-              f d
-            """
-
-        And the ways
-            | nodes  | highway | name | oneway |
-            | aeb    | primary | road | yes    |
-            | cbd    | primary |      | yes    |
-            | ef     | primary | turn | yes    |
-
-       When I route I should get
-            | waypoints | route  | turns                           |
-            | a,d       | road,, | depart,end of road right,arrive |
-
    @3605
    Scenario: End of Road with oneway through street
        Given the node map
@@ -140,9 +140,9 @@ Feature: Intersections Data

        When I route I should get
            | waypoints | route          | intersections                                                                                                                 |
-            | e,f       | ea,fb,fb,fb    | true:180;false:0 false:150 true:210;false:30 true:150 true:270;true:90                                                        |
-            | e,g       | ea,gc,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,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,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,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                                                       |
@@ -354,9 +354,9 @@ Feature: Merge Segregated Roads
            | hb    | road   | yes    |

        When I route I should get
-            | waypoints | turns         | route       | intersections									  |
+            | waypoints | turns         | route       | intersections 									  |
            | a,f       | depart,arrive | road,road   | true:180,false:0 true:180,false:0 true:180;true:0 |
-            | c,f       | depart,arrive | bridge,road | true:180,false:0 true:180;true:0				  |
+            | c,f       | depart,arrive | bridge,road | true:180,false:0 true:180;true:0 				  |
            | 1,f       | depart,arrive | bridge,road | true:180,false:0 true:180;true:0                  |
            | f,a       | depart,arrive | road,road   | true:0,true:0 false:180,true:0 false:180;true:180 |
            | g,a       | depart,arrive | bridge,road | true:0,true:0 false:180;true:180                  |
@@ -393,44 +393,31 @@ Feature: Merge Segregated Roads
            """
              a
              |
-              b-----z
-             / \
+              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    |
-            | bz    | cross | no  |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction  |
-            | restriction | bz       | bcde   | b        | no_left_turn |
+            | 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       |
-            | z,a       | depart,turn right,arrive | cross,road,road |
+            | 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: Traffic Island
        Given the node map
@@ -531,183 +518,8 @@ Feature: Merge Segregated Roads

        # the goal here should be not to mention the intersection in the middle at all and also suppress the segregated parts
        When I route I should get
-            | waypoints | route            | intersections																																	|
+            | waypoints | route            | intersections																																    |
            | a,l       | horiz,vert,vert  | true:90;false:0 true:60 true:90 true:180 false:270,true:60 false:120 false:240 false:300,true:0 false:90 false:180 false:240 true:270;true:180 |
-            | a,d       | horiz,horiz      | true:90,false:0 true:60 true:90 true:180 false:270,false:0 true:90 false:180 false:270 true:300;true:270										|
+            | a,d       | horiz,horiz      | true:90,false:0 true:60 true:90 true:180 false:270,false:0 true:90 false:180 false:270 true:300;true:270									    |
            | j,h       | vert,horiz,horiz | true:0;true:0 true:90 false:180 false:270 true:300,false:60 false:120 false:240 true:300,false:0 false:90 false:120 true:180 true:270;true:90  |
-            | j,l       | vert,vert        | true:0,true:0 true:90 false:180 false:270 true:300,true:0 false:90 false:180 true:240 false:270;true:180										|
-
-
-    Scenario: Square Area - Don't merge almost circular roads
-        Given a grid size of 2 meters
-        Given the node map
-            """
-                           i
-                       b    `
-                         `   `    p .
-                  a        ` g` `     \         f
-                   \      /             o      /
-                     \   /               \    /
-                  h - - c                  n /
-                        \                  \/
-                         k                  e
-                         \               /
-                          l            /
-                            \        /
-                              m  . d
-                                  /
-                                 j
-            """
-
-        And the ways
-            | nodes       | name           | oneway |
-            | ac          | Halenseestraße | yes    |
-            | gb          | Halenseestraße | yes    |
-            | cklmdenopgc | Rathenauplatz  | yes    |
-            | ig          | Kurfürstendamm | yes    |
-            | ef          | Kurfürstendamm | yes    |
-            | ch          | Hubertusallee  | yes    |
-            | jd          | Hubertusallee  | yes    |
-
-        When I route I should get
-            | waypoints | route                                                    | turns                               |
-            | i,h       | Kurfürstendamm,Rathenauplatz,Hubertusallee,Hubertusallee | depart,turn right,turn right,arrive |
-
-    # https://www.openstreetmap.org/#map=19/52.46339/13.40272
-    Scenario: Do not merge links between segregated roads
-        Given the node map
-            """
-            f
-              `````````` ..............
-                                        ` ` ` `  e - - - - - - - d
-            a                                    1
-             ```````````..............           |
-                                      `````````` b - - - - - - - c
-                                                 |
-                                                 |
-                                                 |
-                                                 |
-                                                 g
-            """
-
-        And the ways
-            | nodes | name | oneway |
-            | ab    | germ | yes    |
-            | bc    | ober | yes    |
-            | de    | ober | yes    |
-            | ef    | germ | yes    |
-            | eb    | germ | no     |
-            | gb    | germ | no     |
-
-        When I route I should get
-            | waypoints | route          | turns                        |
-            | a,c       | germ,ober      | depart,arrive                |
-            | a,g       | germ,germ,germ | depart,continue right,arrive |
-            | a,1       | germ,germ,germ | depart,continue left,arrive  |
-            | d,g       | ober,germ,germ | depart,turn left,arrive      |
-
-    # https://www.openstreetmap.org/#map=19/51.32888/6.57059
-    Scenario: Places in presence of oneways
-        Given the node map
-            """
-                    i                                                                                                           l
-                    |                                                                                                           |
-                    |                                                                                                           |
-                    g - - - - - - - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - f
-                    |                                                                                                           |
-                    |                                                                                                           |
-            a - - - b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - - - - - - - - - - - - - - - c - - - d
-                    |                                                                                                           |
-                    |                                                                                                           |
-                    j                                                                                                           k
-            """
-
-        And the ways
-            | nodes | name     | oneway |
-            | ab    | schwert  | yes    |
-            | cd    | schwert  | yes    |
-            | ig    | luise    | yes    |
-            | bj    | luise    | yes    |
-            | kc    | marianne | yes    |
-            | fl    | marianne | yes    |
-            | bc    | albrecht | no     |
-            | fg    | albrecht | no     |
-            | gb    | albrecht | yes    |
-            | cf    | albrecht | yes    |
-
-        When I route I should get
-            | waypoints | route                              | turns                                          |
-            | a,l       | schwert,albrecht,marianne,marianne | depart,new name straight,turn left,arrive      |
-            | a,j       | schwert,luise,luise                | depart,turn right,arrive                       |
-            | a,1       | schwert,albrecht,albrecht,albrecht | depart,new name straight,continue uturn,arrive |
-            | k,l       | marianne,marianne                  | depart,arrive                                  |
-            | k,j       | marianne,albrecht,luise,luise      | depart,turn left,turn left,arrive              |
-            | k,d       | marianne,schwert,schwert           | depart,turn right,arrive                       |
-            | i,j       | luise,luise                        | depart,arrive                                  |
-            | i,d       | luise,albrecht,schwert,schwert     | depart,turn left,turn straight,arrive          |
-            | i,l       | luise,albrecht,marianne,marianne   | depart,turn left,turn left,arrive              |
-
-    # https://www.openstreetmap.org/#map=19/52.46339/13.40272
-    Scenario: Do not merge links between segregated roads
-        Given the node map
-            """
-                                                               d
-            f...............                                   |
-                            `````````` ..............          |
-            a...............                          ` ` ` `  e
-                            ``````````..............           1
-                                                    `````````` b
-                                                                    - - - - - - - c
-            """
-
-        And the ways
-            | nodes | name | oneway |
-            | ab    | otto | yes    |
-            | bc    | otto | no     |
-            | de    | neu  | no     |
-            | ef    | otto | yes    |
-            | eb    | otto | no     |
-
-        When I route I should get
-            | waypoints | route               | turns                                      | #	|
-            | a,c       | otto,otto           | depart,arrive                              |	|
-			| a,f       | otto,otto,otto      | depart,continue uturn,arrive               |    |
-			| a,1       | otto,otto,otto      | depart,continue left,arrive                |    |
-			| a,d       | otto,neu,neu        | depart,turn left,arrive                    |    |
-            | c,1       | otto,otto           | depart,arrive                              |    |
-            | c,f       | otto,otto,otto      | depart,continue left,arrive                | Ideally, this would be depart,arrive, but the obvious discovery making the turn onto `1` from `c` obvious interferes here |
-
-    # https://www.openstreetmap.org/#map=18/50.94608/7.02030
-    Scenario: Do not merge oneway places
-        Given the node map
-            """
-                                j
-                                |
-                                |
-            g - f - - - - - - - e
-                |               |
-                |               |
-                |               d
-                |                \
-                |                .c.
-                a - - - - - - b`    `
-                |                    `
-                |                      ` h
-                |
-                |
-                i
-            """
-
-        And the ways
-            | nodes | name | oneway |
-            | efabc | kobe | yes    |
-            | edc   | kobe | no     |
-            | fg    | arn  | no     |
-            | ia    | kobu | yes    |
-            | hc    | wei  | no     |
-            | ej    | wei  | no     |
-
-        When I route I should get
-            | waypoints | route          | turns                       |
-            | j,h       | wei,wei		 | depart,arrive			   |
-            | a,d       | kobe,kobe,kobe | depart,continue left,arrive |
+            | j,l       | vert,vert        | true:0,true:0 true:90 false:180 false:270 true:300,true:0 false:90 false:180 true:240 false:270;true:180									    |
@@ -126,24 +126,3 @@ Feature: Merging
        When I route I should get
            | waypoints | route      | turns                            |
            | d,c       | ,A100,A100 | depart,merge slight right,arrive |
-
-
-    # https://www.openstreetmap.org/way/254299122
-    @merge
-    Scenario: Merge onto a motorway with junction references
-        Given the node map
-            """
-            a     b      c     d
-            e                  f
-            """
-
-        And the ways
-            | nodes | name | junction:ref | highway       | oneway |
-            | abc   | A100 |              | motorway      | yes    |
-            | cd    | A100 | 1A           | motorway      | yes    |
-            | eb    |      |              | motorway_link | yes    |
-            | cf    |      | 1B           | motorway_link | yes    |
-
-        When I route I should get
-            | waypoints | route      | turns                           |
-            | e,d       | ,A100,A100 | depart,merge slight left,arrive |
@@ -274,8 +274,8 @@ Feature: New-Name Instructions
            | bc    | Central Expressway       | US 75 | motorway |

        When I route I should get
-            | waypoints | route                                       | turns         |
-            | a,c       | North Central Expressway,Central Expressway | depart,arrive |
+            | waypoints | route                                                          | turns                           |
+            | a,c       | North Central Expressway,Central Expressway,Central Expressway | depart,new name straight,arrive |

    Scenario: Prefix Change
        Given the node map
@@ -289,8 +289,8 @@ Feature: New-Name Instructions
            | cb    | Central Expressway       | US 75 | motorway |

        When I route I should get
-            | waypoints | route                                       | turns         |
-            | c,a       | Central Expressway,North Central Expressway | depart,arrive |
+            | 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
@@ -36,36 +36,6 @@ Feature: Simple Turns
            | f,a       | depart,arrive                   | road,road      | true:0,true:0 false:150 false:180;true:180   |
            | e,a       | depart,turn slight right,arrive | turn,road,road | true:333;true:0 false:150 false:180;true:180 |

-    Scenario: Turning into splitting road - no improvement
-        Given the node map
-            """
-                a
-                b
-              / |
-            c   d - e
-            |   |
-            |   |
-            |   |
-            |   |
-            |   |
-            |   |
-            |   |
-            |   |
-            g   f
-            """
-
-        And the ways
-            | nodes | name | highway | oneway |
-            | ab    | road | primary | no     |
-            | bcg   | road | primary | yes    |
-            | fdb   | road | primary | yes    |
-            | ed    | turn | primary | yes    |
-
-        When I route I should get
-            | waypoints | turns                    | route          | intersections                               |
-            | f,a       | depart,arrive            | road,road      | true:0,true:0 false:90 false:180;true:180   |
-            | e,a       | depart,turn right,arrive | turn,road,road | true:270;true:0 false:90 false:180;true:180 |
-
    Scenario: Turning into splitting road
        Given the node map
        """
@@ -127,7 +97,5 @@ Feature: Simple Turns
            | ei    | left  | yes    |

        When I route I should get
-            | waypoints | route          | turns                           |
-            | g,a       | in,road,road   | depart,fork slight right,arrive |
-            | g,h       | in,right,right | depart,fork straight,arrive     |
-            | g,i       | in,left,left   | depart,fork slight left,arrive  |
+            | waypoints | route        | turns                    |
+            | g,a       | in,road,road | depart,fork right,arrive |
@@ -0,0 +1,177 @@
+@routing  @guidance
+Feature: Rotary
+
+    Background:
+        Given the profile "bicycle"
+        Given a grid size of 30 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,bgecb-exit-3,arrive |
+           | a,f       | ab,ef,ef | depart,bgecb-exit-2,arrive |
+           | a,h       | ab,gh,gh | depart,bgecb-exit-1,arrive |
+           | d,f       | cd,ef,ef | depart,bgecb-exit-3,arrive |
+           | d,h       | cd,gh,gh | depart,bgecb-exit-2,arrive |
+           | d,a       | cd,ab,ab | depart,bgecb-exit-1,arrive |
+           | f,h       | ef,gh,gh | depart,bgecb-exit-3,arrive |
+           | f,a       | ef,ab,ab | depart,bgecb-exit-2,arrive |
+           | f,d       | ef,cd,cd | depart,bgecb-exit-1,arrive |
+           | h,a       | gh,ab,ab | depart,bgecb-exit-3,arrive |
+           | h,d       | gh,cd,cd | depart,bgecb-exit-2,arrive |
+           | h,f       | gh,ef,ef | depart,bgecb-exit-1,arrive |
+
+    Scenario: Only Enter
+        Given the node map
+            """
+                a
+                b
+            d c   g h
+                e
+                f
+            """
+
+       And the ways
+            | nodes  | junction   |
+            | ab     |            |
+            | cd     |            |
+            | ef     |            |
+            | gh     |            |
+            | bcegb  | roundabout |
+
+       When I route I should get
+           | waypoints | route          | turns                              |
+           | a,c       | ab,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | a,e       | ab,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | a,g       | ab,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | d,e       | cd,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | d,g       | cd,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | d,b       | cd,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | f,g       | ef,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | f,b       | ef,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | f,c       | ef,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | h,b       | gh,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | h,c       | gh,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+           | h,e       | gh,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
+
+    Scenario: Only Exit
+        Given the node map
+            """
+                a
+                b
+            d c   g h
+                e
+                f
+            """
+
+       And the ways
+            | nodes  | junction   |
+            | ab     |            |
+            | cd     |            |
+            | ef     |            |
+            | gh     |            |
+            | bcegb  | roundabout |
+
+       When I route I should get
+           | waypoints | route       | turns                      |
+           | b,d       | bcegb,cd,cd | depart,bcegb-exit-1,arrive |
+           | b,f       | bcegb,ef,ef | depart,bcegb-exit-2,arrive |
+           | b,h       | bcegb,gh,gh | depart,bcegb-exit-3,arrive |
+           | c,f       | bcegb,ef,ef | depart,bcegb-exit-1,arrive |
+           | c,h       | bcegb,gh,gh | depart,bcegb-exit-2,arrive |
+           | c,a       | bcegb,ab,ab | depart,bcegb-exit-3,arrive |
+           | e,h       | bcegb,gh,gh | depart,bcegb-exit-1,arrive |
+           | e,a       | bcegb,ab,ab | depart,bcegb-exit-2,arrive |
+           | e,d       | bcegb,cd,cd | depart,bcegb-exit-3,arrive |
+           | g,a       | bcegb,ab,ab | depart,bcegb-exit-1,arrive |
+           | g,d       | bcegb,cd,cd | depart,bcegb-exit-2,arrive |
+           | g,f       | bcegb,ef,ef | depart,bcegb-exit-3,arrive |
+      #phantom node snapping can result in a full round-trip here, therefore we cannot test b->a and the other direct exits
+
+    Scenario: Drive Around
+        Given the node map
+            """
+                a
+                b
+            d c   g h
+                e
+                f
+            """
+
+       And the ways
+            | nodes  | junction   |
+            | ab     |            |
+            | cd     |            |
+            | ef     |            |
+            | gh     |            |
+            | bcegb  | roundabout |
+
+       When I route I should get
+           | waypoints | route       | turns         |
+           | b,c       | bcegb,bcegb | depart,arrive |
+           | b,e       | bcegb,bcegb | depart,arrive |
+           | b,g       | bcegb,bcegb | depart,arrive |
+           | c,e       | bcegb,bcegb | depart,arrive |
+           | c,g       | bcegb,bcegb | depart,arrive |
+           | c,b       | bcegb,bcegb | depart,arrive |
+           | e,g       | bcegb,bcegb | depart,arrive |
+           | e,b       | bcegb,bcegb | depart,arrive |
+           | e,c       | bcegb,bcegb | depart,arrive |
+           | g,b       | bcegb,bcegb | depart,arrive |
+           | g,c       | bcegb,bcegb | depart,arrive |
+           | g,e       | bcegb,bcegb | depart,arrive |
+
+     #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
+           """
+
+        And the ways
+           | nodes | junction   | oneway |
+           | abc   |            | yes    |
+           | def   |            | yes    |
+           | ghi   |            | yes    |
+           | jkl   |            | yes    |
+           | bkheb | roundabout | yes    |
+
+        When I route I should get
+           | waypoints | route       | turns                       |
+           | a,c       | abc,abc,abc | depart,rotary-exit-1,arrive |
+           | a,l       | abc,jkl,jkl | depart,bkheb-exit-2,arrive  |
+           | a,i       | abc,ghi,ghi | depart,bkheb-exit-3,arrive  |
+           | a,f       | abc,def,def | depart,bkheb-exit-4,arrive  |
+           | d,f       | def,def,def | depart,rotary-exit-1,arrive |
+           | d,c       | def,abc,abc | depart,bkheb-exit-2,arrive  |
+           | d,l       | def,jkl,jkl | depart,bkheb-exit-3,arrive  |
+           | d,i       | def,ghi,ghi | depart,bkheb-exit-4,arrive  |
+           | g,i       | ghi,ghi,ghi | depart,rotary-exit-1,arrive |
+           | g,f       | ghi,def,def | depart,bkheb-exit-2,arrive  |
+           | g,c       | ghi,abc,abc | depart,bkheb-exit-3,arrive  |
+           | g,l       | ghi,jkl,jkl | depart,bkheb-exit-4,arrive  |
+           | j,l       | jkl,jkl,jkl | depart,rotary-exit-1,arrive |
+           | j,i       | jkl,ghi,ghi | depart,bkheb-exit-2,arrive  |
+           | j,f       | jkl,def,def | depart,bkheb-exit-3,arrive  |
+           | j,c       | jkl,abc,abc | depart,bkheb-exit-4,arrive  |
@@ -24,19 +24,19 @@ Feature: Rotary
            | bgecb  | roundabout |

       When I route I should get
-           | waypoints | route       | turns                                        |
-           | a,d       | ab,cd,cd,cd | depart,bgecb-exit-3,exit rotary right,arrive |
-           | a,f       | ab,ef,ef,ef | depart,bgecb-exit-2,exit rotary right,arrive |
-           | a,h       | ab,gh,gh,gh | depart,bgecb-exit-1,exit rotary right,arrive |
-           | d,f       | cd,ef,ef,ef | depart,bgecb-exit-3,exit rotary right,arrive |
-           | d,h       | cd,gh,gh,gh | depart,bgecb-exit-2,exit rotary right,arrive |
-           | d,a       | cd,ab,ab,ab | depart,bgecb-exit-1,exit rotary right,arrive |
-           | f,h       | ef,gh,gh,gh | depart,bgecb-exit-3,exit rotary right,arrive |
-           | f,a       | ef,ab,ab,ab | depart,bgecb-exit-2,exit rotary right,arrive |
-           | f,d       | ef,cd,cd,cd | depart,bgecb-exit-1,exit rotary right,arrive |
-           | h,a       | gh,ab,ab,ab | depart,bgecb-exit-3,exit rotary right,arrive |
-           | h,d       | gh,cd,cd,cd | depart,bgecb-exit-2,exit rotary right,arrive |
-           | h,f       | gh,ef,ef,ef | depart,bgecb-exit-1,exit rotary right,arrive |
+           | waypoints | route    | turns                      |
+           | a,d       | ab,cd,cd | depart,bgecb-exit-3,arrive |
+           | a,f       | ab,ef,ef | depart,bgecb-exit-2,arrive |
+           | a,h       | ab,gh,gh | depart,bgecb-exit-1,arrive |
+           | d,f       | cd,ef,ef | depart,bgecb-exit-3,arrive |
+           | d,h       | cd,gh,gh | depart,bgecb-exit-2,arrive |
+           | d,a       | cd,ab,ab | depart,bgecb-exit-1,arrive |
+           | f,h       | ef,gh,gh | depart,bgecb-exit-3,arrive |
+           | f,a       | ef,ab,ab | depart,bgecb-exit-2,arrive |
+           | f,d       | ef,cd,cd | depart,bgecb-exit-1,arrive |
+           | h,a       | gh,ab,ab | depart,bgecb-exit-3,arrive |
+           | h,d       | gh,cd,cd | depart,bgecb-exit-2,arrive |
+           | h,f       | gh,ef,ef | depart,bgecb-exit-1,arrive |

    Scenario: Only Enter
        Given the node map
@@ -90,19 +90,19 @@ Feature: Rotary
            | bcegb  | roundabout |

       When I route I should get
-           | waypoints | route       | turns                           |
-           | b,d       | bcegb,cd,cd | depart,exit rotary right,arrive |
-           | b,f       | bcegb,ef,ef | depart,exit rotary right,arrive |
-           | b,h       | bcegb,gh,gh | depart,exit rotary right,arrive |
-           | c,f       | bcegb,ef,ef | depart,exit rotary right,arrive |
-           | c,h       | bcegb,gh,gh | depart,exit rotary right,arrive |
-           | c,a       | bcegb,ab,ab | depart,exit rotary right,arrive |
-           | e,h       | bcegb,gh,gh | depart,exit rotary right,arrive |
-           | e,a       | bcegb,ab,ab | depart,exit rotary right,arrive |
-           | e,d       | bcegb,cd,cd | depart,exit rotary right,arrive |
-           | g,a       | bcegb,ab,ab | depart,exit rotary right,arrive |
-           | g,d       | bcegb,cd,cd | depart,exit rotary right,arrive |
-           | g,f       | bcegb,ef,ef | depart,exit rotary right,arrive |
+           | waypoints | route       | turns                      |
+           | b,d       | bcegb,cd,cd | depart,bcegb-exit-1,arrive |
+           | b,f       | bcegb,ef,ef | depart,bcegb-exit-2,arrive |
+           | b,h       | bcegb,gh,gh | depart,bcegb-exit-3,arrive |
+           | c,f       | bcegb,ef,ef | depart,bcegb-exit-1,arrive |
+           | c,h       | bcegb,gh,gh | depart,bcegb-exit-2,arrive |
+           | c,a       | bcegb,ab,ab | depart,bcegb-exit-3,arrive |
+           | e,h       | bcegb,gh,gh | depart,bcegb-exit-1,arrive |
+           | e,a       | bcegb,ab,ab | depart,bcegb-exit-2,arrive |
+           | e,d       | bcegb,cd,cd | depart,bcegb-exit-3,arrive |
+           | g,a       | bcegb,ab,ab | depart,bcegb-exit-1,arrive |
+           | g,d       | bcegb,cd,cd | depart,bcegb-exit-2,arrive |
+           | g,f       | bcegb,ef,ef | depart,bcegb-exit-3,arrive |
      #phantom node snapping can result in a full round-trip here, therefore we cannot test b->a and the other direct exits

    Scenario: Drive Around
@@ -158,23 +158,23 @@ Feature: Rotary
           | bkheb | roundabout | yes    |

        When I route I should get
-           | waypoints | route           | turns                                           |
-           | a,c       | abc,abc,abc     | depart,exit rotary right,arrive                 |
-           | a,l       | abc,jkl,jkl,jkl | depart,bkheb-exit-2,exit rotary straight,arrive |
-           | a,i       | abc,ghi,ghi,ghi | depart,bkheb-exit-3,exit rotary straight,arrive |
-           | a,f       | abc,def,def,def | depart,bkheb-exit-4,exit rotary straight,arrive |
-           | d,f       | def,def,def     | depart,exit rotary right,arrive                 |
-           | d,c       | def,abc,abc,abc | depart,bkheb-exit-2,exit rotary straight,arrive |
-           | d,l       | def,jkl,jkl,jkl | depart,bkheb-exit-3,exit rotary straight,arrive |
-           | d,i       | def,ghi,ghi,ghi | depart,bkheb-exit-4,exit rotary straight,arrive |
-           | g,i       | ghi,ghi,ghi     | depart,exit rotary right,arrive                 |
-           | g,f       | ghi,def,def,def | depart,bkheb-exit-2,exit rotary straight,arrive |
-           | g,c       | ghi,abc,abc,abc | depart,bkheb-exit-3,exit rotary straight,arrive |
-           | g,l       | ghi,jkl,jkl,jkl | depart,bkheb-exit-4,exit rotary straight,arrive |
-           | j,l       | jkl,jkl,jkl     | depart,exit rotary right,arrive                 |
-           | j,i       | jkl,ghi,ghi,ghi | depart,bkheb-exit-2,exit rotary straight,arrive |
-           | j,f       | jkl,def,def,def | depart,bkheb-exit-3,exit rotary straight,arrive |
-           | j,c       | jkl,abc,abc,abc | depart,bkheb-exit-4,exit rotary straight,arrive |
+           | waypoints | route       | turns                       |
+           | a,c       | abc,abc,abc | depart,rotary-exit-1,arrive |
+           | a,l       | abc,jkl,jkl | depart,bkheb-exit-2,arrive  |
+           | a,i       | abc,ghi,ghi | depart,bkheb-exit-3,arrive  |
+           | a,f       | abc,def,def | depart,bkheb-exit-4,arrive  |
+           | d,f       | def,def,def | depart,rotary-exit-1,arrive |
+           | d,c       | def,abc,abc | depart,bkheb-exit-2,arrive  |
+           | d,l       | def,jkl,jkl | depart,bkheb-exit-3,arrive  |
+           | d,i       | def,ghi,ghi | depart,bkheb-exit-4,arrive  |
+           | g,i       | ghi,ghi,ghi | depart,rotary-exit-1,arrive |
+           | g,f       | ghi,def,def | depart,bkheb-exit-2,arrive  |
+           | g,c       | ghi,abc,abc | depart,bkheb-exit-3,arrive  |
+           | g,l       | ghi,jkl,jkl | depart,bkheb-exit-4,arrive  |
+           | j,l       | jkl,jkl,jkl | depart,rotary-exit-1,arrive |
+           | j,i       | jkl,ghi,ghi | depart,bkheb-exit-2,arrive  |
+           | j,f       | jkl,def,def | depart,bkheb-exit-3,arrive  |
+           | j,c       | jkl,abc,abc | depart,bkheb-exit-4,arrive  |

       Scenario: Collinear in X,Y
        Given the node map
@@ -193,9 +193,9 @@ Feature: Rotary
            | df    |            |

        When I route I should get
-            | waypoints | route       | turns                                          |
-            | a,e       | ab,ce,ce,ce | depart,bcdb-exit-1,exit rotary straight,arrive |
-            | a,f       | ab,df,df,df | depart,bcdb-exit-2,exit rotary straight,arrive |
+            | 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
@@ -214,9 +214,9 @@ Feature: Rotary
            | cf    |            |

        When I route I should get
-            | waypoints | route       | turns                                          |
-            | a,e       | ad,be,be,be | depart,bcdb-exit-1,exit rotary straight,arrive |
-            | a,f       | ad,cf,cf,cf | depart,bcdb-exit-2,exit rotary straight,arrive |
+            | 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
@@ -235,9 +235,9 @@ Feature: Rotary
            | bf    |            |

        When I route I should get
-            | waypoints | route       | turns                                          |
-            | a,e       | ac,de,de,de | depart,bcdb-exit-1,exit rotary straight,arrive |
-            | a,f       | ac,bf,bf,bf | depart,bcdb-exit-2,exit rotary straight,arrive |
+            | 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
@@ -256,9 +256,9 @@ Feature: Rotary
            | df    |            |

        When I route I should get
-            | waypoints | route       | turns                                       |
-            | a,e       | ab,ce,ce,ce | depart,bcdb-exit-1,exit rotary right,arrive |
-            | a,f       | ab,df,df,df | depart,bcdb-exit-2,exit rotary right,arrive |
+            | 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
@@ -277,6 +277,6 @@ Feature: Rotary
            | df    |            |

        When I route I should get
-            | waypoints | route       | turns                                       |
-            | a,e       | ab,ce,ce,ce | depart,bcdb-exit-1,exit rotary right,arrive |
-            | a,f       | ab,df,df,df | depart,bcdb-exit-2,exit rotary right,arrive |
+            | waypoints | route    | turns                     |
+            | a,e       | ab,ce,ce | depart,bcdb-exit-1,arrive |
+            | a,f       | ab,df,df | depart,bcdb-exit-2,arrive |
@@ -5,6 +5,39 @@ Feature: Basic Roundabout
        Given the profile "bicycle"
        Given a grid size of 10 meters

+    Scenario: Only Enter
+        Given the node map
+            """
+                a
+                b
+            d c   g h
+                e
+                f
+            """
+
+       And the ways
+            | nodes  | junction   |
+            | ab     |            |
+            | cd     |            |
+            | ef     |            |
+            | gh     |            |
+            | bcegb  | roundabout |
+
+       When I route I should get
+           | waypoints | route          | turns                                   |
+           | a,c       | ab,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | a,e       | ab,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | a,g       | ab,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | d,e       | cd,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | d,g       | cd,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | d,b       | cd,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | f,g       | ef,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | f,b       | ef,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | f,c       | ef,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | h,b       | gh,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | h,c       | gh,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | h,e       | gh,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+
    Scenario: Only Exit
        Given the node map
            """
@@ -24,21 +57,54 @@ Feature: Basic Roundabout
            | bcegb  | roundabout |

       When I route I should get
-           | waypoints | route       | turns                               |
-           | b,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
-           | b,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
-           | b,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
-           | c,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
-           | c,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
-           | c,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
-           | e,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
-           | e,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
-           | e,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
-           | g,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
-           | g,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
-           | g,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
+           | waypoints | route       | turns                           |
+           | b,d       | bcegb,cd,cd | depart,roundabout-exit-1,arrive |
+           | b,f       | bcegb,ef,ef | depart,roundabout-exit-2,arrive |
+           | b,h       | bcegb,gh,gh | depart,roundabout-exit-3,arrive |
+           | c,f       | bcegb,ef,ef | depart,roundabout-exit-1,arrive |
+           | c,h       | bcegb,gh,gh | depart,roundabout-exit-2,arrive |
+           | c,a       | bcegb,ab,ab | depart,roundabout-exit-3,arrive |
+           | e,h       | bcegb,gh,gh | depart,roundabout-exit-1,arrive |
+           | e,a       | bcegb,ab,ab | depart,roundabout-exit-2,arrive |
+           | e,d       | bcegb,cd,cd | depart,roundabout-exit-3,arrive |
+           | g,a       | bcegb,ab,ab | depart,roundabout-exit-1,arrive |
+           | g,d       | bcegb,cd,cd | depart,roundabout-exit-2,arrive |
+           | g,f       | bcegb,ef,ef | depart,roundabout-exit-3,arrive |
      #phantom node snapping can result in a full round-trip here, therefore we cannot test b->a and the other direct exits

+    Scenario: Drive Around
+        Given the node map
+            """
+                a
+                b
+            d c   g h
+                e
+                f
+            """
+
+       And the ways
+            | nodes  | junction   |
+            | ab     |            |
+            | cd     |            |
+            | ef     |            |
+            | gh     |            |
+            | bcegb  | roundabout |
+
+       When I route I should get
+           | waypoints | route       | turns         |
+           | b,c       | bcegb,bcegb | depart,arrive |
+           | b,e       | bcegb,bcegb | depart,arrive |
+           | b,g       | bcegb,bcegb | depart,arrive |
+           | c,e       | bcegb,bcegb | depart,arrive |
+           | c,g       | bcegb,bcegb | depart,arrive |
+           | c,b       | bcegb,bcegb | depart,arrive |
+           | e,g       | bcegb,bcegb | depart,arrive |
+           | e,b       | bcegb,bcegb | depart,arrive |
+           | e,c       | bcegb,bcegb | depart,arrive |
+           | g,b       | bcegb,bcegb | depart,arrive |
+           | g,c       | bcegb,bcegb | depart,arrive |
+           | g,e       | bcegb,bcegb | depart,arrive |
+
     Scenario: Mixed Entry and Exit
        Given the node map
           """
@@ -58,20 +124,20 @@ Feature: Basic Roundabout
           | bkheb | roundabout | yes    |

        When I route I should get
-           | waypoints | route           | turns                                                    |
-           | a,c       | abc,abc,abc     | depart,exit roundabout right,arrive                      |
-           | a,l       | abc,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout straight,arrive |
-           | a,i       | abc,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout straight,arrive |
-           | a,f       | abc,def,def,def | depart,roundabout-exit-4,exit roundabout straight,arrive |
-           | d,f       | def,def,def     | depart,exit roundabout right,arrive                      |
-           | d,c       | def,abc,abc,abc | depart,roundabout-exit-2,exit roundabout straight,arrive |
-           | d,l       | def,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout straight,arrive |
-           | d,i       | def,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout straight,arrive |
-           | g,i       | ghi,ghi,ghi     | depart,exit roundabout right,arrive                      |
-           | g,f       | ghi,def,def,def | depart,roundabout-exit-2,exit roundabout straight,arrive |
-           | g,c       | ghi,abc,abc,abc | depart,roundabout-exit-3,exit roundabout straight,arrive |
-           | g,l       | ghi,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout straight,arrive |
-           | j,l       | jkl,jkl,jkl     | depart,exit roundabout right,arrive                      |
-           | j,i       | jkl,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout straight,arrive |
-           | j,f       | jkl,def,def,def | depart,roundabout-exit-3,exit roundabout straight,arrive |
-           | j,c       | jkl,abc,abc,abc | depart,roundabout-exit-4,exit roundabout straight,arrive |
+           | waypoints | route       | turns                           |
+           | a,c       | abc,abc,abc | depart,roundabout-exit-1,arrive |
+           | a,l       | abc,jkl,jkl | depart,roundabout-exit-2,arrive |
+           | a,i       | abc,ghi,ghi | depart,roundabout-exit-3,arrive |
+           | a,f       | abc,def,def | depart,roundabout-exit-4,arrive |
+           | d,f       | def,def,def | depart,roundabout-exit-1,arrive |
+           | d,c       | def,abc,abc | depart,roundabout-exit-2,arrive |
+           | d,l       | def,jkl,jkl | depart,roundabout-exit-3,arrive |
+           | d,i       | def,ghi,ghi | depart,roundabout-exit-4,arrive |
+           | g,i       | ghi,ghi,ghi | depart,roundabout-exit-1,arrive |
+           | g,f       | ghi,def,def | depart,roundabout-exit-2,arrive |
+           | g,c       | ghi,abc,abc | depart,roundabout-exit-3,arrive |
+           | g,l       | ghi,jkl,jkl | depart,roundabout-exit-4,arrive |
+           | j,l       | jkl,jkl,jkl | depart,roundabout-exit-1,arrive |
+           | j,i       | jkl,ghi,ghi | depart,roundabout-exit-2,arrive |
+           | j,f       | jkl,def,def | depart,roundabout-exit-3,arrive |
+           | j,c       | jkl,abc,abc | depart,roundabout-exit-4,arrive |
@@ -52,7 +52,7 @@ Feature: Basic Roundabout
           | behkb | roundabout | yes    |

        When I route I should get
-           | waypoints | route           | turns                                                    |
-           | c,a       | cba,cba,cba     | depart,exit roundabout left,arrive                       |
-           | l,a       | lkj,cba,cba,cba | depart,roundabout-exit-2,exit roundabout straight,arrive |
-           | i,a       | ihg,cba,cba,cba | depart,roundabout-exit-3,exit roundabout straight,arrive |
+           | waypoints | route       | turns                           |
+           | c,a       | cba,cba,cba | depart,roundabout-exit-1,arrive |
+           | l,a       | lkj,cba,cba | depart,roundabout-exit-2,arrive |
+           | i,a       | ihg,cba,cba | depart,roundabout-exit-3,arrive |
@@ -5,6 +5,39 @@ 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 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    |
+
    # https://www.openstreetmap.org/way/223225602
    Scenario: Enter and Exit with changing mode
        Given the node map
@@ -25,16 +58,16 @@ Feature: Basic Roundabout
            | bgecb | roundabout | residential |

       When I route I should get
-           | waypoints | route       | turns                                                               |
-           | a,d       | ab,cd,cd    | depart,roundabout turn left exit-1,arrive                           |
-           | a,f       | ab,ef,ef,ef | depart,roundabout turn straight exit-1,exit roundabout right,arrive |
-           | a,h       | ab,gh,gh,gh | depart,roundabout turn right exit-1,exit roundabout right,arrive    |
-           | d,f       | cd,ef,ef,ef | depart,roundabout turn left exit-2,exit roundabout right,arrive     |
-           | d,h       | cd,gh,gh,gh | depart,roundabout turn straight exit-2,exit roundabout right,arrive |
-           | d,a       | cd,ab,ab    | depart,roundabout turn right exit-1,arrive                          |
-           | f,h       | ef,gh,gh,gh | depart,roundabout turn left exit-3,exit roundabout right,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-2,arrive                           | 
-           | h,d       | gh,cd,cd    | depart,roundabout turn straight exit-1,arrive                       |
-           | h,f       | gh,ef,ef,ef | depart,roundabout turn right exit-1,exit roundabout right,arrive    |
+           | waypoints | route          | turns                                                              |
+           | a,d       | ab,cd,cd       | depart,roundabout turn left exit-1,arrive                          |
+           | a,f       | ab,ef,ef,ef    | depart,roundabout turn left exit-1,notification right,arrive       |
+           | a,h       | ab,bgecb,gh,gh | depart,roundabout turn right exit-1,notification right,arrive      |
+           | d,f       | cd,ef,ef,ef    | depart,roundabout turn sharp left exit-2,notification right,arrive |
+           | d,h       | cd,gh,gh,gh    | depart,roundabout turn left exit-2,notification right,arrive       |
+           | d,a       | cd,ab,ab       | depart,roundabout turn right exit-1,arrive                         |
+           | f,h       | ef,gh,gh,gh    | depart,roundabout turn sharp left exit-3,notification right,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-2,arrive                          |
+           | h,d       | gh,cd,cd       | depart,roundabout turn straight exit-1,arrive                      |
+           | h,f       | gh,bgecb,ef,ef | depart,roundabout turn right exit-1,notification right,arrive      |
@@ -56,19 +56,19 @@ Feature: Basic Roundabout
            | 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      |
+           | 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    |

    Scenario: Only Enter
        Given the node map
@@ -122,19 +122,19 @@ Feature: Basic Roundabout
            | bcegb  | roundabout |

       When I route I should get
-           | waypoints | route       | turns                               |
-           | b,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
-           | b,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
-           | b,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
-           | c,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
-           | c,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
-           | c,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
-           | e,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
-           | e,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
-           | e,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
-           | g,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
-           | g,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
-           | g,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
+           | waypoints | route       | turns                           |
+           | b,d       | bcegb,cd,cd | depart,roundabout-exit-1,arrive |
+           | b,f       | bcegb,ef,ef | depart,roundabout-exit-2,arrive |
+           | b,h       | bcegb,gh,gh | depart,roundabout-exit-3,arrive |
+           | c,f       | bcegb,ef,ef | depart,roundabout-exit-1,arrive |
+           | c,h       | bcegb,gh,gh | depart,roundabout-exit-2,arrive |
+           | c,a       | bcegb,ab,ab | depart,roundabout-exit-3,arrive |
+           | e,h       | bcegb,gh,gh | depart,roundabout-exit-1,arrive |
+           | e,a       | bcegb,ab,ab | depart,roundabout-exit-2,arrive |
+           | e,d       | bcegb,cd,cd | depart,roundabout-exit-3,arrive |
+           | g,a       | bcegb,ab,ab | depart,roundabout-exit-1,arrive |
+           | g,d       | bcegb,cd,cd | depart,roundabout-exit-2,arrive |
+           | g,f       | bcegb,ef,ef | depart,roundabout-exit-3,arrive |
      #phantom node snapping can result in a full round-trip here, therefore we cannot test b->a and the other direct exits

    Scenario: Drive Around
@@ -189,23 +189,23 @@ Feature: Basic Roundabout
           | bkheb | roundabout | yes    |

        When I route I should get
-           | waypoints | route              | turns                                                 |
-           | a,c       | abc,abc,abc     | depart,exit roundabout right,arrive                      |
-           | a,l       | abc,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout straight,arrive |
-           | a,i       | abc,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout straight,arrive |
-           | a,f       | abc,def,def,def | depart,roundabout-exit-4,exit roundabout straight,arrive |
-           | d,f       | def,def,def     | depart,exit roundabout right,arrive                      |
-           | d,c       | def,abc,abc,abc | depart,roundabout-exit-2,exit roundabout straight,arrive |
-           | d,l       | def,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout straight,arrive |
-           | d,i       | def,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout straight,arrive |
-           | g,i       | ghi,ghi,ghi     | depart,exit roundabout right,arrive                      |
-           | g,f       | ghi,def,def,def | depart,roundabout-exit-2,exit roundabout straight,arrive |
-           | g,c       | ghi,abc,abc,abc | depart,roundabout-exit-3,exit roundabout straight,arrive |
-           | g,l       | ghi,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout straight,arrive |
-           | j,l       | jkl,jkl,jkl     | depart,exit roundabout right,arrive                      |
-           | j,i       | jkl,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout straight,arrive |
-           | j,f       | jkl,def,def,def | depart,roundabout-exit-3,exit roundabout straight,arrive |
-           | j,c       | jkl,abc,abc,abc | depart,roundabout-exit-4,exit roundabout straight,arrive |
+           | waypoints | route       | turns                           |
+           | a,c       | abc,abc,abc | depart,roundabout-exit-1,arrive |
+           | a,l       | abc,jkl,jkl | depart,roundabout-exit-2,arrive |
+           | a,i       | abc,ghi,ghi | depart,roundabout-exit-3,arrive |
+           | a,f       | abc,def,def | depart,roundabout-exit-4,arrive |
+           | d,f       | def,def,def | depart,roundabout-exit-1,arrive |
+           | d,c       | def,abc,abc | depart,roundabout-exit-2,arrive |
+           | d,l       | def,jkl,jkl | depart,roundabout-exit-3,arrive |
+           | d,i       | def,ghi,ghi | depart,roundabout-exit-4,arrive |
+           | g,i       | ghi,ghi,ghi | depart,roundabout-exit-1,arrive |
+           | g,f       | ghi,def,def | depart,roundabout-exit-2,arrive |
+           | g,c       | ghi,abc,abc | depart,roundabout-exit-3,arrive |
+           | g,l       | ghi,jkl,jkl | depart,roundabout-exit-4,arrive |
+           | j,l       | jkl,jkl,jkl | depart,roundabout-exit-1,arrive |
+           | j,i       | jkl,ghi,ghi | depart,roundabout-exit-2,arrive |
+           | j,f       | jkl,def,def | depart,roundabout-exit-3,arrive |
+           | j,c       | jkl,abc,abc | depart,roundabout-exit-4,arrive |

    Scenario: Segregated roads - Not an intersection
        Given the node map
@@ -226,23 +226,23 @@ Feature: Basic Roundabout
           | bkheb | roundabout | yes    |

        When I route I should get
-           | waypoints | route            | turns                                                |
-           | a,c       | abc,abc,abc,abc | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | a,l       | abc,jkl,jkl,jkl | depart,roundabout-exit-1,exit roundabout right,arrive |
-           | a,i       | abc,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | a,f       | abc,def,def,def | depart,roundabout-exit-3,exit roundabout right,arrive |
-           | d,f       | def,def,def,def | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | d,c       | def,abc,abc,abc | depart,roundabout-exit-1,exit roundabout right,arrive |
-           | d,l       | def,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | d,i       | def,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout right,arrive |
-           | g,i       | ghi,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | g,f       | ghi,def,def,def | depart,roundabout-exit-1,exit roundabout right,arrive |
-           | g,c       | ghi,abc,abc,abc | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | g,l       | ghi,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout right,arrive |
-           | j,l       | jkl,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | j,i       | jkl,ghi,ghi,ghi | depart,roundabout-exit-1,exit roundabout right,arrive |
-           | j,f       | jkl,def,def,def | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | j,c       | jkl,abc,abc,abc | depart,roundabout-exit-3,exit roundabout right,arrive |
+           | waypoints | route       | turns                           |
+           | a,c       | abc,abc,abc | depart,roundabout-exit-4,arrive |
+           | a,l       | abc,jkl,jkl | depart,roundabout-exit-1,arrive |
+           | a,i       | abc,ghi,ghi | depart,roundabout-exit-2,arrive |
+           | a,f       | abc,def,def | depart,roundabout-exit-3,arrive |
+           | d,f       | def,def,def | depart,roundabout-exit-4,arrive |
+           | d,c       | def,abc,abc | depart,roundabout-exit-1,arrive |
+           | d,l       | def,jkl,jkl | depart,roundabout-exit-2,arrive |
+           | d,i       | def,ghi,ghi | depart,roundabout-exit-3,arrive |
+           | g,i       | ghi,ghi,ghi | depart,roundabout-exit-4,arrive |
+           | g,f       | ghi,def,def | depart,roundabout-exit-1,arrive |
+           | g,c       | ghi,abc,abc | depart,roundabout-exit-2,arrive |
+           | g,l       | ghi,jkl,jkl | depart,roundabout-exit-3,arrive |
+           | j,l       | jkl,jkl,jkl | depart,roundabout-exit-4,arrive |
+           | j,i       | jkl,ghi,ghi | depart,roundabout-exit-1,arrive |
+           | j,f       | jkl,def,def | depart,roundabout-exit-2,arrive |
+           | j,c       | jkl,abc,abc | depart,roundabout-exit-3,arrive |

       Scenario: Collinear in X
        Given the node map
@@ -368,19 +368,19 @@ Feature: Basic Roundabout
            | bigecb | roundabout |

       When I route I should get
-           | waypoints | route       | turns                                                 |
-           | a,d       | ab,cd,cd,cd | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | a,f       | ab,ef,ef,ef | depart,roundabout-exit-3,exit roundabout right,arrive |
-           | a,h       | ab,gh,gh,gh | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | d,f       | cd,ef,ef,ef | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | d,h       | cd,gh,gh,gh | depart,roundabout-exit-3,exit roundabout right,arrive |
-           | d,a       | cd,ab,ab,ab | depart,roundabout-exit-1,exit roundabout right,arrive |
-           | f,h       | ef,gh,gh,gh | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | f,a       | ef,ab,ab,ab | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | f,d       | ef,cd,cd,cd | depart,roundabout-exit-1,exit roundabout right,arrive |
-           | h,a       | gh,ab,ab,ab | depart,roundabout-exit-3,exit roundabout right,arrive |
-           | h,d       | gh,cd,cd,cd | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | h,f       | gh,ef,ef,ef | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | waypoints | route    | turns                           |
+           | a,d       | ab,cd,cd | depart,roundabout-exit-4,arrive |
+           | a,f       | ab,ef,ef | depart,roundabout-exit-3,arrive |
+           | a,h       | ab,gh,gh | depart,roundabout-exit-2,arrive |
+           | d,f       | cd,ef,ef | depart,roundabout-exit-4,arrive |
+           | d,h       | cd,gh,gh | depart,roundabout-exit-3,arrive |
+           | d,a       | cd,ab,ab | depart,roundabout-exit-1,arrive |
+           | f,h       | ef,gh,gh | depart,roundabout-exit-4,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: Enter and Exit -- Non-Distinct
        Given the node map
@@ -401,19 +401,19 @@ Feature: Basic Roundabout
            | bgecb | roundabout |

       When I route I should get
-           | waypoints | route       | turns                                                     |
-           | a,d       | ab,cd,cd,cd | depart,roundabout-exit-3,exit roundabout right,arrive     |
-           | a,f       | ab,ef,ef,ef | depart,roundabout-exit-2,exit roundabout right,arrive     |
-           | a,h       | ab,gh,gh,gh | depart,roundabout-exit-1,exit roundabout straight,arrive  |
-           | d,f       | cd,ef,ef,ef | depart,roundabout-exit-3,exit roundabout right,arrive     |
-           | d,h       | cd,gh,gh,gh | depart,roundabout-exit-2,exit roundabout straight,arrive  |
-           | d,a       | cd,ab,ab,ab | depart,roundabout-exit-1,exit roundabout right,arrive     |
-           | f,h       | ef,gh,gh,gh | depart,roundabout-exit-3,exit roundabout straight,arrive  |
-           | f,a       | ef,ab,ab,ab | depart,roundabout-exit-2,exit roundabout right,arrive     |
-           | f,d       | ef,cd,cd,cd | depart,roundabout-exit-1,exit roundabout right,arrive     |
-           | h,a       | gh,ab,ab,ab | depart,roundabout-exit-3,exit roundabout right,arrive     |
-           | h,d       | gh,cd,cd,cd | depart,roundabout-exit-2,exit roundabout right,arrive     |
-           | h,f       | gh,ef,ef,ef | depart,roundabout-exit-1,exit roundabout right,arrive     |
+           | 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: Enter and Exit -- Bearing
        Given the node map
@@ -57,10 +57,10 @@ Feature: Basic Roundabout
            | bcegb  | roundabout | primary |

        When I route I should get
-            | waypoints | route       | turns                                                    |
-            | a,d       | ab,cd,cd,cd | depart,roundabout-exit-1,exit roundabout right,arrive    |
-            | a,h       | ab,gh,gh,gh | depart,roundabout-exit-2,exit roundabout straight,arrive |
-            | a,f       | ab,ef,ef,ef | depart,roundabout-exit-2,exit roundabout right,arrive    |
+            | waypoints | route    | turns                           |
+            | a,d       | ab,cd,cd | depart,roundabout-exit-1,arrive |
+            | a,h       | ab,gh,gh | depart,roundabout-exit-2,arrive |
+            | a,f       | ab,ef,ef | depart,roundabout-exit-2,arrive |

    #2927
    Scenario: Only Roundabout
@@ -98,19 +98,19 @@ Feature: Basic Roundabout
            | bcegb  | roundabout |

       When I route I should get
-           | waypoints | route       | turns                               |
-           | b,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
-           | b,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
-           | b,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
-           | c,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
-           | c,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
-           | c,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
-           | e,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
-           | e,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
-           | e,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
-           | g,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
-           | g,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
-           | g,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
+           | waypoints | route       | turns                           |
+           | b,d       | bcegb,cd,cd | depart,roundabout-exit-1,arrive |
+           | b,f       | bcegb,ef,ef | depart,roundabout-exit-2,arrive |
+           | b,h       | bcegb,gh,gh | depart,roundabout-exit-3,arrive |
+           | c,f       | bcegb,ef,ef | depart,roundabout-exit-1,arrive |
+           | c,h       | bcegb,gh,gh | depart,roundabout-exit-2,arrive |
+           | c,a       | bcegb,ab,ab | depart,roundabout-exit-3,arrive |
+           | e,h       | bcegb,gh,gh | depart,roundabout-exit-1,arrive |
+           | e,a       | bcegb,ab,ab | depart,roundabout-exit-2,arrive |
+           | e,d       | bcegb,cd,cd | depart,roundabout-exit-3,arrive |
+           | g,a       | bcegb,ab,ab | depart,roundabout-exit-1,arrive |
+           | g,d       | bcegb,cd,cd | depart,roundabout-exit-2,arrive |
+           | g,f       | bcegb,ef,ef | depart,roundabout-exit-3,arrive |
      #phantom node snapping can result in a full round-trip here, therefore we cannot test b->a and the other direct exits

    Scenario: Drive Around
@@ -165,23 +165,23 @@ Feature: Basic Roundabout
           | bkheb | roundabout | yes    |

        When I route I should get
-           | waypoints | route           | turns                                                    |
-           | a,c       | abc,abc,abc     | depart,exit roundabout right,arrive                      |
-           | a,l       | abc,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout straight,arrive |
-           | a,i       | abc,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout straight,arrive |
-           | a,f       | abc,def,def,def | depart,roundabout-exit-4,exit roundabout straight,arrive |
-           | d,f       | def,def,def     | depart,exit roundabout right,arrive                      |
-           | d,c       | def,abc,abc,abc | depart,roundabout-exit-2,exit roundabout straight,arrive |
-           | d,l       | def,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout straight,arrive |
-           | d,i       | def,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout straight,arrive |
-           | g,i       | ghi,ghi,ghi     | depart,exit roundabout right,arrive                      |
-           | g,f       | ghi,def,def,def | depart,roundabout-exit-2,exit roundabout straight,arrive |
-           | g,c       | ghi,abc,abc,abc | depart,roundabout-exit-3,exit roundabout straight,arrive |
-           | g,l       | ghi,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout straight,arrive |
-           | j,l       | jkl,jkl,jkl     | depart,exit roundabout right,arrive                      |
-           | j,i       | jkl,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout straight,arrive |
-           | j,f       | jkl,def,def,def | depart,roundabout-exit-3,exit roundabout straight,arrive |
-           | j,c       | jkl,abc,abc,abc | depart,roundabout-exit-4,exit roundabout straight,arrive |
+           | waypoints | route       | turns                           |
+           | a,c       | abc,abc,abc | depart,roundabout-exit-1,arrive |
+           | a,l       | abc,jkl,jkl | depart,roundabout-exit-2,arrive |
+           | a,i       | abc,ghi,ghi | depart,roundabout-exit-3,arrive |
+           | a,f       | abc,def,def | depart,roundabout-exit-4,arrive |
+           | d,f       | def,def,def | depart,roundabout-exit-1,arrive |
+           | d,c       | def,abc,abc | depart,roundabout-exit-2,arrive |
+           | d,l       | def,jkl,jkl | depart,roundabout-exit-3,arrive |
+           | d,i       | def,ghi,ghi | depart,roundabout-exit-4,arrive |
+           | g,i       | ghi,ghi,ghi | depart,roundabout-exit-1,arrive |
+           | g,f       | ghi,def,def | depart,roundabout-exit-2,arrive |
+           | g,c       | ghi,abc,abc | depart,roundabout-exit-3,arrive |
+           | g,l       | ghi,jkl,jkl | depart,roundabout-exit-4,arrive |
+           | j,l       | jkl,jkl,jkl | depart,roundabout-exit-1,arrive |
+           | j,i       | jkl,ghi,ghi | depart,roundabout-exit-2,arrive |
+           | j,f       | jkl,def,def | depart,roundabout-exit-3,arrive |
+           | j,c       | jkl,abc,abc | depart,roundabout-exit-4,arrive |

    Scenario: Mixed Entry and Exit - segregated roads
        Given the node map
@@ -204,23 +204,23 @@ Feature: Basic Roundabout
           | bkheb | roundabout | yes    |

        When I route I should get
-           | waypoints | route           | turns                                                 |
-           | a,c       | abc,abc,abc,abc | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | a,l       | abc,jkl,jkl,jkl | depart,roundabout-exit-1,exit roundabout right,arrive |
-           | a,i       | abc,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | a,f       | abc,def,def,def | depart,roundabout-exit-3,exit roundabout right,arrive |
-           | d,f       | def,def,def,def | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | d,c       | def,abc,abc,abc | depart,roundabout-exit-1,exit roundabout right,arrive |
-           | d,l       | def,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | d,i       | def,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout right,arrive |
-           | g,i       | ghi,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | g,f       | ghi,def,def,def | depart,roundabout-exit-1,exit roundabout right,arrive |
-           | g,c       | ghi,abc,abc,abc | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | g,l       | ghi,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout right,arrive |
-           | j,l       | jkl,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | j,i       | jkl,ghi,ghi,ghi | depart,roundabout-exit-1,exit roundabout right,arrive |
-           | j,f       | jkl,def,def,def | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | j,c       | jkl,abc,abc,abc | depart,roundabout-exit-3,exit roundabout right,arrive |
+           | waypoints | route       | turns                           |
+           | a,c       | abc,abc,abc | depart,roundabout-exit-4,arrive |
+           | a,l       | abc,jkl,jkl | depart,roundabout-exit-1,arrive |
+           | a,i       | abc,ghi,ghi | depart,roundabout-exit-2,arrive |
+           | a,f       | abc,def,def | depart,roundabout-exit-3,arrive |
+           | d,f       | def,def,def | depart,roundabout-exit-4,arrive |
+           | d,c       | def,abc,abc | depart,roundabout-exit-1,arrive |
+           | d,l       | def,jkl,jkl | depart,roundabout-exit-2,arrive |
+           | d,i       | def,ghi,ghi | depart,roundabout-exit-3,arrive |
+           | g,i       | ghi,ghi,ghi | depart,roundabout-exit-4,arrive |
+           | g,f       | ghi,def,def | depart,roundabout-exit-1,arrive |
+           | g,c       | ghi,abc,abc | depart,roundabout-exit-2,arrive |
+           | g,l       | ghi,jkl,jkl | depart,roundabout-exit-3,arrive |
+           | j,l       | jkl,jkl,jkl | depart,roundabout-exit-4,arrive |
+           | j,i       | jkl,ghi,ghi | depart,roundabout-exit-1,arrive |
+           | j,f       | jkl,def,def | depart,roundabout-exit-2,arrive |
+           | j,c       | jkl,abc,abc | depart,roundabout-exit-3,arrive |

     Scenario: Mixed Entry and Exit - clockwise order
        Given the node map
@@ -241,23 +241,23 @@ Feature: Basic Roundabout
           | behkb | roundabout | yes    |

        When I route I should get
-           | waypoints | route           | turns                                                |
-           | a,c       | abc,abc,abc,abc | depart,roundabout-exit-4,exit roundabout left,arrive |
-           | a,l       | abc,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout left,arrive |
-           | a,i       | abc,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout left,arrive |
-           | a,f       | abc,def,def,def | depart,roundabout-exit-1,exit roundabout left,arrive |
-           | d,f       | def,def,def,def | depart,roundabout-exit-4,exit roundabout left,arrive |
-           | d,c       | def,abc,abc,abc | depart,roundabout-exit-3,exit roundabout left,arrive |
-           | d,l       | def,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout left,arrive |
-           | d,i       | def,ghi,ghi,ghi | depart,roundabout-exit-1,exit roundabout left,arrive |
-           | g,i       | ghi,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout left,arrive |
-           | g,f       | ghi,def,def,def | depart,roundabout-exit-3,exit roundabout left,arrive |
-           | g,c       | ghi,abc,abc,abc | depart,roundabout-exit-2,exit roundabout left,arrive |
-           | g,l       | ghi,jkl,jkl,jkl | depart,roundabout-exit-1,exit roundabout left,arrive |
-           | j,l       | jkl,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout left,arrive |
-           | j,i       | jkl,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout left,arrive |
-           | j,f       | jkl,def,def,def | depart,roundabout-exit-2,exit roundabout left,arrive |
-           | j,c       | jkl,abc,abc,abc | depart,roundabout-exit-1,exit roundabout left,arrive |
+           | waypoints | route       | turns                           |
+           | a,c       | abc,abc,abc | depart,roundabout-exit-4,arrive |
+           | a,l       | abc,jkl,jkl | depart,roundabout-exit-3,arrive |
+           | a,i       | abc,ghi,ghi | depart,roundabout-exit-2,arrive |
+           | a,f       | abc,def,def | depart,roundabout-exit-1,arrive |
+           | d,f       | def,def,def | depart,roundabout-exit-4,arrive |
+           | d,c       | def,abc,abc | depart,roundabout-exit-3,arrive |
+           | d,l       | def,jkl,jkl | depart,roundabout-exit-2,arrive |
+           | d,i       | def,ghi,ghi | depart,roundabout-exit-1,arrive |
+           | g,i       | ghi,ghi,ghi | depart,roundabout-exit-4,arrive |
+           | g,f       | ghi,def,def | depart,roundabout-exit-3,arrive |
+           | g,c       | ghi,abc,abc | depart,roundabout-exit-2,arrive |
+           | g,l       | ghi,jkl,jkl | depart,roundabout-exit-1,arrive |
+           | j,l       | jkl,jkl,jkl | depart,roundabout-exit-4,arrive |
+           | j,i       | jkl,ghi,ghi | depart,roundabout-exit-3,arrive |
+           | j,f       | jkl,def,def | depart,roundabout-exit-2,arrive |
+           | j,c       | jkl,abc,abc | depart,roundabout-exit-1,arrive |

    Scenario: Mixed Entry and Exit - segregated roads, different names
        Given the node map
@@ -284,23 +284,23 @@ Feature: Basic Roundabout
           | bkheb | roundabout | yes    |

        When I route I should get
-           | waypoints | route       | turns                                                 |
-           | a,c       | ab,bc,bc,bc | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | a,l       | ab,kl,kl,kl | depart,roundabout-exit-1,exit roundabout right,arrive |
-           | a,i       | ab,hi,hi,hi | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | a,f       | ab,ef,ef,ef | depart,roundabout-exit-3,exit roundabout right,arrive |
-           | d,f       | de,ef,ef,ef | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | d,c       | de,bc,bc,bc | depart,roundabout-exit-1,exit roundabout right,arrive |
-           | d,l       | de,kl,kl,kl | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | d,i       | de,hi,hi,hi | depart,roundabout-exit-3,exit roundabout right,arrive |
-           | g,i       | gh,hi,hi,hi | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | g,f       | gh,ef,ef,ef | depart,roundabout-exit-1,exit roundabout right,arrive |
-           | g,c       | gh,bc,bc,bc | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | g,l       | gh,kl,kl,kl | depart,roundabout-exit-3,exit roundabout right,arrive |
-           | j,l       | jk,kl,kl,kl | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | j,i       | jk,hi,hi,hi | depart,roundabout-exit-1,exit roundabout right,arrive |
-           | j,f       | jk,ef,ef,ef | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | j,c       | jk,bc,bc,bc | depart,roundabout-exit-3,exit roundabout right,arrive |
+           | waypoints | route    | turns                           |
+           | a,c       | ab,bc,bc | depart,roundabout-exit-4,arrive |
+           | a,l       | ab,kl,kl | depart,roundabout-exit-1,arrive |
+           | a,i       | ab,hi,hi | depart,roundabout-exit-2,arrive |
+           | a,f       | ab,ef,ef | depart,roundabout-exit-3,arrive |
+           | d,f       | de,ef,ef | depart,roundabout-exit-4,arrive |
+           | d,c       | de,bc,bc | depart,roundabout-exit-1,arrive |
+           | d,l       | de,kl,kl | depart,roundabout-exit-2,arrive |
+           | d,i       | de,hi,hi | depart,roundabout-exit-3,arrive |
+           | g,i       | gh,hi,hi | depart,roundabout-exit-4,arrive |
+           | g,f       | gh,ef,ef | depart,roundabout-exit-1,arrive |
+           | g,c       | gh,bc,bc | depart,roundabout-exit-2,arrive |
+           | g,l       | gh,kl,kl | depart,roundabout-exit-3,arrive |
+           | j,l       | jk,kl,kl | depart,roundabout-exit-4,arrive |
+           | j,i       | jk,hi,hi | depart,roundabout-exit-1,arrive |
+           | j,f       | jk,ef,ef | depart,roundabout-exit-2,arrive |
+           | j,c       | jk,bc,bc | depart,roundabout-exit-3,arrive |

    Scenario: Motorway Roundabout
    #See 39.933742 -75.082345
@@ -338,10 +338,11 @@ Feature: Basic Roundabout
            | dmg   | roundabout |          | trunk_link | yes    |        |

        When I route I should get
-            | waypoints | route                               | turns                                                    | ref                         |
-            | a,e       | crescent,crescent,crescent,crescent | depart,roundabout-exit-3,exit roundabout straight,arrive | US 130,US 130,US 130,US 130 |
-            | j,l       | ,,,                                 | depart,roundabout-exit-2,exit roundabout straight,arrive | NJ 38,NJ 38,NJ 38,NJ 38     |
+            | waypoints | route                                                 | turns                           | ref                     |
+            | a,e       | crescent,crescent,crescent                            | depart,roundabout-exit-3,arrive | US 130,US 130,US 130    |
+            | j,l       | ,,                                                    | depart,roundabout-exit-2,arrive | NJ 38,NJ 38,NJ 38       |

+    @todo
    # this test previously only passed by accident. We need to handle throughabouts correctly, since staying on massachusetts is actually
    # the desired setting. Rotary instructions here are not wanted but rather no instruction at all to go through the roundabout (or add
    # a throughabout instruction)
@@ -388,8 +389,8 @@ Feature: Basic Roundabout
            | restriction | pi       | ij     | i        | no_left_turn  |

        When I route I should get
-            | waypoints | route                                                   | turns                                                  |
-            | a,k       | massachusetts,massachusetts,massachusetts,massachusetts | depart,sheridan circle-exit-2,exit rotary right,arrive |
+            | waypoints | route                                                   | turns                                              |
+            | a,k       | massachusetts,massachusetts,massachusetts,massachusetts | depart,sheridan circle-exit-2,rotary-exit-1,arrive |

    #2856 - http://www.openstreetmap.org/#map=19/47.23318/-1.56563
    Scenario: Linked Roundabouts
@@ -476,8 +477,8 @@ Feature: Basic Roundabout
            | cdefib | roundabout | roundabout    | yes    |                       |

        When I route I should get
-            | waypoints | route                                  | turns                              |
-            | 1,h       | roundabout,right-bot-out,right-bot-out | depart,exit rotary straight,arrive |
+            | waypoints | route                                  | turns                           |
+            | 1,h       | roundabout,right-bot-out,right-bot-out | depart,roundabout-exit-1,arrive |

    @3254
    Scenario: Driving up to and through a roundabout
@@ -494,15 +495,15 @@ Feature: Basic Roundabout

        And the ways
            | nodes | junction   | name       | highway     |
-            | abcda | roundabout | rotary     | residential |
+            | abcda | roundabout | roundabout | residential |
            | gfi   |            | side       | residential |
            | efb   |            | left       | residential |
            | dh    |            | right      | residential |
            | ck    |            | bottom     | residential |

        When I route I should get
-            | waypoints | route                  | turns                                         |
-            | e,h       | left,right,right,right | depart,rotary-exit-2,exit rotary right,arrive |
+            | waypoints | route            | turns                           |
+            | e,h       | left,right,right | depart,roundabout-exit-2,arrive |

    @3254
    Scenario: Driving up to and through a roundabout
@@ -519,15 +520,15 @@ Feature: Basic Roundabout

        And the ways
            | nodes | junction   | name       | highway     |
-            | abcda | roundabout | rotary     | residential |
+            | abcda | roundabout | roundabout | residential |
            | gfi   |            | side       | residential |
            | efb   |            | left       | residential |
            | dh    |            | right      | residential |
            | ck    |            | bottom     | residential |

        When I route I should get
-            | waypoints | route                  | turns                                         |
-            | e,h       | left,right,right,right | depart,rotary-exit-2,exit rotary right,arrive |
+            | waypoints | route            | turns                           |
+            | e,h       | left,right,right | depart,roundabout-exit-2,arrive |

    @3361
    Scenario: Bersarinplatz (Not a Roundabout)
@@ -564,13 +565,13 @@ Feature: Basic Roundabout
            | mn        |            | Petersburger Strasse | B 96a | primary     | yes    |

        When I route I should get
-            | waypoints | route                                                                               | turns                                                   |
-            | a,g       | Petersburger Strasse,Petersburger Strasse,Petersburger Strasse,Petersburger Strasse | depart,Bersarinplatz-exit-2,exit rotary straight,arrive |
-            | d,g       | Weidenweg,Petersburger Strasse,Petersburger Strasse,Petersburger Strasse            | depart,Bersarinplatz-exit-1,exit rotary straight,arrive |
-            | i,k       | Petersburger Strasse,Rigaer Strasse,Rigaer Strasse,Rigaer Strasse                   | depart,Bersarinplatz-exit-1,exit rotary right,arrive    |
-            | i,n       | Petersburger Strasse,Petersburger Strasse,Petersburger Strasse,Petersburger Strasse | depart,Bersarinplatz-exit-2,exit rotary straight,arrive |
-            | i,d       | Petersburger Strasse,Weidenweg,Weidenweg,Weidenweg                                  | depart,Bersarinplatz-exit-3,exit rotary right,arrive    |
-            | i,g       | Petersburger Strasse,Petersburger Strasse,Petersburger Strasse,Petersburger Strasse | depart,Bersarinplatz-exit-4,exit rotary straight,arrive |
+            | waypoints | route                                                          | turns                                                                            |
+            | a,g       | Petersburger Strasse,Petersburger Strasse,Petersburger Strasse | depart,Bersarinplatz-exit-2,arrive |
+            | d,g       | Weidenweg,Petersburger Strasse,Petersburger Strasse            | depart,Bersarinplatz-exit-1,arrive |
+            | i,k       | Petersburger Strasse,Rigaer Strasse,Rigaer Strasse             | depart,Bersarinplatz-exit-1,arrive |
+            | i,n       | Petersburger Strasse,Petersburger Strasse,Petersburger Strasse | depart,Bersarinplatz-exit-2,arrive |
+            | i,d       | Petersburger Strasse,Weidenweg,Weidenweg                       | depart,Bersarinplatz-exit-3,arrive |
+            | i,g       | Petersburger Strasse,Petersburger Strasse,Petersburger Strasse | depart,Bersarinplatz-exit-4,arrive |

    @turboroundabout
    # http://www.openstreetmap.org/?mlat=48.782118&mlon=8.194456&zoom=16#map=19/48.78216/8.19457
@@ -605,11 +606,11 @@ Feature: Basic Roundabout
            | ob    | trunk       | yes    | roundabout | Europaplatz   |                                        |

       When I route I should get
-           | waypoints | route                                      | turns                                              |
-           | a,d       | ,Europastrasse,Europastrasse,Europastrasse | depart,Europaplatz-exit-1,exit rotary right,arrive |
-           | a,h       | ,Allee Cite,Allee Cite,Allee Cite          | depart,Europaplatz-exit-2,exit rotary right,arrive |
-           | a,l       | ,Europastrasse,Europastrasse,Europastrasse | depart,Europaplatz-exit-3,exit rotary right,arrive |
-           | a,p       | ,,,                                        | depart,Europaplatz-exit-4,exit rotary right,arrive |
+           | waypoints | route                        | turns                            |
+           | a,d       | ,Europastrasse,Europastrasse | depart,Europaplatz-exit-1,arrive |
+           | a,h       | ,Allee Cite,Allee Cite       | depart,Europaplatz-exit-2,arrive |
+           | a,l       | ,Europastrasse,Europastrasse | depart,Europaplatz-exit-3,arrive |
+           | a,p       | ,,                           | depart,Europaplatz-exit-4,arrive |

    @turboroundabout
    # http://www.openstreetmap.org/?mlat=50.180039&mlon=8.474939&zoom=16#map=19/50.17999/8.47506
@@ -657,14 +658,14 @@ Feature: Basic Roundabout
            | wb    | primary      | yes    | roundabout |                              | through\|through;right             |

       When I route I should get
-           | waypoints | route                                                                                             | turns                                                 |
-           | a,w       | Le-Cannet-Rocheville-Strasse,,                                                                    | depart,roundabout-exit-undefined,arrive               |
-           | a,r       | Le-Cannet-Rocheville-Strasse,,,                                                                   | depart,roundabout-exit-4,exit roundabout right,arrive |
-           | a,f       | Le-Cannet-Rocheville-Strasse,Frankfurter Strasse,Frankfurter Strasse,Frankfurter Strasse          | depart,roundabout-exit-1,exit roundabout right,arrive |
-           | a,h       | Le-Cannet-Rocheville-Strasse,Bischof-Kaller-Strasse,Bischof-Kaller-Strasse,Bischof-Kaller-Strasse | depart,roundabout-exit-2,exit roundabout right,arrive |
-           | u,r       | ,,,                                                                                               | depart,roundabout-exit-5,exit roundabout right,arrive |
-           | j,h       | Bischof-Kaller-Strasse,Bischof-Kaller-Strasse,Bischof-Kaller-Strasse,Bischof-Kaller-Strasse       | depart,roundabout-exit-5,exit roundabout right,arrive |
-           | n,m       | ,                                                                                                 | depart,arrive                                         |
+           | waypoints | route                                                                      | turns                                   |
+           | a,w       | Le-Cannet-Rocheville-Strasse,,                                             | depart,roundabout-exit-undefined,arrive |
+           | a,r       | Le-Cannet-Rocheville-Strasse,,                                             | depart,roundabout-exit-4,arrive         |
+           | a,f       | Le-Cannet-Rocheville-Strasse,Frankfurter Strasse,Frankfurter Strasse       | depart,roundabout-exit-1,arrive         |
+           | a,h       | Le-Cannet-Rocheville-Strasse,Bischof-Kaller-Strasse,Bischof-Kaller-Strasse | depart,roundabout-exit-2,arrive         |
+           | u,r       | ,,                                                                         | depart,roundabout-exit-5,arrive         |
+           | j,h       | Bischof-Kaller-Strasse,Bischof-Kaller-Strasse,Bischof-Kaller-Strasse       | depart,roundabout-exit-5,arrive         |
+           | n,m       | ,                                                                          | depart,arrive                           |

    @turboroundabout
    # http://www.openstreetmap.org/?mlat=47.57723&mlon=7.796765&zoom=16#map=19/47.57720/7.79711
@@ -707,16 +708,17 @@ Feature: Basic Roundabout
            | la    | primary      | yes    | roundabout |

       When I route I should get
-           | waypoints | route       | turns                                                        |
-           | w,r       | wk,ar,ar,ar | depart,roundabout-exit-1,exit roundabout slight right,arrive |
-           | w,s       | wk,ds,ds,ds | depart,roundabout-exit-2,exit roundabout right,arrive        |
-           | w,t       | wk,ft,ft,ft | depart,roundabout-exit-3,exit roundabout right,arrive        |
-           | w,v       | wk,hv,hv,hv | depart,roundabout-exit-4,exit roundabout straight,arrive     |
-           | u,v       | ug,hv,hv,hv | depart,roundabout-exit-1,exit roundabout straight,arrive     |
-           | u,w       | ug,jw,jw,jw | depart,roundabout-exit-2,exit roundabout slight right,arrive |
-           | u,r       | ug,ar,ar,ar | depart,roundabout-exit-3,exit roundabout slight right,arrive |
-           | u,s       | ug,ds,ds,ds | depart,roundabout-exit-4,exit roundabout right,arrive        |
-           | u,t       | ug,ft,ft,ft | depart,roundabout-exit-5,exit roundabout right,arrive        |
+           | waypoints | route    | turns                           |
+           | w,r       | wk,ar,ar | depart,roundabout-exit-1,arrive |
+           | w,s       | wk,ds,ds | depart,roundabout-exit-2,arrive |
+           | w,t       | wk,ft,ft | depart,roundabout-exit-3,arrive |
+           | w,v       | wk,hv,hv | depart,roundabout-exit-4,arrive |
+           | u,v       | ug,hv,hv | depart,roundabout-exit-1,arrive |
+           | u,w       | ug,jw,jw | depart,roundabout-exit-2,arrive |
+           | u,r       | ug,ar,ar | depart,roundabout-exit-3,arrive |
+           | u,s       | ug,ds,ds | depart,roundabout-exit-4,arrive |
+           | u,t       | ug,ft,ft | depart,roundabout-exit-5,arrive |
+

    @3762
    Scenario: Only Enter
@@ -740,20 +742,17 @@ Feature: Basic Roundabout
            | bcjdeb | roundabout |       |

        When I route I should get
-            | waypoints | route          | turns                                                                              |
-            | a,h       | ab,ef,ef,fh,fh | depart,roundabout-exit-4,exit roundabout slight right,notification straight,arrive |
+            | waypoints | route          | turns                                                                           |
+            | a,h       | ab,ef,ef,fh,fh | depart,roundabout-exit-4,notification slight right,notification straight,arrive |


     Scenario: Drive through roundabout
-        Given a grid size of 5 meters
        Given the node map
           """
-                . a .
-              .       .
-            b     e --- d ---- f
-              .        .
-                 .c.
-               g     h
+              a
+            b e d  f
+              c
+            g   h
           """

        And the ways
@@ -763,12 +762,12 @@ Feature: Basic Roundabout
           | gch   |            | yes    |

        When I route I should get
-           | waypoints | bearings | route           | turns                                                        |
-           | e,f       | 90 90    | edf,edf         | depart,arrive                                                |
-           | e,h       | 90 130   | edf,gch,gch,gch | depart,roundabout-exit-2,exit roundabout straight,arrive     |
-           | g,f       | 50 90    | gch,edf,edf,edf | depart,roundabout-exit-2,exit roundabout slight right,arrive |
-           | g,h       | 50 130   | gch,gch,gch     | depart,exit roundabout right,arrive                          |
-           | e,e       | 90 270   | edf,edf,edf,edf | depart,roundabout-exit-3,exit roundabout sharp left,arrive   |
+           | waypoints | bearings | route       | turns                           |
+           | e,f       | 90 90    | edf,edf     | depart,arrive                   |
+           | e,h       | 90 135   | edf,gch,gch | depart,roundabout-exit-2,arrive |
+           | g,f       | 45 90    | gch,edf,edf | depart,roundabout-exit-2,arrive |
+           | g,h       | 45 135   | gch,gch,gch | depart,roundabout-exit-1,arrive |
+           | e,e       | 90 270   | edf,edf,edf | depart,roundabout-exit-3,arrive |

    Scenario: CCW and CW roundabouts with overlaps
        Given the node map
@@ -788,13 +787,12 @@ Feature: Basic Roundabout
            | kg    | tertiary |            |
            | hl    | tertiary |            |

-        # the turn angles here are quite strange, so we do get uturns for exiting
        When I route I should get
-            | from | to | route       | turns                                                 | distance |
-            | e    | f  | ed,af,af,af | depart,roundabout-exit-1,exit roundabout left,arrive  | 80.1m    |
-            | f    | e  | af,ed,ed,ed | depart,roundabout-exit-1,exit roundabout uturn,arrive | 120.1m   |
-            | k    | l  | kg,hl,hl,hl | depart,roundabout-exit-1,exit roundabout right,arrive | 80.1m    |
-            | l    | k  | hl,kg,kg,kg | depart,roundabout-exit-1,exit roundabout uturn,arrive | 120.1m   |
+            | from | to | route    | turns                           | distance |
+            | e    | f  | ed,af,af | depart,roundabout-exit-1,arrive | 80.1m    |
+            | f    | e  | af,ed,ed | depart,roundabout-exit-1,arrive | 120.1m   |
+            | k    | l  | kg,hl,hl | depart,roundabout-exit-1,arrive | 80.1m    |
+            | l    | k  | hl,kg,kg | depart,roundabout-exit-1,arrive | 120.1m   |

    @4030 @4075
    Scenario: Service roundabout with service exits
@@ -813,11 +811,11 @@ Feature: Basic Roundabout
            | bh    | service  |            |

        When I route I should get
-            | from | to | route       | turns                                   |
-            |    1 | e  | abcda,ce,ce | depart,exit roundabout straight,arrive  |
-            |    1 | f  | abcda,df,df | depart,exit roundabout right,arrive     |
-            |    1 | g  | abcda,ag,ag | depart,exit roundabout straight,arrive  |
-            |    1 | h  | abcda,bh,bh | depart,exit roundabout right,arrive     |
+            | from | to | route       | turns                           |
+            |    1 | e  | abcda,ce,ce | depart,roundabout-exit-1,arrive |
+            |    1 | f  | abcda,df,df | depart,roundabout-exit-2,arrive |
+            |    1 | g  | abcda,ag,ag | depart,roundabout-exit-3,arrive |
+            |    1 | h  | abcda,bh,bh | depart,roundabout-exit-4,arrive |

    Scenario: Collapsing a sliproad step after roundabouts
        Given the node map
@@ -832,19 +830,19 @@ Feature: Basic Roundabout
            """

        And the ways
-            | nodes | highway       | junction   | oneway | #         |
-            | abcda | tertiary      | roundabout |        | circle    |
-            | ebds  | tertiary      |            |        | road      |
-            | cm    | tertiary      |            |        |           |
-            | ds    | tertiary      |            |        | road      |
-            | rstur | tertiary      | roundabout |        | circle2   |
-            | ufghl | tertiary      |            |        | road      |
-            | tv    | tertiary      |            |        |           |
-            | gi    | tertiary_link |            | yes    | sliproad  |
-            | jhik  | tertiary      |            |        | crossroad |
+            | nodes | highway  | junction   | oneway | #         |
+            | abcda | tertiary | roundabout |        | circle    |
+            | ebds  | tertiary |            |        | road      |
+            | cm    | tertiary |            |        |           |
+            | ds    | tertiary |            |        | road      |
+            | rstur | tertiary | roundabout |        | circle2   |
+            | ufghl | tertiary |            |        | road      |
+            | tv    | tertiary |            |        |           |
+            | gi    | tertiary |            | yes    | sliproad  |
+            | jhik  | tertiary |            |        | crossroad |


        When I route I should get
-            | from | to | route                      | turns                                                   | distance |
-            | e    | k  | ebds,ufghl,ufghl,jhik,jhik | depart,rstur-exit-2,exit rotary right,turn right,arrive | 189.1m   |
-            | 1    | k  | ebds,ufghl,ufghl,jhik,jhik | depart,rstur-exit-2,exit rotary right,turn right,arrive | 159.1m   |
+            | from | to | route                | turns                                 | distance |
+            | e    | k  | ebds,ufghl,jhik,jhik | depart,rstur-exit-2,turn right,arrive | 189.1m   |
+            | 1    | k  | ebds,ufghl,jhik,jhik | depart,rstur-exit-2,turn right,arrive | 159.1m   |
@@ -248,8 +248,8 @@ Feature: Simple Turns
            | bcdefghijklmnob | residential | road | 1     | yes    | roundabout |

       When I route I should get
-            | waypoints | route          | turns                                         | intersections                                                            |
-            | a,p       | road,road,road | depart,roundabout turn straight exit-1,arrive | true:90;true:165 false:270 false:345,true:90 false:180 true:345;true:270 |
+            | waypoints | route               | turns                                         | intersections                                                            |
+            | a,p       | road,road,road      | depart,roundabout turn straight exit-1,arrive | true:90;true:165 false:270 false:345,true:90 false:180 true:345;true:270 |

    Scenario: Splitting Road with many lanes
        Given the node map
@@ -280,35 +280,6 @@ Feature: Simple Turns
            | a,d       | road,road | depart,arrive |
            | e,a       | road,road | depart,arrive |

-    Scenario: Splitting Road with many lanes; same as above makes sure len(turn:lanes) work as expected
-        Given the node map
-            """
-                              f - - - - - - - - - - - - - - - - - - - - e
-                             '
-                            '
-                           '
-                          '
-                         '
-            a - - - - - b
-                         '
-                          '
-                           '
-                            '
-                             '
-                              c - - - - - - - - - - - - - - - - - - - - d
-            """
-
-        And the ways
-            | nodes | highway | name | turn:lanes               | oneway |
-            | ab    | primary | road | left\|left\|right\|right | no     |
-            | bcd   | primary | road | through\|through         | yes    |
-            | efb   | primary | road | through\|through         | yes    |
-
-        When I route I should get
-            | waypoints | route     | turns         |
-            | a,d       | road,road | depart,arrive |
-            | e,a       | road,road | depart,arrive |
-
    @todo
    # currently the intersections don't match up do to the `merging` process.
    # The intermediate intersection is technically no-turn at all, since the road continues.
@@ -838,14 +809,14 @@ Feature: Simple Turns

        When I route I should get
            | waypoints | route               | turns                    | intersections                                         |
-            | a,g       | Perle,Heide,Heide   | depart,turn right,arrive | true:90;true:90 true:195 false:270 true:345;true:18   |
-            | a,k       | Perle,Friede,Friede | depart,turn left,arrive  | true:90;true:90 true:195 false:270 true:345;true:153  |
-            | a,e       | Perle,Perle         | depart,arrive            | true:90,true:90 true:195 false:270 true:345;true:270  |
-            | e,k       | Perle,Friede,Friede | depart,turn right,arrive | true:270;false:90 true:195 true:270 true:345;true:153 |
-            | e,g       | Perle,Heide,Heide   | depart,turn left,arrive  | true:270;false:90 true:195 true:270 true:345;true:18  |
-            | h,k       | Heide,Friede        | depart,arrive            | true:16,true:90 true:195 true:270 true:345;true:153   |
-            | h,e       | Heide,Perle,Perle   | depart,turn right,arrive | true:16;true:90 true:195 true:270 true:345;true:270   |
-            | h,a       | Heide,Perle,Perle   | depart,turn left,arrive  | true:16;true:90 true:195 true:270 true:345;true:90    |
+            | a,g       | Perle,Heide,Heide   | depart,turn right,arrive | true:90;true:90 true:180 false:270 true:345;true:18   |
+            | a,k       | Perle,Friede,Friede | depart,turn left,arrive  | true:90;true:90 true:180 false:270 true:345;true:153  |
+            | a,e       | Perle,Perle         | depart,arrive            | true:90,true:90 true:180 false:270 true:345;true:270  |
+            | e,k       | Perle,Friede,Friede | depart,turn right,arrive | true:270;false:90 true:180 true:270 true:345;true:153 |
+            | e,g       | Perle,Heide,Heide   | depart,turn left,arrive  | true:270;false:90 true:180 true:270 true:345;true:18  |
+            | h,k       | Heide,Friede        | depart,arrive            | true:16,true:90 true:180 true:270 true:345;true:153   |
+            | h,e       | Heide,Perle,Perle   | depart,turn right,arrive | true:16;true:90 true:180 true:270 true:345;true:270   |
+            | h,a       | Heide,Perle,Perle   | depart,turn left,arrive  | true:16;true:90 true:180 true:270 true:345;true:90    |

    #http://www.openstreetmap.org/#map=19/52.53293/13.32956
    Scenario: Curved Exit from Curved Road
@@ -961,12 +932,12 @@ Feature: Simple Turns
                                                            g
                                                          .
                                                        .
-                                                       .
-                                                     .
-                             h                     f
-                                                .
-                                 .            .
-                                   .        j
+                                                      .
+                                                    .
+                                                  f
+                            h                   .
+                               .              .
+                                  .         j
                                     .    .
                                        c
                                      . . .
@@ -1035,8 +1006,8 @@ Feature: Simple Turns
            | waypoints | route               | turns                          |
            | a,e       | Heide,Heide,Heide   | depart,continue uturn,arrive   |
            | a,g       | Heide,Fenn,Fenn     | depart,turn right,arrive       |
-            | a,h       | Heide,Friede,Friede | depart,turn left,arrive        |
-            | i,e       | Perle,Heide,Heide   | depart,turn sharp right,arrive |
+            | a,h       | Heide,Friede,Friede | depart,turn slight left,arrive |
+            | i,e       | Perle,Heide,Heide   | depart,turn right,arrive       |
            | i,h       | Perle,Friede,Friede | depart,turn left,arrive        |

    #http://www.openstreetmap.org/#map=19/52.48630/13.36017
@@ -1218,7 +1189,7 @@ Feature: Simple Turns

        When I route I should get
            | waypoints | route             | turns                           |
-            | a,c       | rose,trift,trift  | depart,turn slight left,arrive  |
+            | a,c       | rose,trift        | depart,arrive                   |
            | a,k       | rose,muhle,muhle  | depart,turn slight right,arrive |
            | d,f       | trift,rose        | depart,arrive                   |
            | d,k       | trift,muhle,muhle | depart,turn sharp left,arrive   |
@@ -1346,11 +1317,11 @@ Feature: Simple Turns

    #https://github.com/Project-OSRM/osrm-backend/pull/3469#issuecomment-270806580
    Scenario: Oszillating Lower Priority Road
-        #Given the node map
-    #       """
-    #       a -db    c
+		#Given the node map
+	#		"""
+	#		a -db    c
    #           f
-    #       """
+    #   	"""
        Given the node locations
            | node | lat                | lon                | #          |
            | a    | 1.0                | 1.0                |            |
@@ -835,9 +835,9 @@ Feature: Turn Lane Guidance
            | cf    | secondary | bottom |                    |

        When I route I should get
-            | waypoints | turns                                       | route               | lanes                        |
-            | a,d       | depart,continue right,continue right,arrive | road,road,road,road | ,straight:false right:true,, |
-            | d,a       | depart,continue left,continue left,arrive   | road,road,road,road | ,left:true straight:false,,  |
+            | waypoints | turns                                   | route               | lanes                        |
+            | a,d       | depart,continue right,turn right,arrive | road,road,road,road | ,straight:false right:true,, |
+            | d,a       | depart,continue left,turn left,arrive   | road,road,road,road | ,left:true straight:false,,  |

    @simple
    Scenario: Merge Lanes Onto Freeway
@@ -788,9 +788,9 @@ Feature: Simple Turns
            | bg    | primary | yes    |

        When I route I should get
-            | waypoints | route     | turns                           |
-            | a,d       | abc,bd,bd | depart,turn right,arrive        |
-            | a,f       | abc,bf,bf | depart,turn slight right,arrive |
+            | waypoints | route     | turns                          |
+            | a,d       | abc,bd,bd | depart,turn sharp right,arrive |
+            | a,f       | abc,bf,bf | depart,turn right,arrive       |

    Scenario: Right Turn Assignment Three Conflicting Turns with invalid - 3
        Given the node map
@@ -972,8 +972,6 @@ Feature: Simple Turns
                    d

                  h
-
-                  q
            """

        And the nodes
@@ -983,16 +981,16 @@ Feature: Simple Turns
        And the ways
            | nodes | name                           | highway     | oneway |
            | yf    | yf                             | trunk_link  | yes    |
-            | gfehq | Centreville Road               | primary     |        |
+            | gfeh  | Centreville Road               | primary     |        |
            | fi    | fi                             | trunk_link  | yes    |
            | ij    | Bloomingdale Road              | residential |        |
-            | jkabx | Blue Star Memorial Hwy         | trunk       | yes    |
+            | jkabx | Blue Star Memorial Hwy         | trunk       |        |
            | bcde  | bcde                           | trunk_link  | yes    |
            | kh    | kh                             | trunk_link  | yes    |

        When I route I should get
            | waypoints | turns                                        | route                                                         |
-            | a,q       | depart,off ramp right,turn sharp left,arrive | Blue Star Memorial Hwy,bcde,Centreville Road,Centreville Road |
+            | a,h       | depart,off ramp right,turn sharp left,arrive | Blue Star Memorial Hwy,bcde,Centreville Road,Centreville Road |

    @todo
    # https://www.openstreetmap.org/#map=20/52.51609/13.41080
@@ -1351,85 +1349,3 @@ Feature: Simple Turns
       When I route I should get
            | waypoints | route    | turns                   |
            | a,d       | ab,dc,dc | depart,turn left,arrive |
-
-
-    # https://www.openstreetmap.org/node/1332083066
-    Scenario: Turns ordering must respect initial bearings
-        Given the node map
-            """
-            a . be .
-                  \ c.
-                 d/    .f . g
-            """
-
-        And the ways
-            | nodes | highway | oneway |
-            | ab    | primary | yes    |
-            | bcd   | primary | yes    |
-            | befg  | primary | yes    |
-
-       When I route I should get
-            | waypoints | route        | turns                           |
-            | a,d       | ab,bcd,bcd   | depart,fork slight right,arrive |
-            | a,g       | ab,befg,befg | depart,fork slight left,arrive  |
-
-    # https://www.openstreetmap.org/#map=18/52.25130/10.42545
-    Scenario: Turn for roads with no name, ref changes
-        Given the node map
-            """
-              d
-              .
-              .
-            e c . . f
-              .
-              .
-              b
-              .
-              .
-              a
-            """
-
-        And the ways
-            | nodes | highway     | ref  | name          |
-            | abc   | tertiary    | K 57 |               |
-            | cd    | tertiary    | K 56 |               |
-            | cf    | tertiary    | K 56 |               |
-            | ce    | residential |      | Heinrichshöhe |
-
-       When I route I should get
-            | waypoints | route     | turns                    |
-            | a,f       | ,,        | depart,turn right,arrive |
-
-    # https://www.openstreetmap.org/#map=18/52.24071/10.29066
-    Scenario: Turn for roads with no name, ref changes
-        Given the node map
-            """
-              x
-              .
-              .
-              d
-             . .
-            .   .
-           .     .
-     e. . t . c . p. .f
-           .     .
-            .   .
-             . .
-              b
-              .
-              .
-              a
-            """
-
-        And the ways
-            | nodes | highway     | ref  | name          | oneway |
-            | abp   | tertiary    | K 23 |               | yes    |
-            | pdx   | tertiary    | K 23 |               | yes    |
-            | xdt   | tertiary    | K 23 |               | yes    |
-            | tba   | tertiary    | K 23 |               | yes    |
-            | etcpf | primary     | B 1  |               | no     |
-
-       When I route I should get
-            | waypoints | route     | turns                                    |
-            | e,x       | ,,,       | depart,turn sharp left,turn right,arrive |
-            | f,a       | ,,        | depart,turn left,arrive                  |
@@ -20,11 +20,11 @@ module.exports =  {
        });
    },

-     hashOfFile: (path, additional_content, cb) => {
+     hashOfFile: (path, cb) => {
        fs.readFile(path, (err, result) => {
            if (err) return cb(err);
            let checksum = crypto.createHash('md5');
-            checksum.update(result + (additional_content || "") );
+            checksum.update(result);
            cb(null, checksum.digest('hex'));
        });
    }
@@ -61,13 +61,8 @@ class DB {
            });

            w.nodes.forEach((k) => {
-
-                let nd = way.ele('nd')
+                way.ele('nd')
                    .att('ref', k.id);
-                if (w.add_locations) {
-                    nd.att('lon', k.lon);
-                    nd.att('lat', k.lat);
-                }
            });

            for (var k in w.tags) {
@@ -86,12 +81,11 @@ class DB {
            });

            r.members.forEach((m) => {
-                var d = {
+                relation.ele('member', {
                    type: m.type,
-                    ref: m.id
-                };
-                if (m.role) d.role = m.role;
-                relation.ele('member', d);
+                    ref: m.id,
+                    role: m.role
+                });
            });

            for (var k in r.tags) {
@@ -126,14 +120,13 @@ class Node {
 }

 class Way {
-    constructor (id, OSM_USER, OSM_TIMESTAMP, OSM_UID, add_locations) {
+    constructor (id, OSM_USER, OSM_TIMESTAMP, OSM_UID) {
        this.id = id;
        this.OSM_USER = OSM_USER;
        this.OSM_TIMESTAMP = OSM_TIMESTAMP;
        this.OSM_UID = OSM_UID;
        this.tags = {};
        this.nodes = [];
-        this.add_locations = add_locations;
    }

    addNode (node) {
@@ -18,5 +18,5 @@ Feature: osrm-contract command line options: files
    Scenario: osrm-contract - Missing input file
        When I try to run "osrm-contract over-the-rainbow.osrm"
        And stderr should contain "over-the-rainbow.osrm"
-        And stderr should contain "Missing/Broken"
+        And stderr should contain "not found"
        And it should exit with an error
@@ -8,10 +8,10 @@ Feature: osrm-contract command line options: help
        And stdout should contain "Options:"
        And stdout should contain "--version"
        And stdout should contain "--help"
-        And stdout should contain "--verbosity"
        And stdout should contain "Configuration:"
        And stdout should contain "--threads"
        And stdout should contain "--core"
+        And stdout should contain "--level-cache"
        And stdout should contain "--segment-speed-file"
        And it should exit with an error

@@ -22,10 +22,10 @@ Feature: osrm-contract command line options: help
        And stdout should contain "Options:"
        And stdout should contain "--version"
        And stdout should contain "--help"
-        And stdout should contain "--verbosity"
        And stdout should contain "Configuration:"
        And stdout should contain "--threads"
        And stdout should contain "--core"
+        And stdout should contain "--level-cache"
        And stdout should contain "--segment-speed-file"
        And it should exit successfully

@@ -36,9 +36,9 @@ Feature: osrm-contract command line options: help
        And stdout should contain "Options:"
        And stdout should contain "--version"
        And stdout should contain "--help"
-        And stdout should contain "--verbosity"
        And stdout should contain "Configuration:"
        And stdout should contain "--threads"
        And stdout should contain "--core"
+        And stdout should contain "--level-cache"
        And stdout should contain "--segment-speed-file"
        And it should exit successfully
@@ -8,7 +8,7 @@ Feature: osrm-contract command line options: version
        Given the profile "testbot"

    Scenario: osrm-contract - Version, short
-        When I run "osrm-contract -v"
+        When I run "osrm-contract --v"
        Then stderr should be empty
        And stdout should contain 1 line
        And stdout should contain /(v\d{1,2}\.\d{1,2}\.\d{1,2}|\w*-\d+-\w+)/
@@ -19,5 +19,5 @@ Feature: osrm-contract command line options: files
    Scenario: osrm-customize - Missing input file
        When I try to run "osrm-customize over-the-rainbow.osrm"
        And stderr should contain "over-the-rainbow.osrm"
-        And stderr should contain "Missing/Broken"
+        And stderr should contain "not found"
        And it should exit with an error
@@ -8,7 +8,6 @@ Feature: osrm-customize command line options: help
        And stdout should contain "Options:"
        And stdout should contain "--version"
        And stdout should contain "--help"
-        And stdout should contain "--verbosity"
        And stdout should contain "Configuration:"
        And stdout should contain "--threads"
        And it should exit with an error
@@ -20,7 +19,6 @@ Feature: osrm-customize command line options: help
        And stdout should contain "Options:"
        And stdout should contain "--version"
        And stdout should contain "--help"
-        And stdout should contain "--verbosity"
        And stdout should contain "Configuration:"
        And stdout should contain "--threads"
        And it should exit successfully
@@ -32,7 +30,6 @@ Feature: osrm-customize command line options: help
        And stdout should contain "Options:"
        And stdout should contain "--version"
        And stdout should contain "--help"
-        And stdout should contain "--verbosity"
        And stdout should contain "Configuration:"
        And stdout should contain "--threads"
        And it should exit successfully
@@ -5,7 +5,7 @@ Feature: osrm-customize command line options: version
        Given the profile "testbot"

    Scenario: osrm-customize - Version, short
-        When I run "osrm-customize -v"
+        When I run "osrm-customize --v"
        Then stderr should be empty
        And stdout should contain 1 line
        And stdout should contain /(v\d{1,2}\.\d{1,2}\.\d{1,2}|\w*-\d+-\w+)/
@@ -11,7 +11,6 @@ Feature: osrm-extract command line options: help
        And stdout should contain "Options:"
        And stdout should contain "--version"
        And stdout should contain "--help"
-        And stdout should contain "--verbosity"
        And stdout should contain "Configuration:"
        And stdout should contain "--profile"
        And stdout should contain "--threads"
@@ -25,7 +24,6 @@ Feature: osrm-extract command line options: help
        And stdout should contain "Options:"
        And stdout should contain "--version"
        And stdout should contain "--help"
-        And stdout should contain "--verbosity"
        And stdout should contain "Configuration:"
        And stdout should contain "--profile"
        And stdout should contain "--threads"
@@ -39,7 +37,6 @@ Feature: osrm-extract command line options: help
        And stdout should contain "Options:"
        And stdout should contain "--version"
        And stdout should contain "--help"
-        And stdout should contain "--verbosity"
        And stdout should contain "Configuration:"
        And stdout should contain "--profile"
        And stdout should contain "--threads"
@@ -1,12 +1,22 @@
@extract
 Feature: osrm-extract lua ways:get_nodes()

+    Background:
+        Given the node map
+            """
+            a b
+            """
+        And the ways
+            | nodes |
+            | ab    |
+        And the data has been saved to disk
+
    Scenario: osrm-extract - Passing base file
        Given the profile file
        """
        functions = require('testbot')

-        functions.process_way = function(profile, way, result)
+        function way_function(profile, way, result)
          for _, node in ipairs(way:get_nodes()) do
            print('node id ' .. node:id())
          end
@@ -14,138 +24,10 @@ Feature: osrm-extract lua ways:get_nodes()
          result.forward_speed = 1
        end

+        functions.process_way = way_function
        return functions
        """
-        And the node map
-            """
-            a b
-            """
-        And the ways
-            | nodes |
-            | ab    |
-        And the data has been saved to disk
-
        When I run "osrm-extract --profile {profile_file} {osm_file}"
        Then it should exit successfully
        And stdout should contain "node id 1"
        And stdout should contain "node id 2"
-
-
-    Scenario: osrm-extract location-dependent data without add-locations-to-ways preprocessing and node locations cache
-        Given the profile file
-        """
-        functions = require('testbot')
-
-        functions.process_way = function(profile, way, result, relations)
-           print(way:get_location_tag('driving_side'))
-        end
-
-        return functions
-        """
-        And the node map
-            """
-            a b
-            """
-        And the ways
-            | nodes |
-            | ab    |
-        And the data has been saved to disk
-
-        When I try to run "osrm-extract --profile {profile_file} {osm_file} --location-dependent-data test/data/regions/null-island.geojson --disable-location-cache"
-        Then it should exit with an error
-        And stderr should contain "invalid location"
-
-    Scenario: osrm-extract location-dependent data
-        Given the profile file
-        """
-        functions = require('testbot')
-
-        functions.process_way = function(profile, way, result, relations)
-           for _, key in ipairs({'answer', 'boolean', 'object', 'array'}) do
-             print (key .. ' ' .. tostring(way:get_location_tag(key)))
-           end
-           result.forward_mode = mode.driving
-           result.forward_speed = 1
-        end
-
-        return functions
-        """
-        And the node map
-            """
-            a b
-            """
-        And the ways with locations
-            | nodes |
-            | ab    |
-        And the data has been saved to disk
-
-        When I run "osrm-extract --profile {profile_file} {osm_file} --location-dependent-data test/data/regions/null-island.geojson  --disable-location-cache"
-        Then it should exit successfully
-        And stdout should contain "answer 42"
-        And stdout should contain "boolean true"
-        And stdout should contain "array nil"
-        And stdout should contain "object nil"
-
-
-    Scenario: osrm-extract location-dependent data with multi-polygons
-        Given the profile file
-        """
-        functions = require('testbot')
-
-        functions.process_way = function(profile, way, result, relations)
-           print('ISO3166-1 ' .. (way:get_location_tag('ISO3166-1') or 'none'))
-           print('answer ' .. (way:get_location_tag('answer') or 'none'))
-           result.forward_mode = mode.driving
-           result.forward_speed = 1
-        end
-
-        return functions
-        """
-        And the node locations
-            | node |        lat |         lon | id |
-            | a    | 22.4903670 | 113.9455227 |  1 |
-            | b    | 22.4901701 | 113.9455899 |  2 |
-            | c    | 22.4901852 | 113.9458608 |  3 |
-            | d    | 22.4904033 | 113.9456999 |  4 |
-            | e    |        1.1 |           1 |  5 |
-            | f    |        1.2 |           1 |  6 |
-        And the ways with locations
-            | nodes | #              |
-            | ab    | Hong Kong      |
-            | cd    | China Mainland |
-            | ef    | Null Island    |
-        And the data has been saved to disk
-
-        When I run "osrm-extract --profile {profile_file} {osm_file} --location-dependent-data test/data/regions/null-island.geojson --location-dependent-data test/data/regions/hong-kong.geojson --disable-location-cache"
-        Then it should exit successfully
-        And stdout should not contain "1 GeoJSON polygon"
-        And stdout should contain "2 GeoJSON polygons"
-        And stdout should contain "ISO3166-1 HK"
-        And stdout should contain "ISO3166-1 none"
-        And stdout should contain "answer 42"
-
-    Scenario: osrm-extract location-dependent data via locations cache
-        Given the profile file
-        """
-        functions = require('testbot')
-
-        functions.process_way = function(profile, way, result, relations)
-           print ('answer ' .. tostring(way:get_location_tag('answer')))
-           result.forward_mode = mode.driving
-           result.forward_speed = 1
-        end
-
-        return functions
-        """
-        And the node map
-            """
-            a b
-            """
-        And the ways
-            | nodes |
-            | ab    |
-        And the data has been saved to disk
-
-        When I run "osrm-extract --profile {profile_file} {osm_file} --location-dependent-data test/data/regions/null-island.geojson"
-        Then it should exit successfully
-        And stdout should contain "answer 42"
@@ -1,32 +0,0 @@
-@extract
-Feature: osrm-extract must be silent with NONE
-
-    Background:
-        Given the node map
-            """
-            a b
-            """
-        And the ways
-            | nodes |
-            | ab    |
-        And the data has been saved to disk
-
-    Scenario: osrm-extract - Passing base file with verbosity NONE
-        Given the profile file
-        """
-        functions = require('testbot')
-
-        function way_function(profile, way, result)
-          result.forward_mode = mode.driving
-          result.forward_speed = 1
-        end
-
-        functions.process_way = way_function
-        return functions
-        """
-        When I run "osrm-extract --profile {profile_file} {osm_file} --verbosity NONE"
-        Then it should exit successfully
-        And stdout should not contain "[info]"
-        And stdout should not contain "[error]"
-        And stdout should not contain "10%"
-        And stderr should be empty
@@ -8,7 +8,7 @@ Feature: osrm-extract command line options: version
        Given the profile "testbot"
    
    Scenario: osrm-extract - Version, short
-        When I run "osrm-extract -v"
+        When I run "osrm-extract --v"
        Then stderr should be empty
        And stdout should contain 1 line
        And stdout should contain /(v\d{1,2}\.\d{1,2}\.\d{1,2}|\w*-\d+-\w+)/
@@ -8,7 +8,6 @@ Feature: osrm-partition command line options: help
        And stdout should contain "Options:"
        And stdout should contain "--version"
        And stdout should contain "--help"
-        And stdout should contain "--verbosity"
        And stdout should contain "Configuration:"
        And stdout should contain "--threads"
        And stdout should contain "--balance"
@@ -25,7 +24,6 @@ Feature: osrm-partition command line options: help
        And stdout should contain "Options:"
        And stdout should contain "--version"
        And stdout should contain "--help"
-        And stdout should contain "--verbosity"
        And stdout should contain "Configuration:"
        And stdout should contain "--threads"
        And stdout should contain "--balance"
@@ -42,7 +40,6 @@ Feature: osrm-partition command line options: help
        And stdout should contain "Options:"
        And stdout should contain "--version"
        And stdout should contain "--help"
-        And stdout should contain "--verbosity"
        And stdout should contain "Configuration:"
        And stdout should contain "--threads"
        And stdout should contain "--balance"
@@ -5,7 +5,7 @@ Feature: osrm-partition command line options: version
        Given the profile "testbot"

    Scenario: osrm-partition - Version, short
-        When I run "osrm-partition -v"
+        When I run "osrm-partition --v"
        Then stderr should be empty
        And stdout should contain 1 line
        And stdout should contain /(v\d{1,2}\.\d{1,2}\.\d{1,2}|\w*-\d+-\w+)/
@@ -24,7 +24,7 @@ Feature: Invalid profile API versions
    Scenario: Profile API version too high
        Given the profile file
          """
-          api_version = 5
+          api_version = 3
          """
        And the node map
          """
@@ -1,101 +0,0 @@
-Feature: Profile API version 3
-
-    Background:
-        Given a grid size of 100 meters
-
-    Scenario: Basic profile function calls and property values
-        Given the profile file
-            """
-            api_version = 3
-
-            Set = require('lib/set')
-            Sequence = require('lib/sequence')
-            Handlers = require("lib/way_handlers")
-            find_access_tag = require("lib/access").find_access_tag
-            limit = require("lib/maxspeed").limit
-
-            function setup()
-              return {
-                properties = {
-                  max_speed_for_map_matching      = 180/3.6,
-                  use_turn_restrictions           = true,
-                  continue_straight_at_waypoint   = true,
-                  weight_name                     = 'test_version2',
-                  weight_precision                = 2
-                },
-                relation_types = Sequence { "route" }
-              }
-            end
-
-            function process_node(profile, node, result, relations)
-              print ('process_node ' .. node:id())
-            end
-
-            function process_way(profile, way, result, relations)
-              result.name = way:get_value_by_key('name')
-              result.weight = 10
-              result.forward_mode = mode.driving
-              result.backward_mode = mode.driving
-              result.forward_speed = 36
-              result.backward_speed = 36
-
-              local rel_id_list = relations:get_relations(way)
-              for i, rel_id in ipairs(rel_id_list) do
-                local rel = relations:relation(rel_id)
-                local role = rel:get_role(way)
-                print('role_' .. role)
-              end
-              print ('process_way ' .. way:id() .. ' ' .. result.name)
-            end
-
-            function process_turn (profile, turn)
-              print('process_turn', turn.angle, turn.turn_type, turn.direction_modifier, turn.has_traffic_light)
-              turn.weight = turn.angle == 0 and 0 or 4.2
-              turn.duration = turn.weight
-            end
-
-            function process_segment (profile, segment)
-                print ('process_segment ' .. segment.source.lon .. ' ' .. segment.source.lat)
-            end
-
-            return {
-              setup = setup,
-              process_node = process_node,
-              process_way = process_way,
-              process_relation = process_relation,
-              process_segment = process_segment,
-              process_turn = process_turn
-            }
-            """
-        And the node map
-            """
-               a
-              bcd
-               e
-            """
-        And the ways
-            | nodes  |
-            | ac     |
-            | cb     |
-            | cd     |
-            | ce     |
-
-        And the relations
-            | type        | way:north | route |
-            | route       | ac        | road  |
-
-        And the data has been saved to disk
-
-        When I run "osrm-extract --profile {profile_file} {osm_file}"
-        Then it should exit successfully
-        And stdout should contain "process_node"
-        And stdout should contain "process_way"
-        And stdout should contain "process_turn"
-        And stdout should contain "process_segment"
-        And stdout should contain "role_north"
-
-        When I route I should get
-           | from | to | route    | time  |
-           | a    | b  | ac,cb,cb | 19.2s |
-           | a    | d  | ac,cd,cd | 19.2s |
-           | a    | e  | ac,ce    | 20s   |
@@ -11,7 +11,6 @@ Feature: osrm-routed command line options: help
        And stdout should contain "Options:"
        And stdout should contain "--version"
        And stdout should contain "--help"
-        And stdout should contain "--verbosity"
        And stdout should contain "--trial"
        And stdout should contain "Configuration:"
        And stdout should contain "--ip"
@@ -31,7 +30,6 @@ Feature: osrm-routed command line options: help
        And stdout should contain "Options:"
        And stdout should contain "--version"
        And stdout should contain "--help"
-        And stdout should contain "--verbosity"
        And stdout should contain "--trial"
        And stdout should contain "Configuration:"
        And stdout should contain "--ip"
@@ -51,7 +49,6 @@ Feature: osrm-routed command line options: help
        And stdout should contain "Options:"
        And stdout should contain "--version"
        And stdout should contain "--help"
-        And stdout should contain "--verbosity"
        And stdout should contain "--trial"
        And stdout should contain "Configuration:"
        And stdout should contain "--ip"
@@ -8,7 +8,7 @@ Feature: osrm-routed command line options: version
        Given the profile "testbot"
    
    Scenario: osrm-routed - Version, short
-        When I run "osrm-routed -v"
+        When I run "osrm-routed --v"
        Then stderr should be empty
        And stdout should contain 1 line
        And stdout should contain /(v\d{1,2}\.\d{1,2}\.\d{1,2}|\w*-\d+-\w+)/
@@ -8,7 +8,7 @@ var OSM = require('../lib/osm');

 module.exports = function () {
    this.Given(/^the profile "([^"]*)"$/, (profile, callback) => {
-        this.profile = this.OSRM_PROFILE || profile;
+        this.profile = profile;
        this.profileFile = path.join(this.PROFILES_PATH, this.profile + '.lua');
        callback();
    });
@@ -129,13 +129,13 @@ module.exports = function () {
        q.awaitAll(callback);
    });

-    this.Given(/^the ways( with locations)?$/, (add_locations, table, callback) => {
+    this.Given(/^the ways$/, (table, callback) => {
        if (this.osm_str) throw new Error('*** Map data already defined - did you pass an input file in this scenario?');

        let q = d3.queue();

        let addWay = (row, cb) => {
-            let way = new OSM.Way(this.makeOSMId(), this.OSM_USER, this.OSM_TIMESTAMP, this.OSM_UID, !!add_locations);
+            let way = new OSM.Way(this.makeOSMId(), this.OSM_USER, this.OSM_TIMESTAMP, this.OSM_UID);

            let nodes = row.nodes;
            if (this.nameWayHash.nodes) throw new Error(util.format('*** duplicate way %s', nodes));
@@ -188,12 +188,9 @@ module.exports = function () {
        let addRelation = (row, cb) => {
            let relation = new OSM.Relation(this.makeOSMId(), this.OSM_USER, this.OSM_TIMESTAMP, this.OSM_UID);

-
-            var name = null;
            for (let key in row) {
-                let isNode = key.match(/^node:?(.*)/),
-                    isWay = key.match(/^way:?(.*)/),
-                    isRelation = key.match(/^relation:?(.*)/),
+                let isNode = key.match(/^node:(.*)/),
+                    isWay = key.match(/^way:(.*)/),
                    isColonSeparated = key.match(/^(.*):(.*)/);
                if (isNode) {
                    row[key].split(',').map(function(v) { return v.trim(); }).forEach((nodeName) => {
@@ -208,26 +205,14 @@ module.exports = function () {
                        if (!way) throw new Error(util.format('*** unknown relation way member "%s"', wayName));
                        relation.addMember('way', way.id, isWay[1]);
                    });
-                } else if (isRelation) {
-                    row[key].split(',').map(function(v) { return v.trim(); }).forEach((relName) => {
-                        let otherrelation = this.findRelationByName(relName);
-                        if (!otherrelation) throw new Error(util.format('*** unknown relation relation member "%s"', relName));
-                        relation.addMember('relation', otherrelation.id, isRelation[1]);
-                    });
                } else if (isColonSeparated && isColonSeparated[1] !== 'restriction') {
                    throw new Error(util.format('*** unknown relation member type "%s:%s", must be either "node" or "way"', isColonSeparated[1], isColonSeparated[2]));
                } else {
                    relation.addTag(key, row[key]);
-                    if (key.match(/name/)) name = row[key];
                }
            }
            relation.uid = this.OSM_UID;

-
-            if (name) {
-                this.nameRelationHash[name] = relation;
-            }
-
            this.OSMDB.addRelation(relation);

            cb();
@@ -11,7 +11,7 @@ module.exports = function () {
        var waypoints = [],
            columnHeaders = tableRows[0].slice(1),
            rowHeaders = tableRows.map((h) => h[0]).slice(1),
-            symmetric = columnHeaders.length == rowHeaders.length && columnHeaders.every((ele, i) => ele === rowHeaders[i]);
+            symmetric = columnHeaders.every((ele, i) => ele === rowHeaders[i]);

        if (symmetric) {
            columnHeaders.forEach((nodeName) => {
@@ -150,8 +150,7 @@ module.exports = function () {
                    }
                    var ok = true;
                    var encodedResult = '',
-                        extendedTarget = '',
-                        resultWaypoints = [];
+                        extendedTarget = '';

                    var testSubMatching = (sub, si) => {
                        var testSubNode = (ni) => {
@@ -187,29 +186,6 @@ module.exports = function () {
                        });
                    }

-                    if (headers.has('waypoints')) {
-                        var got_loc = [];
-                        for (let i = 0; i < json.tracepoints.length; i++) {
-                            if (!json.tracepoints[i]) continue;
-                            if (json.tracepoints[i].waypoint_index != null)
-                                got_loc.push(json.tracepoints[i].location);
-                        }
-
-                        if (row.waypoints.length != got_loc.length)
-                            return cb(new Error(`Expected ${row.waypoints.length} waypoints, got ${got_loc.length}`));
-
-                        for (i = 0; i < row.waypoints.length; i++)
-                        {
-                            var want_node = this.findNodeByName(row.waypoints[i]);
-                            if (!this.FuzzyMatch.matchLocation(got_loc[i], want_node)) {
-                                resultWaypoints.push(util.format('? [%s,%s]', got_loc[i][0], got_loc[i][1]));
-                                ok = false;
-                            } else {
-                                resultWaypoints.push(row.waypoints[i]);
-                            }
-                        }
-                    }
-
                    if (ok) {
                        if (headers.has('matchings')) {
                            got.matchings = row.matchings;
@@ -218,12 +194,7 @@ module.exports = function () {
                        if (headers.has('timestamps')) {
                            got.timestamps = row.timestamps;
                        }
-
-                        if (headers.has('waypoints')) {
-                            got.waypoints = row.waypoints;
-                        }
                    } else {
-                        got.waypoints = resultWaypoints.join(';');
                        got.matchings = encodedResult;
                        row.matchings = extendedTarget;
                    }
@@ -54,14 +54,12 @@ module.exports = function () {

    this.Then(/^stdout should( not)? contain "(.*?)"$/, (not, str) => {
        const contains = this.stdout.indexOf(str) > -1;
-        assert.ok(typeof not === 'undefined' ? contains : !contains,
-                  'stdout ' + (typeof not === 'undefined' ? 'does not contain' : 'contains') + ' "' + str + '"');
+        assert.ok(typeof not === 'undefined' ? contains : !contains);
    });

    this.Then(/^stderr should( not)? contain "(.*?)"$/, (not, str) => {
        const contains = this.stderr.indexOf(str) > -1;
-        assert.ok(typeof not === 'undefined' ? contains : !contains,
-                 'stderr ' + (typeof not === 'undefined' ? 'does not contain' : 'contains') + ' "' + str + '"');
+        assert.ok(typeof not === 'undefined' ? contains : !contains);
    });

    this.Then(/^stdout should contain \/(.*)\/$/, (regexStr) => {
@@ -28,16 +28,13 @@ module.exports = function() {
            let uri = feature.getUri();

            // setup cache for feature data
-            // if OSRM_PROFILE is set to force a specific profile, then
-             // include the profile name in the hash of the profile file
-            hash.hashOfFile(uri, this.OSRM_PROFILE, (err, hash) => {
+            hash.hashOfFile(uri, (err, hash) => {
                if (err) return callback(err);

                // shorten uri to be realtive to 'features/'
                let featurePath = path.relative(path.resolve('./features'), uri);
                // bicycle/bollards/{HASH}/
-                let featureID = path.join(featurePath, hash);                    
-                
+                let featureID = path.join(featurePath, hash);
                let featureCacheDirectory = this.getFeatureCacheDirectory(featureID);
                let featureProcessedCacheDirectory = this.getFeatureProcessedCacheDirectory(featureCacheDirectory, this.osrmHash);
                this.featureIDs[uri] = featureID;
@@ -144,10 +144,6 @@ module.exports = function () {
        return this.nameWayHash[s.toString()] || this.nameWayHash[s.toString().split('').reverse().join('')];
    };

-    this.findRelationByName = (s) => {
-        return this.nameRelationHash[s.toString()] || this.nameRelationHash[s.toString().split('').reverse().join('')];
-    };
-
    this.makeOSMId = () => {
        this.osmID = this.osmID + 1;
        return this.osmID;
@@ -159,7 +155,6 @@ module.exports = function () {
        this.locationHash = {};
        this.shortcutsHash = {};
        this.nameWayHash = {};
-        this.nameRelationHash = {};
        this.osmID = 0;
    };

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel Patterson	eeff4be544	Enable builds on 5.10 release branch.	2017-08-03 13:05:54 -07:00
Daniel Patterson	7fdc544229	Set version to 5.10	2017-08-03 12:57:09 -07:00
Moritz Kobitzsch	52691af7ba	Add regression test for interaction between via-way and via-node	2017-08-03 12:52:04 -07:00
Moritz Kobitzsch	19c57771a1	move babel to dev dependencies, update releasing docs to reflect scripts in package.json	2017-08-03 12:52:00 -07:00
Daniel J. Hofmann	77141d1088	Updates our node osrm docs and re-runs docs generation, resolves #4043	2017-08-03 12:51:54 -07:00
Daniel J. Hofmann	57955cd0d6	Adds babel transformation needed for node osrm docs	2017-08-03 12:51:48 -07:00
Michael Krasnyk	2e91874104	Fix gcc5 internal compilation error	2017-08-03 12:51:40 -07:00