Set OSX timeout to a minute

Double timeout again
One TIMEOUT to rule them all
2016-05-06 10:36:40 +02:00 · 2016-05-05 21:07:38 +02:00 · 2016-05-05 18:36:30 +02:00 · 2016-05-05 17:12:22 +02:00 · 2016-05-05 15:57:51 +02:00 · 2016-05-05 13:24:27 +02:00
249 changed files with 12113 additions and 5199 deletions
@@ -80,6 +80,8 @@ stxxl.errlog
 /test/profile.lua
 /test/cache
 /test/speeds.csv
+/test/penalties.csv
+/test/data/monaco.*
 node_modules

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

+git:
+  depth: 10

 # sudo:required is needed for trusty images
 sudo: required
@@ -13,165 +13,166 @@ notifications:
 branches:
  only:
    - master
-    - develop
+
+cache:
+  ccache: true
+  apt: true
+
+env:
+  global:
+   - CCACHE_TEMPDIR=/tmp/.ccache-temp
+   - CCACHE_COMPRESS=1
+   - JOBS=4

 matrix:
  fast_finish: true

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

    # Debug Builds
    - os: linux
-      compiler: gcc
+      compiler: "gcc-5-debug"
      addons: &gcc5
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
-      env: COMPILER='g++-5' BUILD_TYPE='Debug'
+          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
+      env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Debug'

    - os: linux
-      compiler: gcc
+      compiler: "gcc-4.8-debug"
      addons: &gcc48
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
-      env: COMPILER='g++-4.8' BUILD_TYPE='Debug'
+          packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
+      env: CCOMPILER='gcc-4.8' CXXCOMPILER='g++-4.8' BUILD_TYPE='Debug'

    - os: linux
-      compiler: clang
+      compiler: "clang-3.8-debug"
      addons: &clang38
        apt:
-          sources: ['llvm-toolchain-precise', 'ubuntu-toolchain-r-test']
-          packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
-      env: COMPILER='clang++-3.8' BUILD_TYPE='Debug' RUN_CLANG_FORMAT=ON
+          sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
+          packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
+      env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Debug' RUN_CLANG_FORMAT=ON

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

    # Release Builds
    - os: linux
-      compiler: gcc
+      compiler: "gcc-5-release"
      addons: &gcc5
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
-      env: COMPILER='g++-5' BUILD_TYPE='Release'
+          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
+      env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release'

-    - os: linux
-      compiler: gcc
-      addons: &gcc48
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
-      env: COMPILER='g++-4.8' BUILD_TYPE='Release'
+      # Disabled because of CI slowness
+      #- os: linux
+      #- compiler: gcc
+      #- addons: &gcc48
+      #-   apt:
+      #-     sources: ['ubuntu-toolchain-r-test']
+      #-     packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      #- env: CCOMPILER='gcc-4.8' CXXCOMPILER='g++-4.8' BUILD_TYPE='Release'

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

-    - os: osx
-      osx_image: xcode7.3
-      compiler: clang
-      env: COMPILER='clang++' BUILD_TYPE='Release'
+      # Disabled because of CI slowness
+      #- os: osx
+      #- osx_image: xcode7.3
+      #- compiler: clang
+      #- env: CCOMPILER='clang' CXXCOMPILER='clang++' BUILD_TYPE='Release'

    # Shared Library
    - os: linux
-      compiler: gcc
+      compiler: "gcc-5-release-shared"
      addons: &gcc5
        apt:
          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
-      env: COMPILER='g++-5' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
+          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
+      env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON

-    - os: linux
-      compiler: clang
-      addons: &clang38
-        apt:
-          sources: ['llvm-toolchain-precise', 'ubuntu-toolchain-r-test']
-          packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
-      env: COMPILER='clang++-3.8' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
-
-
-    # Disabled until tests all pass on OSX:
-    #
-    # 3/ OSX Clang Builds
-    #- os: osx
-    #  osx_image: xcode6.4
-    #  compiler: clang
-    #  env: COMPILER='clang++' BUILD_TYPE='Debug'
-
-    #- os: osx
-    #  osx_image: xcode6.4
-    #  compiler: clang
-    #  env: COMPILER='clang++' BUILD_TYPE='Release'
-
-    #- os: osx
-    #  osx_image: xcode6.4
-    #  compiler: clang
-    #  env: COMPILER='clang++' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
-
-    #- os: osx
-    #  osx_image: xcode7
-    #  compiler: clang
-    #  env: COMPILER='clang++' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
+      # Disabled because CI slowness
+      #- os: linux
+      #- compiler: clang
+      #- addons: &clang38
+      #-   apt:
+      #-     sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
+      #-     packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      #- env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON

 before_install:
  - source ./scripts/install_node.sh 4
-
-install:
  - npm install
  - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
  - mkdir -p ${DEPS_DIR} && cd ${DEPS_DIR}
  - |
    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
-      CMAKE_URL="http://www.cmake.org/files/v3.3/cmake-3.3.2-Linux-x86_64.tar.gz"
+      CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.1-Linux-x86_64.tar.gz"
      mkdir cmake && travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
      export PATH=${DEPS_DIR}/cmake/bin:${PATH}
-
    elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
      # implicit deps, but seem to be installed by default with recent images: libxml2 GDAL boost
-      brew install cmake libzip libstxxl lua51 luabind tbb md5sha1sum
+      brew install cmake libzip libstxxl lua51 luabind tbb md5sha1sum ccache
    fi

-before_script:
+install:
  - cd ${TRAVIS_BUILD_DIR}
  - |
    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
      ./scripts/check_taginfo.py taginfo.json profiles/car.lua
    fi
  - mkdir build && pushd build
-  - export CXX=${COMPILER}
-  - export OSRM_PORT=5000 OSRM_TIMEOUT=6000
-  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DBUILD_TOOLS=1 -DENABLE_CCACHE=0
-
-script:
-  - make --jobs=2
-  - make tests --jobs=2
-  - make benchmarks
+  - export CC=${CCOMPILER} CXX=${CXXCOMPILER}
+  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DCOVERAGE=${COVERAGE:-OFF} -DBUILD_TOOLS=1 -DENABLE_CCACHE=ON
+  - echo "travis_fold:start:MAKE"
+  - make --jobs=${JOBS}
+  - make tests --jobs=${JOBS}
+  - make benchmarks --jobs=${JOBS}
+  - echo "travis_fold:end:MAKE"
+  - ccache -s
  - sudo make install
  - |
    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
      sudo ldconfig
    fi
-  - ./extractor-tests
-  - ./engine-tests
-  - ./util-tests
  - popd
-  - npm test
-  - make -C test/data
-  - ./build/library-tests test/data/monaco.osrm
  - mkdir example/build && pushd example/build
  - cmake ..
  - make
-  - ./osrm-example ../../test/data/monaco.osrm
  - popd
+
+script:
+  - echo "travis_fold:start:BENCHMARK"
+  - make -C test/data benchmark
+  - echo "travis_fold:end:BENCHMARK"
+  - ./example/build/osrm-example test/data/monaco.osrm
+  # All tests assume to be run from the build directory
+  - pushd build
+  - ./unit_tests/library-tests ../test/data/monaco.osrm
+  - ./unit_tests/extractor-tests
+  - ./unit_tests/engine-tests
+  - ./unit_tests/util-tests
+  - ./unit_tests/server-tests
+  - popd
+  - npm test
+
+after_success:
  - |
-    if [ -n "$RUN_CLANG_FORMAT" ]; then
+    if [ -n "${RUN_CLANG_FORMAT}" ]; then
      ./scripts/format.sh || true # we don't want to fail just yet
    fi
+  - |
+    if [ -n "${COVERAGE}" ]; then
+      coveralls --build-root build --exclude unit_tests --exclude third_party --exclude node_modules --gcov-options '\-lp'
+    fi
@@ -1,3 +1,105 @@
+# 5.1.0
+   Changes with regard to 5.0.0
+
+   - API:
+     - added StepManeuver type `roundabout turn`. The type indicates a small roundabout that is treated as an intersection
+        (turn right at the roundabout for first exit, go straight at the roundabout...)
+     - added StepManeuver type `on ramp` and `off ramp` to distinguish between ramps that enter and exit a highway.
+     - reduced new name instructions for trivial changes
+     - combined multiple turns into a single instruction at segregated roads`
+
+   - Profile Changes:
+    - introduced a suffix_list / get_name_suffix_list to specify name suffices to be suppressed in name change announcements
+    - street names are now consistently assembled for the car, bike and walk profile as: "Name (Ref)" as in "Berlin (A5)"
+    - new `car.lua` dependency `lib/destination.lua`
+    - register a way's .nodes() function for use in the profile's way_function.
+
+   - Infrastructure
+    - BREAKING: reordered internal instruction types. This breaks the **data format**
+
+   - Fixes:
+    - Issue #2310: post-processing for local paths, fixes #2310
+    - Issue #2309: local path looping, fixes #2309
+    - Issue #2356: Make hint values optional
+    - Issue #2349: Segmentation fault in some requests
+    - Issue #2335: map matching was using shortest path with uturns disabled
+    - Issue #2193: Fix syntax error position indicators in parameters queries
+    - Fix search with u-turn
+    - PhantomNode packing in MSVC now the same on other platforms
+    - Summary is now not malformed when including unnamed roads
+    - Emit new-name on when changing fron unanmed road to named road
+
+# 5.0.0
+   Changes with regard 5.0.0 RC2:
+   - API:
+     - if `geometry=geojson` is passed the resulting geometry can be a LineString or Point
+       depending on how many coordinates are present.
+     - the removal of the summary field was revered. for `steps=flase` the field will always be an empty string.
+
+   Changes with regard to 4.9.1:
+   - API:
+     - BREAKING: Complete rewrite of the HTTP and library API. See detailed documentation in the wiki.
+     - BREAKING: The default coordinate order is now `longitude, latidue`. Exception: Polyline geometry
+         which follow the original Google specification of `latitdue, longitude`.
+     - BREAKING: Polyline geometries now use precision 5, instead of previously 6
+     - BREAKING: Removed GPX support
+     - New service `tile` which serves debug vector tiles of the road network
+     - Completely new engine for guidance generation:
+        - Support for highway ramps
+        - Support for different intersection types (end of street, forks, merges)
+        - Instruction post-processing to merge unimportant instructions
+        - Improved handling of roundabouts
+
+   - Tools:
+     - BREAKING: Renamed osrm-prepare to osrm-contract
+     - BREAKING: Removes profiles from osrm-contract, only needed in osrm-extract.
+     - Abort processing in osrm-extract if there are no snappable edges remaining.
+     - Added .properties file to osrm-extract ouput.
+     - Enables the use of multiple segment-speed-files on the osrm-contract command line
+
+   - Profile changes:
+     - Remove movable bridge mode
+     - Add `maxspeed=none` tag to car profile.
+     - A `side_road` tag support for the OSRM car profile.
+
+   - Fixes:
+     - Issue #2150: Prevents routing over delivery ways and nodes
+     - Issue #1972: Provide uninstall target
+     - Issue #2072: Disable alternatives by default and if core factor < 1.0
+     - Issue #1999: Fix unpacking for self-loop nodes not in core.
+
+   - Infrastructure:
+     - Cucumber test suit is now based on cucumber-js, removes Ruby as dependency
+     - Updated to mapbox/variant v1.1
+     - Updated to libosmium v2.6.1
+     - Remove GeoJSON based debugging output, replaced by debug tiles
+
+
+# 5.0.0 RC2
+   - Profiles:
+      - `properties.allow_uturns_at_via` -> `properties.continue_straight_at_waypoint` (value is inverted!)
+   - API:
+      - Removed summary from legs property
+      - Disable steps and alternatives by default
+      - Fix `code` field: 'ok' -> 'Ok'
+      - Allow 4.json and 4.3.json format
+      - Conform to v5 spec and support "unlimited" as radiuses value.
+      - `uturns` parameter was replaced by `continue_straight` (value is inverted!)
+   - Features:
+      - Report progress for gennerating edge expanded edges in the edge based graph factory
+      - Add maxspeed=none tag to car profile.
+      - Optimize StaticRTree code: speedup 2x (to RC1)
+      - Optimize DouglasPeucker code: speedup 10x (to RC1)
+      - Optimize WebMercator projection: speedup 2x (to RC1)
+   - Bugs:
+      - #2195: Resolves issues with multiple includedirs in pkg-config file
+      - #2219: Internal server error when using the match plugin
+      - #2027: basename -> filename
+      - #2168: Report correct position where parsing failed
+      - #2036: Add license to storage and storage config exposed in public API
+      - Fix uturn detection in match plugin
+      - Add missing -lz to fix linking of server-tests
+
 # 5.0.0 RC1
   - Renamed osrm-prepare into osrm-contract
   - osrm-contract does not need a profile parameter anymore
@@ -8,7 +8,7 @@ endif()

 project(OSRM C CXX)
 set(OSRM_VERSION_MAJOR 5)
-set(OSRM_VERSION_MINOR 0)
+set(OSRM_VERSION_MINOR 1)
 set(OSRM_VERSION_PATCH 0)

 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -25,15 +25,17 @@ else()
  message(WARNING "Building on a 32 bit system is unsupported")
 endif()

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

 option(ENABLE_CCACHE "Speed up incremental rebuilds via ccache" ON)
 option(ENABLE_JSON_LOGGING "Adds additional JSON debug logging to the response" OFF)
 option(BUILD_TOOLS "Build OSRM tools" OFF)
-option(BUILD_COMPONENTS "Build OSRM tools" ON)
+option(BUILD_COMPONENTS "Build osrm-components" ON)
 option(ENABLE_ASSERTIONS OFF)
+option(COVERAGE OFF)
+option(SANITIZER OFF)

 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/)
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/)
@@ -46,10 +48,7 @@ add_custom_target(FingerPrintConfigure ALL ${CMAKE_COMMAND}
  COMMENT "Configuring revision fingerprint"
  VERBATIM)

-add_custom_target(tests DEPENDS engine-tests extractor-tests util-tests server-tests library-tests)
-add_custom_target(benchmarks DEPENDS rtree-bench)
-
-set(BOOST_COMPONENTS date_time filesystem iostreams program_options regex system thread unit_test_framework)
+set(BOOST_COMPONENTS date_time filesystem iostreams program_options regex system thread)

 configure_file(
  ${CMAKE_CURRENT_SOURCE_DIR}/include/util/version.hpp.in
@@ -61,12 +60,6 @@ file(GLOB ContractorGlob src/contractor/*.cpp)
 file(GLOB StorageGlob src/storage/*.cpp)
 file(GLOB ServerGlob src/server/*.cpp src/server/**/*.cpp)
 file(GLOB EngineGlob src/engine/*.cpp src/engine/**/*.cpp)
-file(GLOB ExtractorTestsGlob unit_tests/extractor/*.cpp)
-file(GLOB EngineTestsGlob unit_tests/engine/*.cpp)
-file(GLOB UtilTestsGlob unit_tests/util/*.cpp)
-file(GLOB ServerTestsGlob unit_tests/server/*.cpp)
-file(GLOB LibraryTestsGlob unit_tests/library/*.cpp)
-file(GLOB IOTestsGlob unit_tests/io/*.cpp)

 add_library(UTIL OBJECT ${UtilGlob})
 add_library(EXTRACTOR OBJECT ${ExtractorGlob})
@@ -87,21 +80,6 @@ add_library(osrm_extract $<TARGET_OBJECTS:EXTRACTOR> $<TARGET_OBJECTS:UTIL>)
 add_library(osrm_contract $<TARGET_OBJECTS:CONTRACTOR> $<TARGET_OBJECTS:UTIL>)
 add_library(osrm_store $<TARGET_OBJECTS:STORAGE> $<TARGET_OBJECTS:UTIL>)

-# Unit tests
-add_executable(engine-tests EXCLUDE_FROM_ALL unit_tests/engine_tests.cpp ${EngineTestsGlob} $<TARGET_OBJECTS:ENGINE> $<TARGET_OBJECTS:STORAGE> $<TARGET_OBJECTS:UTIL>)
-add_executable(extractor-tests EXCLUDE_FROM_ALL unit_tests/extractor_tests.cpp ${ExtractorTestsGlob} $<TARGET_OBJECTS:EXTRACTOR> $<TARGET_OBJECTS:UTIL>)
-add_executable(util-tests EXCLUDE_FROM_ALL unit_tests/util_tests.cpp ${UtilTestsGlob} $<TARGET_OBJECTS:UTIL>)
-add_executable(server-tests EXCLUDE_FROM_ALL unit_tests/server_tests.cpp ${ServerTestsGlob} $<TARGET_OBJECTS:UTIL> $<TARGET_OBJECTS:SERVER>)
-add_executable(library-tests EXCLUDE_FROM_ALL unit_tests/library_tests.cpp ${LibraryTestsGlob})
-
-# Benchmarks
-add_executable(rtree-bench EXCLUDE_FROM_ALL src/benchmarks/static_rtree.cpp $<TARGET_OBJECTS:UTIL>)
-
-target_include_directories(engine-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/unit_tests)
-target_include_directories(util-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/unit_tests)
-target_include_directories(library-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/)
-target_include_directories(rtree-bench PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/unit_tests)
-
 # Check the release mode
 if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
  set(CMAKE_BUILD_TYPE Release)
@@ -157,8 +135,20 @@ if(CMAKE_BUILD_TYPE MATCHES Release)
  endif()
 endif()

-if(NOT WIN32)
-  add_definitions(-DBOOST_TEST_DYN_LINK)
+set(MAYBE_COVERAGE_LIBRARIES "")
+if (COVERAGE)
+  if (NOT CMAKE_BUILD_TYPE MATCHES "Debug")
+    message(ERROR "COVERAGE=ON only make sense with a Debug build")
+  endif()
+  message(INFO "Enabling coverage")
+  set(MAYBE_COVERAGE_LIBRARIES "gcov")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs")
+endif()
+if (SANITIZER)
+  if (NOT CMAKE_BUILD_TYPE MATCHES "Debug")
+    message(ERROR "SANITIZER=ON only make sense with a Debug build")
+  endif()
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
 endif()

 # Configuring compilers
@@ -242,11 +232,13 @@ find_package(Osmium REQUIRED COMPONENTS io)
 include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS})


-find_package(Boost 1.49.0 COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
+find_package(Boost 1.49.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 if(NOT WIN32)
  add_definitions(-DBOOST_TEST_DYN_LINK)
 endif()
-add_definitions(-DBOOST_SPIRIT_USE_PHOENIX_V3 -DBOOST_RESULT_OF_USE_DECLTYPE)
+add_definitions(-DBOOST_SPIRIT_USE_PHOENIX_V3)
+add_definitions(-DBOOST_RESULT_OF_USE_DECLTYPE)
+add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED)
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS})

 find_package(Threads REQUIRED)
@@ -257,7 +249,7 @@ if(WIN32 AND CMAKE_BUILD_TYPE MATCHES Debug)
  set(TBB_LIBRARIES ${TBB_DEBUG_LIBRARIES})
 endif()

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

@@ -307,7 +299,8 @@ set(EXTRACTOR_LIBRARIES
    ${OSMIUM_LIBRARIES}
    ${STXXL_LIBRARY}
    ${TBB_LIBRARIES}
-    ${ZLIB_LIBRARY})
+    ${ZLIB_LIBRARY}
+    ${MAYBE_COVERAGE_LIBRARIES})
 set(CONTRACTOR_LIBRARIES
    ${Boost_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
@@ -315,35 +308,32 @@ set(CONTRACTOR_LIBRARIES
    ${USED_LUA_LIBRARIES}
    ${STXXL_LIBRARY}
    ${TBB_LIBRARIES}
-    ${MAYBE_RT_LIBRARY})
+    ${MAYBE_RT_LIBRARY}
+    ${MAYBE_COVERAGE_LIBRARIES})
 set(ENGINE_LIBRARIES
    ${Boost_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
    ${STXXL_LIBRARY}
    ${TBB_LIBRARIES}
-    ${MAYBE_RT_LIBRARY})
+    ${MAYBE_RT_LIBRARY}
+    ${MAYBE_COVERAGE_LIBRARIES})
 set(STORAGE_LIBRARIES
    ${Boost_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
    ${TBB_LIBRARIES}
-    ${MAYBE_RT_LIBRARY})
+    ${MAYBE_RT_LIBRARY}
+    ${MAYBE_COVERAGE_LIBRARIES})
 set(UTIL_LIBRARIES
    ${Boost_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
    ${STXXL_LIBRARY}
-    ${TBB_LIBRARIES})
+    ${TBB_LIBRARIES}
+    ${MAYBE_COVERAGE_LIBRARIES})
 # Libraries
 target_link_libraries(osrm ${ENGINE_LIBRARIES})
 target_link_libraries(osrm_contract ${CONTRACTOR_LIBRARIES})
 target_link_libraries(osrm_extract ${EXTRACTOR_LIBRARIES})
 target_link_libraries(osrm_store ${STORAGE_LIBRARIES})
-# Tests
-target_link_libraries(engine-tests ${ENGINE_LIBRARIES})
-target_link_libraries(server-tests osrm ${Boost_LIBRARIES})
-target_link_libraries(extractor-tests ${EXTRACTOR_LIBRARIES})
-target_link_libraries(rtree-bench ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${TBB_LIBRARIES})
-target_link_libraries(util-tests ${UTIL_LIBRARIES})
-target_link_libraries(library-tests osrm ${Boost_LIBRARIES})

 if(BUILD_COMPONENTS)
  find_package(GDAL)
@@ -460,3 +450,8 @@ configure_file(

 add_custom_target(uninstall
    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake)
+
+
+# Modular build system: each directory registered here provides its own CMakeLists.txt
+add_subdirectory(unit_tests)
+add_subdirectory(src/benchmarks)
@@ -4,12 +4,11 @@ The Open Source Routing Machine is a high performance routing engine written in

 ## Current build status

-| build config |  branch | status |
-|:-------------|:--------|:------------|
-| Linux        | master  | [![Build Status](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=master)](https://travis-ci.org/Project-OSRM/osrm-backend) |
-| Linux        | develop | [![Build Status](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=develop)](https://travis-ci.org/Project-OSRM/osrm-backend) |
-| Windows      | master/develop | [![Build status](https://ci.appveyor.com/api/projects/status/4iuo3s9gxprmcjjh)](https://ci.appveyor.com/project/DennisOSRM/osrm-backend) |
-| LUAbind fork | master  | [![Build Status](https://travis-ci.org/DennisOSRM/luabind.png?branch=master)](https://travis-ci.org/DennisOSRM/luabind) |
+| build config | status |
+|:-------------|:-------|
+| Linux        | [![Build Status](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=master)](https://travis-ci.org/Project-OSRM/osrm-backend) |
+| Windows      | [![Build status](https://ci.appveyor.com/api/projects/status/4iuo3s9gxprmcjjh)](https://ci.appveyor.com/project/DennisOSRM/osrm-backend) |
+| Coverage     | [![Coverage Status](https://coveralls.io/repos/github/Project-OSRM/osrm-backend/badge.svg?branch=master)](https://coveralls.io/github/Project-OSRM/osrm-backend?branch=master) |

 ## Building

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

 ## Documentation

-See the Wiki's [server API documentation](https://github.com/Project-OSRM/osrm-backend/wiki/Server-api) as well as the [library API documentation](https://github.com/Project-OSRM/osrm-backend/wiki/Library-api)
+### Full documentation
+
+- [osrm-routed HTTP API documentation](docs/http.md)
+- [libosrm API documentation](docs/libosrm.md)
+
+### Quick start
+
+Building OSRM assuming all dependencies are installed:
+
+```
+mkdir -p build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release
+cmake --build .
+sudo cmake --build . --target install
+```
+
+Loading preparing a dataset and starting the server:
+
+```
+osrm-extract data.osm.pbf -p profiles/car.lua
+osrm-contract data.osrm
+osrm-routed data.osrm
+```
+
+Running a query on your local server:
+
+```
+curl http://127.0.0.1:5000/13.388860,52.517037;13.385983,52.496891?steps=true&alternatives=true
+```
+
+### Running a request against the Demo Server
+
+First read the [API usage policy](https://github.com/Project-OSRM/osrm-backend/wiki/Api-usage-policy).
+
+Then run simple query with instructions and alternatives on Berlin:
+
+```
+curl https://router.project-osrm.org/13.388860,52.517037;13.385983,52.496891?steps=true&alternatives=true
+```

 ## References in publications

@@ -116,17 +116,20 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR

 SET PATH=%PROJECT_DIR%\osrm-deps\libs\bin;%PATH%

-ECHO running engine-tests.exe ...
-%Configuration%\engine-tests.exe
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 ECHO running extractor-tests.exe ...
-%Configuration%\extractor-tests.exe
+unit_tests\%Configuration%\extractor-tests.exe
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+ECHO running engine-tests.exe ...
+unit_tests\%Configuration%\engine-tests.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 ECHO running util-tests.exe ...
-%Configuration%\util-tests.exe
+unit_tests\%Configuration%\util-tests.exe
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+ECHO running server-tests.exe ...
+unit_tests\%Configuration%\server-tests.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR

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

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

 deploy:
  provider: FTP
@@ -1,5 +1,5 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-includedir=${prefix}/include ${prefix}/include/osrm
+includedir=${prefix}/include
 libdir=${prefix}/lib

 Name: libOSRM
@@ -8,4 +8,4 @@ Version: v@OSRM_VERSION_MAJOR@.@OSRM_VERSION_MINOR@.@OSRM_VERSION_PATCH@
 Requires:
 Libs: -L${libdir} -losrm
 Libs.private: @ENGINE_LIBRARY_LISTING@
-Cflags: -I${includedir}
+Cflags: -I${includedir} -I${includedir}/osrm
@@ -1,6 +1,6 @@
 module.exports = {
-    default: '--require features --tags ~@todo --tags ~@bug --tags ~@stress --tags ~@guidance',
-    verify: '--require features --tags ~@todo --tags ~@bug --tags ~@stress -f progress --tags ~@guidance',
+    default: '--require features --tags ~@stress --tags ~@todo',
+    verify: '--require features --tags ~@todo --tags ~@bug --tags ~@stress -f progress',
    jenkins: '--require features --tags ~@todo --tags ~@bug --tags ~@stress --tags ~@options -f progress',
    bugs: '--require features --tags @bug',
    todo: '--require features --tags @todo',
@@ -0,0 +1,508 @@
+## HTTP API
+
+`osrm-routed` supports only `GET` requests of the form. If you your response size
+exceeds the limits of a simple URL encoding, consider using our [NodeJS bindings](https://github.com/Project-OSRM/node-osrm)
+or using the [C++ library directly](libosrm.md).
+
+### Request
+
+```
+http://{server}/{service}/{version}/{profile}/{coordinates}[.{format}]?option=value&option=value
+```
+
+- `server`: location of the server. Example: `127.0.0.1:5000` (default)
+- `service`: Name of the service to be used. Support are the following services:
+  
+    | Service     |           Description                                     |
+    |-------------|-----------------------------------------------------------|
+    | [`route`](#service-route)     | shortest path between given coordinates                   |
+    | [`nearest`](#service-nearest)   | returns the nearest street segment for a given coordinate |
+    | [`table`](#service-table)     | computes distance tables for given coordinates            |
+    | [`match`](#service-match)     | matches given coordinates to the road network             |
+    | [`trip`](#service-trip)      | Compute the shortest round trip between given coordinates |
+    | [`tile`](#service-tile)      | Return vector tiles containing debugging info             |
+  
+- `version`: Version of the protocol implemented by the service.
+- `profile`: Mode of transportation, is determined by the profile that is used to prepare the data
+- `coordinates`: String of format `{longitude},{latitude};{longitude},{latitude}[;{longitude},{latitude} ...]` or `polyline({polyline})`.
+- `format`: Only `json` is supportest at the moment. This parameter is optional and defaults to `json`.
+
+Passing any `option=value` is optional. `polyline` follows Google's polyline format with precision 5 and can be generated using [this package](https://www.npmjs.com/package/polyline).
+To pass parameters to each location some options support an array like encoding:
+
+```
+{option}={element};{element}[;{element} ... ]
+```
+
+The number of elements must match exactly the number of locations. If you don't want to pass a value but instead use the default you can pass an empty `element`.
+
+Example: 2nd location use the default value for `option`:
+
+```
+{option}={element};;{element}
+```
+
+## General options
+
+| Option     | Values                                                 | Description                                      |
+|------------|--------------------------------------------------------|--------------------------------------------------|
+|bearings    |`{bearing};{bearing}[;{bearing} ...]`                   |Limits the search to segments with given bearing in degrees towards true north in clockwise direction. |
+|radiuses    |`{radius};{radius}[;{radius} ...]`                      |Limits the search to given radius in meters.      |
+|hints       |`{hint};{hint}[;{hint} ...]`                            |Hint to derive position in street network.        |
+
+Where the elements follow the following format:
+
+| Element    | Values                                                 |
+|------------|--------------------------------------------------------|
+|bearing     |`{value},{range}` `integer 0 .. 360,integer 0 .. 180`  |
+|radius      |`double >= 0` or `unlimited` (default)                  |
+|hint        |Base64 `string`                                         |
+
+#### Examples
+
+Query on Berlin with three coordinates:
+
+```
+http://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219?overview=false
+```
+
+Using polyline:
+
+```
+http://router.project-osrm.org/route/v1/driving/polyline(ofp_Ik_vpAilAyu@te@g`E)?overview=false
+```
+
+### Response
+
+Every response object has a `code` field.
+
+```json
+{
+"code": {code},
+"message": {message}
+}
+```
+
+Where `code` is on one of the strings below or service dependent:
+
+| Type              | Description                                                                      |
+|-------------------|----------------------------------------------------------------------------------|
+| `Ok`              | Request could be processed as expected.                                          |
+| `InvalidUrl`      | URL string is invalid.                                                           |
+| `InvalidService`  | Service name is invalid.                                                         |
+| `InvalidVersion`  | Version is not found.                                                            |
+| `InvalidOptions`  | Options are invalid.                                                             |
+| `NoSegment`       | One of the supplied input coordinates could not snap to street segment.          |
+| `TooBig`          | The request size violates one of the service specific request size restrictions. |
+
+`message` is a **optional** human-readable error message. All other status types are service dependent.
+
+In case of an error the HTTP status code will be `400`. Otherwise the HTTP status code will be `200` and `code` will be `Ok`.
+
+## Service `nearest`
+
+Snaps a coordinate to the street network and returns the nearest n matches.
+
+### Request
+
+```
+http://{server}/nearest/v1/{profile}/{coordinates}.json?number={number}
+```
+
+Where `coordinates` only supports a single `{longitude},{latitude}` entry.
+
+In addition to the [general options](#general-options) the following options are supported for this service:
+
+|Option      |Values                        |Description                                         |
+|------------|------------------------------|----------------------------------------------------|
+|number      |`integer >= 1` (default `1`)  |Number of nearest segments that should be returned. |
+
+### Response
+
+- `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
+- `waypoints` array of `Waypoint` objects sorted by distance to the input coordinate. Each object has at least the following additional properties:
+  - `distance`: Distance in meters to the supplied input coordinate.
+
+### Examples
+
+Querying nearest three snapped locations of `13.388860,52.517037` with a bearing between `20° - 340°`.
+
+```
+http://router.project-osrm.org/nearest/v1/driving/13.388860,52.517037?number=3&bearings=0,20
+```
+
+## Service `route`
+
+### Request
+
+```
+http://{server}/route/v1/{profile}/{coordinates}?alternatives={true|false}&steps={true|false}&geometries={polyline|geojson}&overview={full|simplified|false}
+```
+
+In addition to the [general options](#general-options) the following options are supported for this service:
+
+|Option      |Values                                    |Description                                                                    |
+|------------|------------------------------------------|-------------------------------------------------------------------------------|
+|alternatives|`true`, `false` (default)                 |Search for alternative routes and return as well.\*                            |
+|steps       |`true`, `false` (default)                 |Return route steps for each route leg                                          |
+|geometries  |`polyline` (default), `geojson`           |Returned route geometry format (influences overview and per step)             |
+|overview    |`simplified` (default), `full`, `false`   |Add overview geometry either full, simplified according to highest zoom level it could be display on, or not at all.|
+|continue_straight |`default` (default), `true`, `false`|Forces the route to keep going straight at waypoints and don't do a uturn even if it would be faster. Default value depends on the profile. |
+
+\* Please note that even if an alternative route is requested, a result cannot be guaranteed.
+
+### Response
+
+- `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
+- `waypoints`: Array of `Waypoint` objects representing all waypoints in order:
+- `routes`: An array of `Route` objects, ordered by descending recommendation rank.
+
+In case of error the following `code`s are supported in addition to the general ones:
+
+| Type              | Description     |
+|-------------------|-----------------|
+| `NoRoute`        | No route found. |
+
+All other fields might be undefined.
+
+## Service `table`
+### Request
+```
+http://{server}/table/v1/{profile}/{coordinates}?{sources}=[{elem}...];&destinations=[{elem}...]`
+```
+
+This computes duration tables for the given locations. Allows for both symmetric and asymmetric tables.
+
+### Coordinates
+
+In addition to the [general options](#general-options) the following options are supported for this service:
+
+|Option      |Values                                            |Description                                  |
+|------------|--------------------------------------------------|---------------------------------------------|
+|sources     |`{index};{index}[;{index} ...]` or `all` (default)|Use location with given index as source.     |
+|destinations|`{index};{index}[;{index} ...]` or `all` (default)|Use location with given index as destination.|
+
+Unlike other array encoded options, the length of `sources` and `destinations` can be **smaller or equal**
+to number of input locations;
+
+Example:
+
+```
+sources=0;5;7&destinations=5;1;4;2;3;6
+```
+
+|Element     |Values                       |
+|------------|-----------------------------|
+|index       |`0 <= integer < #locations`  |
+
+### Response
+
+- `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
+- `durations` array of arrays that stores the matrix in row-major order. `durations[i][j]` gives the travel time from
+  the i-th waypoint to the j-th waypoint. Values are given in seconds.
+- `sources` array of `Waypoint` objects describing all sources in order
+- `destinations` array of `Waypoint` objects describing all destinations in order
+
+In case of error the following `code`s are supported in addition to the general ones:
+
+| Type              | Description     |
+|-------------------|-----------------|
+| `NoTable`        | No route found. |
+
+All other fields might be undefined.
+
+#### Examples
+
+Returns a `3x3` matrix:
+```
+http://router.project-osrm.org/table/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219
+```
+
+Returns a `1x3` matrix:
+```
+http://router.project-osrm.org/table/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219?sources=0
+```
+
+Returns a asymmetric 3x2 matrix with from the polyline encoded locations `qikdcB}~dpXkkHz`:
+```
+http://router.project-osrm.org/table/v1/driving/qikdcB}~dpXkkHz?sources=0;1;3&destinations=2;4
+```
+
+## Service `match`
+
+Map matching matches given GPS points to the road network in the most plausible way.
+Please note the request might result multiple sub-traces. Large jumps in the timestamps (>60s) or improbable transitions lead to trace splits if a complete matching could not be found.
+The algorithm might not be able to match all points. Outliers are removed if they can not be matched successfully.
+
+### Request
+
+```
+http://{server}/match/v1/{profile}/{coordinates}?steps={true|false}&geometries={polyline|geojson}&overview={simplified|full|false}
+```
+
+In addition to the [general options](#general-options) the following options are supported for this service:
+
+
+|Option      |Values                                          |Description                                                                               |
+|------------|------------------------------------------------|------------------------------------------------------------------------------------------|
+|steps       |`true`, `false` (default)                       |Return route steps for each route                                                         |
+|geometries  |`polyline` (default), `geojson`                 |Returned route geometry format (influences overview and per step)                        |
+|overview    |`simplified` (default), `full`, `false`         |Add overview geometry either full, simplified according to highest zoom level it could be display on, or not at all.|
+|timestamps  |`{timestamp};{timestamp}[;{timestamp} ...]`     |Timestamp of the input location.                                                          |
+|radiuses    |`{radius};{radius}[;{radius} ...]`              |Standard deviation of GPS precision used for map matching. If applicable use GPS accuracy.|
+
+|Parameter   |Values                        |
+|------------|------------------------------|
+|timestamp   |`integer` UNIX-like timestamp |
+|radius      |`double >= 0` (default 5m)    |
+
+### Response
+- `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
+- `tracepoints`: Array of `Ẁaypoint` objects representing all points of the trace in order.
+  If the trace point was ommited by map matching because it is an outlier, the entry will be `null`.
+  Each `Waypoint` object has the following additional properties:
+  - `matchings_index`: Index to the `Route` object in `matchings` the sub-trace was matched to.
+  - `waypoint_index`: Index of the waypoint inside the matched route.
+- `matchings`: An array of `Route` objects that assemble the trace. Each `Route` object has the following additional properties:
+  - `confidence`: Confidence of the matching. `float` value between 0 and 1. 1 is very confident that the matching is correct.
+
+In case of error the following `code`s are supported in addition to the general ones:
+
+| Type              | Description         |
+|-------------------|---------------------|
+| `NoMatch`         | No matchings found. |
+
+All other fields might be undefined.
+
+## Service `trip`
+
+The trip plugin solves the Traveling Salesman Problem using a greedy heuristic (farthest-insertion algorithm).
+The returned path does not have to be the shortest path, as TSP is NP-hard it is only an approximation.
+Note that if the input coordinates can not be joined by a single trip (e.g. the coordinates are on several disconnected islands)
+multiple trips for each connected component are returned.
+
+### Request
+
+```
+http://{server}/trip/v1/{profile}/{coordinates}?steps={true|false}&geometries={polyline|geojson}&overview={simplified|full|false}
+```
+
+In addition to the [general options](#general-options) the following options are supported for this service:
+
+|Option      |Values                                          |Description                                                                |
+|------------|------------------------------------------------|---------------------------------------------------------------------------|
+|steps       |`true`, `false` (default)                       |Return route instructions for each trip                                    |
+|geometries  |`polyline` (default), `geojson`                 |Returned route geometry format (influences overview and per step)         |
+|overview    |`simplified` (default), `full`, `false`         |Add overview geometry either full, simplified according to highest zoom level it could be display on, or not at all.|
+
+### Response
+
+- `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
+- `waypoints`: Array of `Waypoint` objects representing all waypoints in input order. Each `Waypoint` object has the following additional properties:
+  - `trips_index`: Index to `trips` of the sub-trip the point was matched to.
+  - `waypoint_index`: Index of the point in the trip.
+- `trips`: An array of `Route` objects that assemble the trace.
+
+In case of error the following `code`s are supported in addition to the general ones:
+
+| Type              | Description         |
+|-------------------|---------------------|
+| `NoTrips`        | No trips found.     |
+
+All other fields might be undefined.
+
+## Result objects
+
+### Route
+
+Represents a route through (potentially multiple) waypoints.
+
+#### Properties
+
+- `distance`: The distance traveled by the route, in `float` meters.
+- `duration`: The estimated travel time, in `float` number of seconds.
+- `geometry`: The whole geometry of the route value depending on `overview` parameter, format depending on the `geometries` parameter. See `RouteStep`'s `geometry` field for a parameter documentation.
+  
+  | overview   | Description                 |
+  |------------|-----------------------------|
+  | simplified | Geometry is simplified according to the highest zoom level it can still be displayed on full. |
+  | full       | Geometry is not simplified. |
+  | false      | Geometry is not added.      |
+  
+- `legs`: The legs between the given waypoints, an array of `RouteLeg` objects.
+
+#### Example
+
+Three input coordinates, `geometry=geojson`, `steps=false`:
+
+```json
+{
+  "distance": 90.0,
+  "duration": 300.0,
+  "geometry": {"type": "LineString", "coordinates": [[120., 10.], [120.1, 10.], [120.2, 10.], [120.3, 10.]]},
+  "legs": [
+    {
+      "distance": 30.0,
+      "duration": 100.0,
+      "steps": []
+    },
+    {
+      "distance": 60.0,
+      "duration": 200.0,
+      "steps": []
+    }
+  ]
+}
+```
+
+### RouteLeg
+
+Represents a route between two waypoints.
+
+#### Properties
+
+- `distance`: The distance traveled by this route leg, in `float` meters.
+- `duration`: The estimated travel time, in `float` number of seconds.
+- `summary`: Summary of the route taken as `string`. Depends on the `steps` parameter:
+   
+   | steps        |                                                                       |
+   |--------------|-----------------------------------------------------------------------|
+   | true         | Names of the two major roads used. Can be empty if route is too short.|
+   | false        | empty `string`                                                        |
+
+- `steps`: Depends on the `steps` parameter.
+   
+   | steps        |                                                                       |
+   |--------------|-----------------------------------------------------------------------|
+   | true         | array of `RouteStep` objects describing the turn-by-turn instructions |
+   | false        | empty array                                                           |
+
+#### Example
+
+With `steps=false`:
+
+```json
+{
+  "distance": 30.0,
+  "duration": 100.0,
+  "steps": []
+}
+```
+
+### RouteStep
+
+A step consists of a maneuver such as a turn or merge, followed
+by a distance of travel along a single way to the subsequent
+step.
+
+#### Properties
+
+- `distance`: The distance of travel from the maneuver to the subsequent step, in `float` meters.
+- `duration`: The estimated travel time, in `float` number of seconds.
+- `geometry`: The unsimplified geometry of the route segment, depending on the `geometries` parameter.
+  
+  | geometries |                                                                    |
+  |------------|--------------------------------------------------------------------|
+  | polyline   | [polyline](https://www.npmjs.com/package/polyline) with precision 5 in [latitude,longitude] encoding |
+  | geojson    | [GeoJSON `LineString`](http://geojson.org/geojson-spec.html#linestring) or [GeoJSON `Point`](http://geojson.org/geojson-spec.html#point) if it is only one coordinate (not wrapped by a GeoJSON feature)|
+  
+- `name`: The name of the way along which travel proceeds.
+- `mode`: A string signifying the mode of transportation.
+- `maneuver`: A `StepManeuver` object representing the maneuver.
+
+#### Example
+
+### StepManeuver
+
+#### Properties
+
+- `location`: A `[longitude, latitude]` pair describing the location of the turn.
+- `bearing_before`: The clockwise angle from true north to the
+  direction of travel immediately before the maneuver.
+- `bearing_after`: The clockwise angle from true north to the
+  direction of travel immediately after the maneuver.
+- `type` A string indicating the type of maneuver
+  
+  | `type`            | Description                                                  |
+  |-------------------|--------------------------------------------------------------|
+  | turn              | a basic turn into direction of the `modifier`                |
+  | new name          | no turn is taken, but the road name changes. The Road can take a turn itself, following `modifier`                  |
+  | depart            | indicates the departure of the leg                           |
+  | arrive            | indicates the destination of the leg                         |
+  | merge             | merge onto a street (e.g. getting on the highway from a ramp, the `modifier specifies the direction of the merge`) |
+  | ramp              | **Deprecated**. Replaced by `on_ramp` and `off_ramp`.        |
+  | on ramp           | take a ramp to enter a highway (direction given my `modifier`) |
+  | off ramp          | take a ramp to exit a highway (direction given my `modifier`)  |
+  | fork              | take the left/right side at a fork depending on `modifier`   |
+  | end of road       | road ends in a T intersection turn in direction of `modifier`|
+  | continue          | Turn in direction of `modifier` to stay on the same road     |
+  | roundabout        | traverse roundabout, has additional field `exit` with NR if the roundabout is left. `the modifier specifies the direction of entering the roundabout` |
+  | rotary            | a larger version of a roundabout, can offer `rotary_name` in addition to the `exit` parameter.  |
+  | roundabout turn   | Describes a turn at a small roundabout that should be treated as normal turn. The `modifier` indicates the turn direciton. Example instruction: `At the roundabout turn left`. |
+  | notification      | not an actual turn but a change in the driving conditions. For example the travel mode.  If the road takes a turn itself, the `modifier` describes the direction |
+
+  Please note that even though there are `new name` and `notification` instructions, the `mode` and `name` can change
+  between all instructions. They only offer a fallback in case nothing else is to report.
+
+
+- `modifier` An optional `string` indicating the direction change of the maneuver.
+
+  | `modifier`        | Description                               |
+  |-------------------|-------------------------------------------|
+  | uturn             | indicates  reversal of direction          |
+  | sharp right       | a sharp right turn                        |
+  | right             | a normal turn to the right                |
+  | slight right      | a slight turn to the right                |
+  | straight          | no relevant change in direction           |
+  | slight left       | a slight turn to the left                 |
+  | left              | a normal turn to the left                 |
+  | sharp left        | a sharp turn to the left                  |
+
+ The list of turns without a modifier is limited to: `depart/arrive`. If the source/target location is close enough to the `depart/arrive` location, no modifier will be given.
+  
+  The meaning depends on the `type` field.
+    
+  | `type`                 | Description                                                                                                               |
+  |------------------------|---------------------------------------------------------------------------------------------------------------------------|
+  | `turn`                 | `modifier` indicates the change in direction accomplished through the turn                                                |
+  | `depart`/`arrive`      | `modifier` indicates the position of departure point and arrival point in relation to the current direction of travel      |
+ 
+
+- `exit` An optional `integer` indicating number of the exit to take. The field exists for the following `type` field:
+  
+  | `type`                 | Description                                                                                                               |
+  |------------------------|---------------------------------------------------------------------------------------------------------------------------|
+  | `roundabout`           | Number of the roundabout exit to take. If exit is `undefined` the destination is on the roundabout.                       |
+  | `turn` or `end of road`| Indicates the number of intersections passed until the turn. Example instruction: `at the fourth intersection, turn left` |
+  
+
+New maneuver `type` and `modifier` and new properties (potentially depending on `type`) may be introduced in the future without an API version change.
+
+### Waypoint
+
+Object used to describe waypoint on a route.
+
+#### Properties
+
+- `name` Name of the street the coordinate snapped to
+- `location` Array that contains the `[longitude, latitude]` pair of the snapped coordinate
+- `hint` Unique internal identifier of the segment (ephemeral, not constant over data updates)
+   This can be used on subsequent request to significantly speed up the query and to connect multiple services.
+   E.g. you can use the `hint` value obtained by the `nearest` query as `hint` values for `route` inputs.
+
+## Service `tile`
+
+This generates [Mapbox Vector Tiles](https://www.mapbox.com/developers/vector-tiles/) that can be viewed with a vector-tile capable slippy-map viewer.  The tiles contain road geometries and metadata that can be used to examine the routing graph.  The tiles are generated directly from the data in-memory, so are in sync with actual routing results, and let you examine which roads are actually routable, and what weights they have applied.
+
+### Request
+```
+http://{server}/tile/v1/{profile}/tile({x},{y},{zoom}).mvt
+```
+
+The `x`, `y`, and `zoom` values are the same as described at https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames, and are supported by vector tile viewers like [Mapbox GL JS](https://www.mapbox.com/mapbox-gl-js/api/).
+
+### Response
+
+The response object is either a binary encoded blob with a `Content-Type` of `application/x-protobuf`, or a `404` error.  Note that OSRM is hard-coded to only return tiles from zoom level 12 and higher (to avoid accidentally returning extremely large vector tiles).
+
+Vector tiles contain just a single layer named `speeds`.  Within that layer, features can have `speed` (int) and `is_small` (boolean) attributes.
@@ -0,0 +1,26 @@
+OSRM can be used as a library (libosrm) via C++ instead of using it through the HTTP interface and `osrm-routed`. This allows for fine-tuning OSRM and has much less overhead. Here is a quick introduction into how to use `libosrm` in the upcoming v5 release.
+
+Take a look at the example code that lives in the [example directory](https://github.com/Project-OSRM/osrm-backend/tree/master/example). Here is all you ever wanted to know about `libosrm`, that is a short description of what the types do and where to find documentation on it:
+
+- [`EngineConfig`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/engine_config.hpp) - for initializing an OSRM instance we can configure certain properties and constraints. E.g. the storage config is the base path such as `france.osm.osrm` from which we derive and load `france.osm.osrm.*` auxiliary files. This also lets you set constraints such as the maximum number of locations allowed for specific services.
+
+- [`OSRM`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/osrm/osrm.hpp) - this is the main Routing Machine type with functions such as `Route` and `Table`. You initialize it with a `EngineConfig`. It does all the heavy lifting for you. Each function takes its own parameters, e.g. the `Route` function takes `RouteParameters`, and a out-reference to a JSON result that gets filled. The return value is a `Status`, indicating error or success.
+
+- [`Status`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/status.hpp) - this is a type wrapping `Error` or `Ok` for indicating error or success, respectively.
+
+- [`TableParameters`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/api/table_parameters.hpp) - this is an example of parameter types the Routing Machine functions expect. In this case `Table` expects its own parameters as `TableParameters`. You can see it wrapping two vectors, sources and destinations --- these are indices into your coordinates for the table service to construct a matrix from (empty sources or destinations means: use all of them). If you ask yourself where coordinates come from, you can see `TableParameters` inheriting from `BaseParameters`.
+
+- [`BaseParameter`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/api/base_parameters.hpp) - this most importantly holds coordinates (and a few other optional properties that you don't need for basic usage); the specific parameter types inherit from `BaseParameters` to get these member attributes. That means your `TableParameters` type has `coordinates`, `sources` and `destination` member attributes (and a few other that we ignore for now).
+
+- [`Coordinate`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/util/coordinate.hpp) - this is a wrapper around a (longitude, latitude) pair. We really don't care about (lon,lat) vs (lat, lon) but we don't want you to accidentally mix them up, so both latitude and longitude are strictly typed wrappers around integers (fixed notation such as `13423240`) and floating points (floating notation such as `13.42324`).
+
+- [Parameters for other services](https://github.com/Project-OSRM/osrm-backend/tree/master/include/engine/api) - here are all other `*Parameters` you need for other Routing Machine services.
+
+- [JSON](https://github.com/Project-OSRM/osrm-backend/blob/master/include/util/json_container.hpp) - this is a sum type resembling JSON. The Routing Machine service functions take a out-ref to a JSON result and fill it accordingly. It is currently implemented using [mapbox/variant](https://github.com/mapbox/variant) which is similar to [Boost.Variant](http://www.boost.org/doc/libs/1_55_0/doc/html/variant.html) (Boost documentation is great). There are two ways to work with this sum type: either provide a visitor that acts on each type on visitation or use the `get` function in case you're sure about the structure. The JSON structure is written down in the [[v5 server API|Server-API-v5,-current]].
+
+------------------------------------------------------------------------------------------------------------------
+
+To summarize:
+ - create an `OSRM` instance initialized with a `EngineConfig`
+ - call the service function on the `OSRM` object providing service specific `*Parameters`
+ - check the return code and use the JSON result
@@ -0,0 +1,34 @@
+OSRM supports "profiles". Configurations representing different routing behaviours for (typically) different transport modes. A profile describes whether or not we route along a particular type of way, or over a particular node in the OpenStreetMap data, and also how quickly we'll be travelling when we do. This feeds into the way the routing graph is created and thus influences the output routes.
+
+## Available profiles
+
+Out-of-the-box OSRM comes with several different profiles, including car, bicycle and foot.
+
+Profile configuration files have a 'lua' extension, and are found under the 'profiles' subdirectory.
+Alternatively commands will take a lua profile specified with an explicit -p param, for example:
+
+`osrm-extract -p ../profiles/car.lua planet-latest.osm.pbf`
+
+And then **you will need to extract and contract again** (A change to the profile will typically affect the extract step as well as the contract step. See [Processing Flow](https://github.com/Project-OSRM/osrm-backend/wiki/Processing-Flow))
+
+## lua scripts?
+
+Profiles are not just configuration files. They are scripts written in the "lua" scripting language ( http://www.lua.org )  The reason for this, is that OpenStreetMap data is not sufficiently straightforward, to simply define tag mappings. Lua scripting offers a powerful way of coping with the complexity of different node,way,relation,tag combinations found within OpenStreetMap data.
+
+## Basic structure of a profile
+
+You can understand these lua scripts enough to make interesting modifications, without needing to get to grips with how they work completely.
+
+Towards the top of the file, a profile (such as [car.lua](../profiles/car.lua)) will typically define various configurations as global variables. A lot of these are look-up hashes of one sort or another.
+
+As you scroll down the file you'll see local variables, and then local functions, and finally...
+
+`way_function` and `node_function` are the important functions which are called when extracting OpenStreetMap data with `osrm-extract`.
+
+## way_function
+
+Given an OpenStreetMap way, the way_function will either return nothing (meaning we are not going to route over this way at all), or it will set up a result hash to be returned. The most important thing it will do is set the value of `result.forward_speed` and `result.backward_speed` as a suitable integer value representing the speed for traversing the way.
+
+All other calculations stem from that, including the returned timings in driving directions, but also, less directly, it feeds into the actual routing decisions the engine will take (a way with a slow traversal speed, may be less favoured than a way with fast traversal speed, but it depends how long it is, and... what it connects to in the rest of the network graph)
+
+Using the power of the scripting language you wouldn't typically see something as simple as a `result.forward_speed = 20` line within the way_function. Instead a way_function will examine the tagging (e.g. `way:get_value_by_key("highway")` and many others), process this information in various ways, calling other local functions, referencing the global variables and look-up hashes, before arriving at the result.
@@ -0,0 +1,50 @@
+# Releasing a new OSRM version
+
+Do decide if this is a major or minor version bump use: http://semver.org/
+
+What we guarantee on major version changes:
+
+- Breaking changes will be in the changelog
+- If we break an HTTP API we bump the version
+
+What we guarantee on minor version changes:
+
+- HTTP API does not include breaking changes
+- C++ library API does not include breaking changes
+- node-osrm API does not include breaking changes
+
+What we DO NOT guarantee on minor version changes:
+
+- file format comp ability. Breakage will be listed in the changelog.
+- new turn types and fields may be introduced. How to handle this see [the HTTP API docs](http.md).
+
+What we guarantee on patch version changes:
+
+- HTTP API does not include breaking changes
+- C++ library API does not include breaking changes
+- node-osrm API does not include breaking changes
+- full file format compatibility
+
+## Major or Minor release x.y
+
+1. Make sure all tests are passing (e.g. Travis CI gives you a :thumbs_up:)
+2. Make sure `CHANGELOG.md` is up to date.
+3. Make sure the OSRM version in `CMakeLists.txt` is up to date
+4. Use an annotated tag to mark the release: `git tag vx.y.0 -a` Body of the tag description should be the changelog entries.
+5. Push tags and commits: `git push; git push --tags`
+6. Branch of the `vx.y.0` tag to create a release branch `x.y`:
+   `git branch x.y. vx.y.0; git push -u x.y:origin/x.y`
+7. Modify `.travis.yml` to allow builds for the `x.y` branch.
+8. Write a mailing-list post to osrm-talk@openstreetmap.org to announce the release
+
+## Patch release x.y.z
+
+1. Check out the appropriate release branch x.y
+2. Make sure all fixes are listed in the changelog and included in the branch
+3. Make sure all tests are passing (e.g. Travis CI gives you a :thumbs_up:)
+4. Make sure the OSRM version in `CMakeLists.txt` is up to date
+5. Use an annotated tag to mark the release: `git tag vx.y.z -a` Body of the tag description should be the changelog entries.
+6. Push tags and commits: `git push; git push --tags`
+7. Proceede with the `node-osrm` release as outlined in the repository.
+8. Write a mailing-list post to osrm-talk@openstreetmap.org to announce the release
+
@@ -19,8 +19,8 @@ else()
  message(WARNING "Building on a 32 bit system is unsupported")
 endif()

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

 add_executable(osrm-example example.cpp)
@@ -5,7 +5,7 @@ Feature: Bike - Access tags on ways
    Background:
        Given the profile "bicycle"

-    Scenario: Bike - Access tag hierachy on ways
+    Scenario: Bike - Access tag hierarchy on ways
        Then routability should be
            | highway | access | vehicle | bicycle | bothw |
            |         |        |         |         | x     |
@@ -121,6 +121,7 @@ Feature: Bike - Access tags on ways
            | private      |              |              |       |
            | agricultural |              |              |       |
            | forestry     |              |              |       |
+            | delivery     |              |              |       |
            |              | yes          |              | x     |
            |              | permissive   |              | x     |
            |              | designated   |              | x     |
@@ -129,6 +130,7 @@ Feature: Bike - Access tags on ways
            |              | private      |              |       |
            |              | agricultural |              |       |
            |              | forestry     |              |       |
+            |              | delivery     |              |       |
            |              |              | yes          | x     |
            |              |              | permissive   | x     |
            |              |              | designated   | x     |
@@ -137,6 +139,7 @@ Feature: Bike - Access tags on ways
            |              |              | private      |       |
            |              |              | agricultural |       |
            |              |              | forestry     |       |
+            |              |              | delivery     |       |

    Scenario: Bike - Access tags on both node and way
        Then routability should be
@@ -5,7 +5,7 @@ Feature: Bike - Access tags on nodes
    Background:
        Given the profile "bicycle"

-    Scenario: Bike - Access tag hierachy on nodes
+    Scenario: Bike - Access tag hierarchy on nodes
        Then routability should be
            | node/access | node/vehicle | node/bicycle | node/highway  | bothw |
            |             |              |              |               | x     |
@@ -47,6 +47,7 @@ Feature: Bike - Access tags on nodes
            | private      |              |              |       |
            | agricultural |              |              |       |
            | forestry     |              |              |       |
+            | delivery     |              |              |       |
            |              | yes          |              | x     |
            |              | permissive   |              | x     |
            |              | designated   |              | x     |
@@ -55,6 +56,7 @@ Feature: Bike - Access tags on nodes
            |              | private      |              |       |
            |              | agricultural |              |       |
            |              | forestry     |              |       |
+            |              | delivery     |              |       |
            |              |              | yes          | x     |
            |              |              | permissive   | x     |
            |              |              | designated   | x     |
@@ -63,3 +65,4 @@ Feature: Bike - Access tags on nodes
            |              |              | private      |       |
            |              |              | agricultural |       |
            |              |              | forestry     |       |
+            |              |              | delivery     |       |
@@ -4,7 +4,7 @@ Feature: Bike - Squares and other areas
    Background:
        Given the profile "bicycle"

-    @square @mokob @2154
+    @square
    Scenario: Bike - Route along edge of a squares
        Given the node map
            | x |   |
@@ -50,7 +50,7 @@ Feature: Bike - Squares and other areas
            | d    | a  | xa,xa |
            | a    | d  | xa,xa |

-    @parking @mokob @2154
+    @parking
    Scenario: Bike - parking areas
        Given the node map
            | e |   |   | f |
@@ -78,7 +78,7 @@ Feature: Bike - Squares and other areas
            | a    | d  | abcda,abcda    |


-    @train @platform @mokob @2154
+    @train @platform
    Scenario: Bike - railway platforms
        Given the node map
            | x | a | b | y |
@@ -1,5 +1,5 @@
@routing @bicycle @bridge
-Feature: Bicycle - Handle movable bridge
+Feature: Bicycle - Handle cycling

    Background:
        Given the profile "bicycle"
@@ -18,14 +18,14 @@ Feature: Bicycle - Handle movable bridge

        When I route I should get
            | from | to | route           | modes                                  |
-            | a    | g  | abc,cde,efg,efg | cycling,movable bridge,cycling,cycling |
-            | b    | f  | abc,cde,efg,efg | cycling,movable bridge,cycling,cycling |
-            | e    | c  | cde,cde         | movable bridge,movable bridge          |
-            | e    | b  | cde,abc,abc     | movable bridge,cycling,cycling         |
-            | e    | a  | cde,abc,abc     | movable bridge,cycling,cycling         |
-            | c    | e  | cde,cde         | movable bridge,movable bridge          |
-            | c    | f  | cde,efg,efg     | movable bridge,cycling,cycling         |
-            | c    | g  | cde,efg,efg     | movable bridge,cycling,cycling         |
+            | 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
@@ -41,7 +41,7 @@ Feature: Bicycle - Handle movable bridge

        When I route I should get
            | from | to | route           | modes                                  | speed  |
-            | a    | g  | abc,cde,efg,efg | cycling,movable bridge,cycling,cycling | 5 km/h |
-            | b    | f  | abc,cde,efg,efg | cycling,movable bridge,cycling,cycling | 4 km/h |
-            | c    | e  | cde,cde         | movable bridge,movable bridge          | 2 km/h |
-            | e    | c  | cde,cde         | movable bridge,movable bridge          | 2 km/h |
+            | a    | g  | abc,cde,efg,efg | cycling,cycling,cycling,cycling | 5 km/h |
+            | b    | f  | abc,cde,efg,efg | cycling,cycling,cycling,cycling | 4 km/h |
+            | c    | e  | cde,cde         | cycling,cycling          | 2 km/h |
+            | e    | c  | cde,cde         | cycling,cycling          | 2 km/h |
@@ -19,15 +19,15 @@ Feature: Bike - Destination only, no passing through
            | axye  |             |

        When I route I should get
-            | from | to | route  |
-            | a    | b  | ab     |
-            | a    | c  | ab,bcd |
-            | a    | d  | ab,bcd |
-            | a    | e  | axye   |
-            | e    | d  | de     |
-            | e    | c  | de,bcd |
-            | e    | b  | de,bcd |
-            | e    | a  | 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
@@ -45,15 +45,15 @@ Feature: Bike - Destination only, no passing through
            | axye  |             |

        When I route I should get
-            | from | to | route    |
-            | a    | b  | ab       |
-            | a    | c  | ab,bc    |
-            | a    | d  | ab,bc,cd |
-            | a    | e  | axye     |
-            | e    | d  | de       |
-            | e    | c  | de,dc    |
-            | e    | b  | de,dc,bc |
-            | e    | a  | 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
@@ -70,8 +70,8 @@ Feature: Bike - Destination only, no passing through
            | axye  |             |

        When I route I should get
-            | from | to | route       |
-            | a    | e  | ab,bc,cd,de |
-            | e    | a  | de,cd,bc,ab |
-            | b    | d  | bc,cd       |
-            | d    | b  | cd,bc       |
+            | from | to | route          |
+            | a    | e  | ab,bc,cd,de,de |
+            | e    | a  | de,cd,bc,ab,ab |
+            | b    | d  | bc,cd,cd       |
+            | d    | b  | cd,bc,bc       |
@@ -16,13 +16,13 @@ Feature: Bike - Mode flag
    	 | cd    | primary |       |          |

    	When I route I should get
-    	 | from | to | route       | turns                    | modes                         |
-    	 | a    | d  | ab,bc,cd,cd | depart,right,left,arrive | cycling,ferry,cycling,cycling |
-    	 | d    | a  | cd,bc,ab,ab | depart,right,left,arrive | cycling,ferry,cycling,cycling |
-    	 | c    | a  | bc,ab,ab    | depart,left,arrive       | ferry,cycling,cycling         |
-    	 | d    | b  | cd,bc,bc    | depart,right,arrive      | cycling,ferry,ferry           |
-    	 | a    | c  | ab,bc,bc    | depart,right,arrive      | cycling,ferry,ferry           |
-    	 | b    | d  | bc,cd,cd    | depart,left,arrive       | ferry,cycling,cycling         |
+    	 | 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
@@ -36,13 +36,13 @@ Feature: Bike - Mode flag
     	 | cd    | primary |         |         |

     	When I route I should get
-     	 | from | to | route       | turns                    | modes                         |
-     	 | a    | d  | ab,bc,cd,cd | depart,right,left,arrive | cycling,train,cycling,cycling |
-     	 | d    | a  | cd,bc,ab,ab | depart,right,left,arrive | cycling,train,cycling,cycling |
-     	 | c    | a  | bc,ab,ab    | depart,left,arrive       | train,cycling,cycling         |
-     	 | d    | b  | cd,bc,bc    | depart,right,arrive      | cycling,train,train           |
-     	 | a    | c  | ab,bc,bc    | depart,right,arrive      | cycling,train,train           |
-     	 | b    | d  | bc,cd,cd    | depart,left,arrive       | train,cycling,cycling         |
+     	 | 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         |

     Scenario: Bike - Mode when pushing bike against oneways
     	Given the node map
@@ -56,13 +56,13 @@ Feature: Bike - Mode flag
     	 | cd    | primary |        |

     	When I route I should get
-     	 | from | to | route       | turns                                   | modes                                |
-     	 | a    | d  | ab,bc,cd,cd | depart,right,left,arrive                | cycling,cycling,cycling,cycling      |
-     	 | d    | a  | cd,bc,ab,ab | depart,right,left,arrive                | cycling,pushing bike,cycling,cycling |
-     	 | c    | a  | bc,ab,ab    | depart,left,arrive                      | pushing bike,cycling,cycling         |
-     	 | d    | b  | cd,bc,bc    | depart,right,arrive                     | cycling,pushing bike,pushing bike    |
-     	 | a    | c  | ab,bc,bc    | depart,right,arrive                     | cycling,cycling,cycling              |
-     	 | b    | d  | bc,cd,cd    | depart,left,arrive                      | cycling,cycling,cycling              |
+     	 | from | to | route       | modes                                |
+     	 | a    | d  | ab,bc,cd,cd | cycling,cycling,cycling,cycling      |
+     	 | d    | a  | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling |
+     	 | c    | a  | bc,ab,ab    | pushing bike,cycling,cycling         |
+     	 | d    | b  | cd,bc,bc    | cycling,pushing bike,pushing bike    |
+     	 | 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
@@ -76,13 +76,13 @@ Feature: Bike - Mode flag
     	 | cd    | primary    |

     	When I route I should get
-     	 | from | to | route       | turns                    | modes                                |
-     	 | a    | d  | ab,bc,cd,cd | depart,right,left,arrive | cycling,pushing bike,cycling,cycling |
-     	 | d    | a  | cd,bc,ab,ab | depart,right,left,arrive | cycling,pushing bike,cycling,cycling |
-     	 | c    | a  | bc,ab,ab    | depart,left,arrive       | pushing bike,cycling,cycling         |
-     	 | d    | b  | cd,bc,bc    | depart,right,arrive      | cycling,pushing bike,pushing bike    |
-     	 | a    | c  | ab,bc,bc    | depart,right,arrive      | cycling,pushing bike,pushing bike    |
-     	 | b    | d  | bc,cd,cd    | depart,left,arrive       | pushing bike,cycling,cycling         |
+     	 | 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
@@ -116,13 +116,13 @@ Feature: Bike - Mode flag
    	 | cd    | primary |

     	When I route I should get
-    	 | from | to | route       | turns                    | modes                                |
-    	 | a    | d  | ab,bc,cd,cd | depart,right,left,arrive | cycling,pushing bike,cycling,cycling |
-    	 | d    | a  | cd,bc,ab,ab | depart,right,left,arrive | cycling,pushing bike,cycling,cycling |
-    	 | c    | a  | bc,ab,ab    | depart,left,arrive       | pushing bike,cycling,cycling         |
-    	 | d    | b  | cd,bc,bc    | depart,right,arrive      | cycling,pushing bike,pushing bike    |
-    	 | a    | c  | ab,bc,bc    | depart,right,arrive      | cycling,pushing bike,pushing bike    |
-    	 | b    | d  | bc,cd,cd    | depart,left,arrive       | pushing bike,cycling,cycling         |
+    	 | 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
@@ -136,13 +136,13 @@ Feature: Bike - Mode flag
    	 | cd    | primary |          |

     	When I route I should get
-    	 | from | to | route       | turns                    | modes                                |
-    	 | a    | d  | ab,bc,cd,cd | depart,right,left,arrive | cycling,pushing bike,cycling,cycling |
-    	 | d    | a  | cd,bc,ab,ab | depart,right,left,arrive | cycling,pushing bike,cycling,cycling |
-    	 | c    | a  | bc,ab,ab    | depart,left,arrive       | pushing bike,cycling,cycling         |
-    	 | d    | b  | cd,bc,bc    | depart,right,arrive      | cycling,pushing bike,pushing bike    |
-    	 | a    | c  | ab,bc,bc    | depart,right,arrive      | cycling,pushing bike,pushing bike    |
-         | b    | d  | bc,cd,cd    | depart,left,arrive       | pushing bike,cycling,cycling         |
+    	 | 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
@@ -10,13 +10,13 @@ Feature: Bike - Street names in instructions
            |   | c |

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

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

    @unnamed
    Scenario: Bike - Use way type to describe unnamed ways
@@ -63,7 +63,6 @@ Feature: Bike - Accessability of different way types
            | runway   |      |      |       |
            | runway   | yes  | foot | foot  |

-    @todo
    Scenario: Bike - Pushing bikes on ways with foot=yes in one direction
        Then routability should be
            | highway  | foot:forward | foot:backward | forw | backw |
@@ -98,13 +97,12 @@ Feature: Bike - Accessability of different way types
            | cd    | primary |        |

        When I route I should get
-            | from | to | route       | turns                                   |
-            | a    | d  | ab,bc,cd,cd | depart,right,left,arrive                |
-            | d    | a  | cd,bc,ab,ab | depart,right,left,arrive                |
-            | c    | a  | bc,ab,ab    | depart,left,arrive                      |
-            | d    | b  | cd,bc,bc    | depart,right,arrive                     |
+            | from | to | route       | modes                                   |
+            | a    | d  | ab,bc,cd,cd | cycling,cycling,cycling,cycling         |
+            | d    | a  | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling    |
+            | c    | a  | bc,ab,ab    | pushing bike,cycling,cycling            |
+            | d    | b  | cd,bc,bc    | cycling,pushing bike,pushing bike       |

-    @todo
    Scenario: Bike - Instructions when pushing bike on footway/pedestrian, etc.
        Given the node map
            | a | b |   |
@@ -117,8 +115,8 @@ Feature: Bike - Accessability of different way types
            | cd    | primary |

        When I route I should get
-            | from | to | route       | turns                    |
-            | a    | d  | ab,bc,cd,cd | depart,right,left,arrive |
-            | d    | a  | cd,bc,ab,ab | depart,right,left,arrive |
-            | c    | a  | bc,ab,ab    | depart,left,arrive       |
-            | d    | b  | cd,bc,bc    | depart,right,arrive      |
+            | 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    |
@@ -14,7 +14,7 @@ Feature: Bike - Way ref

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

    Scenario: Bike - Way with only ref
        Given the node map
@@ -1,30 +0,0 @@
-@routing @bicycle @roundabout @instruction
-Feature: Roundabout Instructions
-
-    Background:
-        Given the profile "bicycle"
-
-    Scenario: Bicycle - Roundabout instructions
-        Given the node map
-            |   |   | v |   |   |
-            |   |   | d |   |   |
-            | s | a |   | c | u |
-            |   |   | b |   |   |
-            |   |   | t |   |   |
-
-        And the ways
-            | nodes | junction   |
-            | sa    |            |
-            | tb    |            |
-            | uc    |            |
-            | vd    |            |
-            | abcda | roundabout |
-
-        When I route I should get
-            | from | to | route    | turns                           |
-            | s    | t  | sa,tb,tb | depart,roundabout-exit-1,arrive |
-            | s    | u  | sa,uc,uc | depart,roundabout-exit-2,arrive |
-            | s    | v  | sa,vd,vd | depart,roundabout-exit-3,arrive |
-            | u    | v  | uc,vd,vd | depart,roundabout-exit-1,arrive |
-            | u    | s  | uc,sa,sa | depart,roundabout-exit-2,arrive |
-            | u    | t  | uc,tb,tb | depart,roundabout-exit-3,arrive |
@@ -5,7 +5,7 @@ Feature: Car - Restricted access
    Background:
        Given the profile "car"

-    Scenario: Car - Access tag hierachy    on ways
+    Scenario: Car - Access tag hierarchy    on ways
        Then routability should be
            | access | vehicle | motor_vehicle | motorcar | bothw |
            |        |         |               |          | x     |
@@ -30,7 +30,7 @@ Feature: Car - Restricted access
            |        |         | no            | yes      | x     |
            |        |         | yes           | no       |       |

-    Scenario: Car - Access tag hierachy on nodes
+    Scenario: Car - Access tag hierarchy on nodes
        Then routability should be
            | node/access | node/vehicle | node/motor_vehicle | node/motorcar | bothw |
            |             |              |                    |               | x     |
@@ -94,6 +94,7 @@ Feature: Car - Restricted access
            | agricultural |       |
            | forestry     |       |
            | psv          |       |
+            | delivery     |       |
            | some_tag     | x     |


@@ -108,6 +109,7 @@ Feature: Car - Restricted access
            | agricultural |       |
            | forestry     |       |
            | psv          |       |
+            | delivery     |       |
            | some_tag     | x     |

    Scenario: Car - Access tags on both node and way
@@ -34,7 +34,6 @@ OSRM will use 4/5 of the projected free-flow speed.
            | a    | b  | ab,ab | 47 km/h +- 1 |
            | b    | c  | bc,bc | 47 km/h +- 1 |

-    @mokob @2162
    Scenario: Car - Advisory speed overwrites backwards maxspeed
        Given the node map
            | a | b | c |
@@ -49,7 +48,6 @@ OSRM will use 4/5 of the projected free-flow speed.
            | b    | a  | ab,ab | 47 km/h +- 1 |
            | c    | b  | bc,bc | 47 km/h +- 1 |

-    @mokob @2162 @deleteme
    Scenario: Car - Advisory speed overwrites backwards maxspeed
        Given the node map
            | a | b | c | d |
@@ -65,7 +63,6 @@ OSRM will use 4/5 of the projected free-flow speed.
            | c    | b  | bc,bc | 47 km/h +- 1 |
            | d    | c  | cd,cd | 47 km/h +- 1 |

-    @mokob @2162
    Scenario: Car - Directional advisory speeds play nice with eachother
        Given the node map
            | a | b | c |
@@ -1,5 +1,5 @@
@routing @car @bridge
-Feature: Car - Handle movable bridge
+Feature: Car - Handle driving

    Background:
        Given the profile "car"
@@ -18,14 +18,14 @@ Feature: Car - Handle movable bridge

        When I route I should get
            | from | to | route           | modes                                  |
-            | a    | g  | abc,cde,efg,efg | driving,movable bridge,driving,driving |
-            | b    | f  | abc,cde,efg,efg | driving,movable bridge,driving,driving |
-            | e    | c  | cde,cde         | movable bridge,movable bridge          |
-            | e    | b  | cde,abc,abc     | movable bridge,driving,driving         |
-            | e    | a  | cde,abc,abc     | movable bridge,driving,driving         |
-            | c    | e  | cde,cde         | movable bridge,movable bridge          |
-            | c    | f  | cde,efg,efg     | movable bridge,driving,driving         |
-            | c    | g  | cde,efg,efg     | movable bridge,driving,driving         |
+            | 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 - Properly handle durations
        Given the node map
@@ -41,7 +41,7 @@ Feature: Car - Handle movable bridge

        When I route I should get
            | from | to | route           | modes                                  | speed  |
-            | a    | g  | abc,cde,efg,efg | driving,movable bridge,driving,driving | 7 km/h |
-            | b    | f  | abc,cde,efg,efg | driving,movable bridge,driving,driving | 5 km/h |
-            | c    | e  | cde,cde         | movable bridge,movable bridge          | 2 km/h |
-            | e    | c  | cde,cde         | movable bridge,movable bridge          | 2 km/h |
+            | 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 |
@@ -19,15 +19,15 @@ Feature: Car - Destination only, no passing through
            | axye  |             |

        When I route I should get
-            | from | to | route  |
-            | a    | b  | ab     |
-            | a    | c  | ab,bcd |
-            | a    | d  | ab,bcd |
-            | a    | e  | axye   |
-            | e    | d  | de     |
-            | e    | c  | de,bcd |
-            | e    | b  | de,bcd |
-            | e    | a  | 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: Car - Destination only street
        Given the node map
@@ -45,15 +45,15 @@ Feature: Car - Destination only, no passing through
            | axye  |             |

        When I route I should get
-            | from | to | route    |
-            | a    | b  | ab       |
-            | a    | c  | ab,bc    |
-            | a    | d  | ab,bc,cd |
-            | a    | e  | axye     |
-            | e    | d  | de       |
-            | e    | c  | de,dc    |
-            | e    | b  | de,dc,bc |
-            | e    | a  | 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: Car - Routing inside a destination only area
        Given the node map
@@ -70,8 +70,8 @@ Feature: Car - 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       |
@@ -15,13 +15,13 @@ Feature: Car - Mode flag
            | cd    | primary |       |          |

        When I route I should get
-            | from | to | route       | turns                    | modes                         |
-            | a    | d  | ab,bc,cd,cd | depart,right,left,arrive | driving,ferry,driving,driving |
-            | d    | a  | cd,bc,ab,ab | depart,right,left,arrive | driving,ferry,driving,driving |
-            | c    | a  | bc,ab,ab    | depart,left,arrive       | ferry,driving,driving         |
-            | d    | b  | cd,bc,bc    | depart,right,arrive      | driving,ferry,ferry           |
-            | a    | c  | ab,bc,bc    | depart,right,arrive      | driving,ferry,ferry           |
-            | b    | d  | bc,cd,cd    | depart,left,arrive       | ferry,driving,driving         |
+            | 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
@@ -34,7 +34,7 @@ Feature: Car - Mode flag
            | ef    | primary |       |          |

        When I route I should get
-            | from | to | route     | turns         | modes       | time  |
-            | c    | d  | bcde,bcde | depart,arrive | ferry,ferry | 600s  |
+            | from | to | route     | modes       | time  |
+            | c    | d  | bcde,bcde | ferry,ferry | 600s  |


@@ -1,30 +0,0 @@
-@routing @car @roundabout @instruction
-Feature: Roundabout Instructions
-
-    Background:
-        Given the profile "car"
-
-    Scenario: Car - Roundabout instructions
-        Given the node map
-            |   |   | v |   |   |
-            |   |   | d |   |   |
-            | s | a |   | c | u |
-            |   |   | b |   |   |
-            |   |   | t |   |   |
-
-        And the ways
-            | nodes | junction   |
-            | sa    |            |
-            | tb    |            |
-            | uc    |            |
-            | vd    |            |
-            | abcda | roundabout |
-
-        When I route I should get
-            | from | to | route    | turns                            |
-            | s    | t  | sa,tb,tb | depart,roundabout-exit-1,arrive |
-            | s    | u  | sa,uc,uc | depart,roundabout-exit-2,arrive |
-            | s    | v  | sa,vd,vd | depart,roundabout-exit-3,arrive |
-            | u    | v  | uc,vd,vd | depart,roundabout-exit-1,arrive |
-            | u    | s  | uc,sa,sa | depart,roundabout-exit-2,arrive |
-            | u    | t  | uc,tb,tb | depart,roundabout-exit-3,arrive |
@@ -31,7 +31,7 @@ Feature: Traffic - speeds
        4,1,27
        """

-    Scenario: Weighting not based on raster sources
+    Scenario: Weighting based on speed file
        Given the profile "testbot"
        Given the extract extra arguments "--generate-edge-lookup"
        Given the contract extra arguments "--segment-speed-file speeds.csv"
@@ -0,0 +1,97 @@
+@routing @speed @traffic
+Feature: Traffic - turn penalties
+
+    Background: Evenly spaced grid with multiple intersections
+        Given the node map
+            |      | a:1  |      | b:2  |      |
+            | c:3  | d:4  | e:5  | f:6  | g:7  |
+            |      | h:8  |      | i:9  |      |
+            | j:10 | k:11 | l:12 | m:13 | n:14 |
+            |      | o:15 |      | p:16 |      |
+        And the ways
+            | nodes | highway |
+            | ad    | primary |
+            | cd    | primary |
+            | de    | primary |
+            | dhk   | primary |
+
+            | bf    | primary |
+            | ef    | primary |
+            | fg    | primary |
+            | fim   | primary |
+
+            | jk    | primary |
+            | kl    | primary |
+            | ko    | primary |
+
+            | lm    | primary |
+            | mn    | primary |
+            | mp    | primary |
+        And the profile "car"
+        And the extract extra arguments "--generate-edge-lookup"
+
+    Scenario: Weighting not based on turn penalty file
+        When I route I should get
+            | from | to | route          | speed   | time      |
+            | a    | h  | ad,dhk,dhk     | 63 km/h | 11.5s +-1 |
+                                                                  # straight
+            | i    | g  | fim,fg,fg      | 59 km/h | 12s  +-1  |
+                                                                  # right
+            | a    | e  | ad,de,de       | 57 km/h | 12.5s +-1 |
+                                                                  # left
+            | c    | g  | cd,de,ef,fg,fg | 63 km/h | 23s +-1   |
+                                                                  # double straight
+            | p    | g  | mp,fim,fg,fg   | 61 km/h | 23.5s +-1 |
+                                                                  # straight-right
+            | a    | l  | ad,dhk,kl,kl   | 60 km/h | 24s +-1   |
+                                                                  # straight-left
+            | l    | e  | kl,dhk,de,de   | 59 km/h | 24.5s +-1 |
+                                                                  # double right
+            | g    | n  | fg,fim,mn,mn   | 57 km/h | 25s +-1   |
+                                                                  # double left
+
+    Scenario: Weighting based on turn penalty file
+        Given the turn penalty file
+            """
+            9,6,7,1.8
+            9,13,14,24.5
+            8,4,3,26
+            12,11,8,9
+            8,11,12,13
+            1,4,5,-0.2
+            """
+        And the contract extra arguments "--turn-penalty-file penalties.csv"
+        When I route I should get
+            | from | to | route                    | speed   | time      |
+            | a    | h  | ad,dhk,dhk               | 63 km/h | 11.5s +-1 |
+                                                                              # straight
+            | i    | g  | fim,fg,fg                | 55 km/h | 13s +-1   |
+                                                                              # right - ifg penalty
+            | a    | e  | ad,de,de                 | 64 km/h | 11s +-1   |
+                                                                              # left - faster because of negative ade penalty
+            | c    | g  | cd,de,ef,fg,fg           | 63 km/h | 23s +-1   |
+                                                                              # double straight
+            | p    | g  | mp,fim,fg,fg             | 59 km/h | 24.5s +-1 |
+                                                                              # straight-right - ifg penalty
+            | a    | l  | ad,de,ef,fim,lm,lm       | 61 km/h | 35.5s +-1 |
+                                                                              # was straight-left - forced around by hkl penalty
+            | l    | e  | lm,fim,ef,ef             | 57 km/h | 25s +-1   |
+                                                                              # double right - forced left by lkh penalty
+            | g    | n  | fg,fim,mn,mn             | 30 km/h | 47.5s +-1   |
+                                                                              # double left - imn penalty
+            | j    | c  | jk,kl,lm,fim,ef,de,cd,cd | 60 km/h | 48s +-1   |
+                                                                              # double left - hdc penalty ever so slightly higher than imn; forces all the way around
+
+    Scenario: Too-negative penalty clamps, but does not fail
+        Given the contract extra arguments "--turn-penalty-file penalties.csv"
+        And the profile "testbot"
+        And the turn penalty file
+            """
+            1,4,5,-10
+            """
+        When I route I should get
+            | from | to | route    | time    |
+            | a    | d  | ad,ad    | 10s +-1 |
+            | a    | e  | ad,de,de | 10s +-1 |
+            | b    | f  | bf,bf    | 10s +-1 |
+            | b    | g  | bf,fg,fg | 20s +-1 |
@@ -5,7 +5,7 @@ Feature: Foot - Access tags on ways
    Background:
        Given the profile "foot"

-    Scenario: Foot - Access tag hierachy on ways
+    Scenario: Foot - Access tag hierarchy on ways
        Then routability should be
            | highway  | access | foot | bothw |
            | footway  |        |      | x     |
@@ -52,6 +52,7 @@ Feature: Foot - Access tags on ways
            | private      |              |       |
            | agricultural |              |       |
            | forestry     |              |       |
+            | delivery     |              |       |
            |              | yes          | x     |
            |              | permissive   | x     |
            |              | designated   | x     |
@@ -60,6 +61,7 @@ Feature: Foot - Access tags on ways
            |              | private      |       |
            |              | agricultural |       |
            |              | forestry     |       |
+            |              | delivery     |       |

    Scenario: Foot - Access tags on both node and way
        Then routability should be
@@ -5,7 +5,7 @@ Feature: Foot - Access tags on nodes
    Background:
        Given the profile "foot"

-    Scenario: Foot - Access tag hierachy on nodes
+    Scenario: Foot - Access tag hierarchy on nodes
        Then routability should be
            | node/access | node/foot | bothw |
            |             |           | x     |
@@ -40,6 +40,7 @@ Feature: Foot - Access tags on nodes
            | private      |              |       |
            | agricultural |              |       |
            | forestry     |              |       |
+            | delivery     |              |       |
            | no           | yes          | x     |
            | no           | permissive   | x     |
            | no           | designated   | x     |
@@ -48,3 +49,4 @@ Feature: Foot - Access tags on nodes
            | yes          | private      |       |
            | yes          | agricultural |       |
            | yes          | forestry     |       |
+            | yes          | delivery     |       |
@@ -10,13 +10,13 @@ Feature: Foot - Street names in instructions
            |   | c |

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

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

    @unnamed
    Scenario: Foot - Use way type to describe unnamed ways
@@ -14,7 +14,7 @@ Feature: Foot - Way ref

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

    Scenario: Foot - Way with only ref
        Given the node map
@@ -0,0 +1,120 @@
+@routing @car @bridge @tunnel @guidance
+Feature: Car - Guidance - Bridges and Tunnels
+    Background:
+        Given the profile "car"
+        And a grid size of 100 meters
+
+    Scenario: Simple Bridge
+        Given the node map
+            | a | b | c | d |
+
+        And the ways
+            | nodes | highway | bridge | name               |
+            | ab    | primary |        | Hauptstraße        |
+            | bc    | primary | yes    | Hauptstraßenbrücke |
+            | cd    | primary |        | Hauptstraße        |
+
+        When I route I should get
+            | from | to | route                   | turns         |
+            | a    | d  | Hauptstraße,Hauptstraße | depart,arrive |
+
+    Scenario: Bridge with Immediate Turn
+        Given the node map
+            |   |   |   | d |
+            | a |   | b | c |
+            |   |   |   | e |
+
+        And the ways
+            | nodes | highway | bridge | name               |
+            | ab    | primary |        | Hauptstraße        |
+            | bc    | primary | yes    | Hauptstraßenbrücke |
+            | dce   | primary |        | Nebenstraße        |
+
+        When I route I should get
+            | from | to | route                                      | turns                           |
+            | a    | d  | Hauptstraße,Nebenstraße,Nebenstraße        | depart,end of road left,arrive  |
+            | a    | e  | Hauptstraße,Nebenstraße,Nebenstraße        | depart,end of road right,arrive |
+            | e    | a  | Nebenstraße,Hauptstraßenbrücke,Hauptstraße | depart,turn left,arrive         |
+            | d    | a  | Nebenstraße,Hauptstraßenbrücke,Hauptstraße | depart,turn right,arrive        |
+
+    Scenario: Bridge with Immediate Turn Front and Back
+        Given the node map
+            | f |   |   | d |
+            | a |   | b | c |
+            | g |   |   | e |
+
+        And the ways
+            | nodes | highway | bridge | name               |
+            | ab    | primary |        | Hauptstraße        |
+            | bc    | primary | yes    | Hauptstraßenbrücke |
+            | dce   | primary |        | Nebenstraße        |
+            | gaf   | primary |        | Anderestraße       |
+
+        When I route I should get
+            | from | to | route                                                    | turns                                      |
+            | f    | d  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn left,end of road left,arrive   |
+            | f    | e  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn left,end of road right,arrive  |
+            | g    | d  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn right,end of road left,arrive  |
+            | g    | e  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn right,end of road right,arrive |
+            | e    | f  | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn left,end of road right,arrive  |
+            | e    | g  | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn left,end of road left,arrive   |
+            | d    | f  | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn right,end of road right,arrive |
+            | d    | g  | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn right,end of road left,arrive  |
+
+    Scenario: Simple Tunnel
+        Given the node map
+            | a | b | c | d |
+
+        And the ways
+            | nodes | highway | tunnel | name               |
+            | ab    | primary |        | Hauptstraße        |
+            | bc    | primary | yes    | Hauptstraßentunnel |
+            | cd    | primary |        | Hauptstraße        |
+
+        When I route I should get
+            | from | to | route                   | turns         |
+            | a    | d  | Hauptstraße,Hauptstraße | depart,arrive |
+
+    Scenario: Tunnel with Immediate Turn
+        Given the node map
+            |   |   |   | d |
+            | a |   | b | c |
+            |   |   |   | e |
+
+        And the ways
+            | nodes | highway | tunnel | name               |
+            | ab    | primary |        | Hauptstraße        |
+            | bc    | primary | yes    | Hauptstraßentunnel |
+            | dce   | primary |        | Nebenstraße        |
+
+        When I route I should get
+            | from | to | route                                      | turns                           |
+            | a    | d  | Hauptstraße,Nebenstraße,Nebenstraße        | depart,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        |
+
+    Scenario: Tunnel with Immediate Turn Front and Back
+        Given the node map
+            | f |   |   | d |
+            | a |   | b | c |
+            | g |   |   | e |
+
+        And the ways
+            | nodes | highway | bridge | name               |
+            | ab    | primary |        | Hauptstraße        |
+            | bc    | primary | yes    | Hauptstraßentunnel |
+            | dce   | primary |        | Nebenstraße        |
+            | gaf   | primary |        | Anderestraße       |
+
+        When I route I should get
+            | from | to | route                                                    | turns                                      |
+            | f    | d  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn left,end of road left,arrive   |
+            | f    | e  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn left,end of road right,arrive  |
+            | g    | d  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn right,end of road left,arrive  |
+            | g    | e  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn right,end of road right,arrive |
+            | e    | f  | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn left,end of road right,arrive  |
+            | e    | g  | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn left,end of road left,arrive   |
+            | d    | f  | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn right,end of road right,arrive |
+            | d    | g  | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn right,end of road left,arrive  |
+
@@ -0,0 +1,347 @@
+@routing  @guidance @collapsing
+Feature: Collapse
+
+    Background:
+        Given the profile "car"
+        Given a grid size of 20 meters
+
+    Scenario: Segregated Intersection, Cross Belonging to Single Street
+        Given the node map
+            |   |   | i | l |   |   |
+            |   |   |   |   |   |   |
+            | d |   | c | b |   | a |
+            | e |   | f | g |   | h |
+            |   |   |   |   |   |   |
+            |   |   | j | k |   |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | ab    | primary | first  | yes    |
+            | bc    | primary | first  | yes    |
+            | cd    | primary | first  | yes    |
+            | ef    | primary | first  | yes    |
+            | fg    | primary | first  | yes    |
+            | gh    | primary | first  | yes    |
+            | ic    | primary | second | yes    |
+            | bl    | primary | second | yes    |
+            | kg    | primary | second | yes    |
+            | fj    | primary | second | yes    |
+            | cf    | primary | first  | yes    |
+            | gb    | primary | first  | yes    |
+
+       When I route I should get
+            | waypoints | route                | turns                        |
+            | a,l       | first,second,second  | depart,turn right,arrive     |
+            | a,d       | first,first          | depart,arrive                |
+            | a,j       | first,second,second  | depart,turn left,arrive      |
+            | a,h       | first,first,first    | depart,continue uturn,arrive |
+            | e,j       | first,second,second  | depart,turn right,arrive     |
+            | e,h       | first,first          | depart,arrive                |
+            | e,l       | first,second,second  | depart,turn left,arrive      |
+            | e,d       | first,first,first    | depart,continue uturn,arrive |
+            | k,h       | second,first,first   | depart,turn right,arrive     |
+            | k,l       | second,second        | depart,arrive                |
+            | k,d       | second,first,first   | depart,turn left,arrive      |
+            | k,j       | second,second,second | depart,continue uturn,arrive |
+            | i,d       | second,first,first   | depart,turn right,arrive     |
+            | i,j       | second,second        | depart,arrive                |
+            | i,h       | second,first,first   | depart,turn left,arrive      |
+            | i,l       | second,second,second | depart,continue uturn,arrive |
+
+    Scenario: Segregated Intersection, Cross Belonging to Correct Street
+        Given the node map
+            |   |   | i | l |   |   |
+            |   |   |   |   |   |   |
+            | d |   | c | b |   | a |
+            | e |   | f | g |   | h |
+            |   |   |   |   |   |   |
+            |   |   | j | k |   |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | ab    | primary | first  | yes    |
+            | bc    | primary | first  | yes    |
+            | cd    | primary | first  | yes    |
+            | ef    | primary | first  | yes    |
+            | fg    | primary | first  | yes    |
+            | gh    | primary | first  | yes    |
+            | ic    | primary | second | yes    |
+            | bl    | primary | second | yes    |
+            | kg    | primary | second | yes    |
+            | fj    | primary | second | yes    |
+            | cf    | primary | second | yes    |
+            | gb    | primary | second | yes    |
+
+       When I route I should get
+            | waypoints | route                | turns                        |
+            | a,l       | first,second,second  | depart,turn right,arrive     |
+            | a,d       | first,first          | depart,arrive                |
+            | a,j       | first,second,second  | depart,turn left,arrive      |
+            | a,h       | first,first,first    | depart,continue uturn,arrive |
+            | e,j       | first,second,second  | depart,turn right,arrive     |
+            | e,h       | first,first          | depart,arrive                |
+            | e,l       | first,second,second  | depart,turn left,arrive      |
+            | e,d       | first,first,first    | depart,continue uturn,arrive |
+            | k,h       | second,first,first   | depart,turn right,arrive     |
+            | k,l       | second,second        | depart,arrive                |
+            | k,d       | second,first,first   | depart,turn left,arrive      |
+            | k,j       | second,second,second | depart,continue uturn,arrive |
+            | i,d       | second,first,first   | depart,turn right,arrive     |
+            | i,j       | second,second        | depart,arrive                |
+            | i,h       | second,first,first   | depart,turn left,arrive      |
+            | i,l       | second,second,second | depart,continue uturn,arrive |
+
+    Scenario: Segregated Intersection, Cross Belonging to Mixed Streets
+        Given the node map
+            |   |   | i | l |   |   |
+            |   |   |   |   |   |   |
+            | d |   | c | b |   | a |
+            | e |   | f | g |   | h |
+            |   |   |   |   |   |   |
+            |   |   | j | k |   |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | ab    | primary | first  | yes    |
+            | bc    | primary | second | yes    |
+            | cd    | primary | first  | yes    |
+            | ef    | primary | first  | yes    |
+            | fg    | primary | first  | yes    |
+            | gh    | primary | first  | yes    |
+            | ic    | primary | second | yes    |
+            | bl    | primary | second | yes    |
+            | kg    | primary | second | yes    |
+            | fj    | primary | second | yes    |
+            | cf    | primary | second | yes    |
+            | gb    | primary | first  | yes    |
+
+       When I route I should get
+            | waypoints | route                | turns                        |
+            | a,l       | first,second,second  | depart,turn right,arrive     |
+            | a,d       | first,first          | depart,arrive                |
+            | a,j       | first,second,second  | depart,turn left,arrive      |
+            | a,h       | first,first,first    | depart,continue uturn,arrive |
+            | e,j       | first,second,second  | depart,turn right,arrive     |
+            | e,h       | first,first          | depart,arrive                |
+            | e,l       | first,second,second  | depart,turn left,arrive      |
+            | e,d       | first,first,first    | depart,continue uturn,arrive |
+            | k,h       | second,first,first   | depart,turn right,arrive     |
+            | k,l       | second,second        | depart,arrive                |
+            | k,d       | second,first,first   | depart,turn left,arrive      |
+            | k,j       | second,second,second | depart,continue uturn,arrive |
+            | i,d       | second,first,first   | depart,turn right,arrive     |
+            | i,j       | second,second        | depart,arrive                |
+            | i,h       | second,first,first   | depart,turn left,arrive      |
+            | i,l       | second,second,second | depart,continue uturn,arrive |
+
+    Scenario: Partly Segregated Intersection, Two Segregated Roads
+        Given the node map
+            |   | g |   | h |   |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            | c |   | b |   | a |
+            | d |   | e |   | f |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            |   | j |   | i |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | ab    | primary | first  | yes    |
+            | bc    | primary | first  | yes    |
+            | de    | primary | first  | yes    |
+            | ef    | primary | first  | yes    |
+            | be    | primary | first  | no     |
+            | gbh   | primary | second | yes    |
+            | iej   | primary | second | yes    |
+
+       When I route I should get
+            | waypoints | route                | turns                        |
+            | a,h       | first,second,second  | depart,turn right,arrive     |
+            | a,c       | first,first          | depart,arrive                |
+            | a,j       | first,second,second  | depart,turn left,arrive      |
+            | a,f       | first,first,first    | depart,continue uturn,arrive |
+            | d,j       | first,second,second  | depart,turn right,arrive     |
+            | d,f       | first,first          | depart,arrive                |
+            | d,h       | first,second,second  | depart,turn left,arrive      |
+            | d,c       | first,first,first    | depart,continue uturn,arrive |
+            | g,c       | second,first,first   | depart,turn right,arrive     |
+            | g,j       | second,second        | depart,arrive                |
+            | g,f       | second,first,first   | depart,turn left,arrive      |
+            | g,h       | second,second,second | depart,continue uturn,arrive |
+            | i,f       | second,first,first   | depart,turn right,arrive     |
+            | i,h       | second,second        | depart,arrive                |
+            | i,c       | second,first,first   | depart,turn left,arrive      |
+            | i,j       | second,second,second | depart,continue uturn,arrive |
+
+    Scenario: Partly Segregated Intersection, Two Segregated Roads, Intersection belongs to Second
+        Given the node map
+            |   | g |   | h |   |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            | c |   | b |   | a |
+            | d |   | e |   | f |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            |   | j |   | i |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | ab    | primary | first  | yes    |
+            | bc    | primary | first  | yes    |
+            | de    | primary | first  | yes    |
+            | ef    | primary | first  | yes    |
+            | be    | primary | second | no     |
+            | gbh   | primary | second | yes    |
+            | iej   | primary | second | yes    |
+
+       When I route I should get
+            | waypoints | route                | turns                        |
+            | a,h       | first,second,second  | depart,turn right,arrive     |
+            | a,c       | first,first          | depart,arrive                |
+            | a,j       | first,second,second  | depart,turn left,arrive      |
+            | a,f       | first,first,first    | depart,continue uturn,arrive |
+            | d,j       | first,second,second  | depart,turn right,arrive     |
+            | d,f       | first,first          | depart,arrive                |
+            | d,h       | first,second,second  | depart,turn left,arrive      |
+            | d,c       | first,first,first    | depart,continue uturn,arrive |
+            | g,c       | second,first,first   | depart,turn right,arrive     |
+            | g,j       | second,second        | depart,arrive                |
+            | g,f       | second,first,first   | depart,turn left,arrive      |
+            | g,h       | second,second,second | depart,continue uturn,arrive |
+            | i,f       | second,first,first   | depart,turn right,arrive     |
+            | i,h       | second,second        | depart,arrive                |
+            | i,c       | second,first,first   | depart,turn left,arrive      |
+            | i,j       | second,second,second | depart,continue uturn,arrive |
+
+    Scenario: Segregated Intersection, Cross Belonging to Mixed Streets - Slight Angles
+        Given the node map
+            |   |   | i | l |   |   |
+            |   |   |   |   |   | a |
+            |   |   | c | b |   | h |
+            | d |   | f | g |   |   |
+            | e |   |   |   |   |   |
+            |   |   | j | k |   |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | ab    | primary | first  | yes    |
+            | bc    | primary | second | yes    |
+            | cd    | primary | first  | yes    |
+            | ef    | primary | first  | yes    |
+            | fg    | primary | first  | yes    |
+            | gh    | primary | first  | yes    |
+            | ic    | primary | second | yes    |
+            | bl    | primary | second | yes    |
+            | kg    | primary | second | yes    |
+            | fj    | primary | second | yes    |
+            | cf    | primary | second | yes    |
+            | gb    | primary | first  | yes    |
+
+       When I route I should get
+            | waypoints | route                | turns                        |
+            | a,l       | first,second,second  | depart,turn right,arrive     |
+            | a,d       | first,first          | depart,arrive                |
+            | a,j       | first,second,second  | depart,turn left,arrive      |
+            | a,h       | first,first,first    | depart,continue uturn,arrive |
+            | e,j       | first,second,second  | depart,turn right,arrive     |
+            | e,h       | first,first          | depart,arrive                |
+            | e,l       | first,second,second  | depart,turn left,arrive      |
+            | e,d       | first,first,first    | depart,continue uturn,arrive |
+            | k,h       | second,first,first   | depart,turn right,arrive     |
+            | k,l       | second,second        | depart,arrive                |
+            | k,d       | second,first,first   | depart,turn left,arrive      |
+            | k,j       | second,second,second | depart,continue uturn,arrive |
+            | i,d       | second,first,first   | depart,turn right,arrive     |
+            | i,j       | second,second        | depart,arrive                |
+            | i,h       | second,first,first   | depart,turn left,arrive      |
+            | i,l       | second,second,second | depart,continue uturn,arrive |
+
+    Scenario: Segregated Intersection, Cross Belonging to Mixed Streets - Slight Angles (2)
+        Given the node map
+            |   |   | i | l |   |   |
+            |   |   |   |   |   |   |
+            |   |   | c | b |   |   |
+            | d |   | f | g |   | a |
+            | e |   |   |   |   | h |
+            |   |   | j | k |   |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | ab    | primary | first  | yes    |
+            | bc    | primary | second | yes    |
+            | cd    | primary | first  | yes    |
+            | ef    | primary | first  | yes    |
+            | fg    | primary | first  | yes    |
+            | gh    | primary | first  | yes    |
+            | ic    | primary | second | yes    |
+            | bl    | primary | second | yes    |
+            | kg    | primary | second | yes    |
+            | fj    | primary | second | yes    |
+            | cf    | primary | second | yes    |
+            | gb    | primary | first  | yes    |
+
+       When I route I should get
+            | waypoints | route                | turns                        |
+            | a,l       | first,second,second  | depart,turn right,arrive     |
+            | a,d       | first,first          | depart,arrive                |
+            | a,j       | first,second,second  | depart,turn left,arrive      |
+            | a,h       | first,first,first    | depart,continue uturn,arrive |
+            | e,j       | first,second,second  | depart,turn right,arrive     |
+            | e,h       | first,first          | depart,arrive                |
+            | e,l       | first,second,second  | depart,turn left,arrive      |
+            | e,d       | first,first,first    | depart,continue uturn,arrive |
+            | k,h       | second,first,first   | depart,turn right,arrive     |
+            | k,l       | second,second        | depart,arrive                |
+            | k,d       | second,first,first   | depart,turn left,arrive      |
+            | k,j       | second,second,second | depart,continue uturn,arrive |
+            | i,d       | second,first,first   | depart,turn right,arrive     |
+            | i,j       | second,second        | depart,arrive                |
+            | i,h       | second,first,first   | depart,turn left,arrive      |
+            | i,l       | second,second,second | depart,continue uturn,arrive |
+
+    Scenario: Entering a segregated road
+        Given the node map
+            |   | a | f |   |   |
+            |   |   |   |   | g |
+            |   | b | e |   |   |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            | c | d |   |   |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | abc   | primary | first  | yes    |
+            | def   | primary | first  | yes    |
+            | be    | primary | first  | no     |
+            | ge    | primary | second | no     |
+
+        When I route I should get
+            | waypoints | route               | turns                          |
+            | d,c       | first,first,first   | depart,continue uturn,arrive   |
+            | a,f       | first,first,first   | depart,continue uturn,arrive   |
+            | a,g       | first,second,second | depart,turn left,arrive        |
+            | d,g       | first,second,second | depart,turn right,arrive       |
+            | g,f       | second,first,first  | depart,turn right,arrive       |
+            | g,c       | second,first,first  | depart,end of road left,arrive |
+
+
+    Scenario: Do not collapse turning roads
+        Given the node map
+            |   |   | e |   |   |
+            |   |   | c |   | d |
+            | a |   | b | f |   |
+
+        And the ways
+            | nodes | highway | name   |
+            | ab    | primary | first  |
+            | bc    | primary | first  |
+            | cd    | primary | first  |
+            | ce    | primary | second |
+            | bf    | primary | third  |
+
+        When I route I should get
+            | waypoints | route                   | turns                                      |
+            | a,d       | first,first,first,first | depart,continue left,continue right,arrive |
+            | a,e       | first,second,second     | depart,turn left,arrive                    |
+            | a,f       | first,third,third       | depart,new name straight,arrive            |
@@ -0,0 +1,90 @@
+@routing  @guidance
+Feature: Continue Instructions
+
+    Background:
+        Given the profile "car"
+        Given a grid size of 10 meters
+
+    Scenario: Road turning left
+        Given the node map
+            |   |   | c |   |
+            | a |   | b | d |
+
+        And the ways
+            | nodes  | highway |
+            | abc    | primary |
+            | bd     | primary |
+
+       When I route I should get
+            | waypoints | route       | turns                           |
+            | a,c       | abc,abc,abc | depart,continue left,arrive     |
+            | a,d       | abc,bd,bd   | depart,new name straight,arrive |
+
+    Scenario: Road turning right
+        Given the node map
+            | a |   | b | d |
+            |   |   | c |   |
+
+        And the ways
+            | nodes  | highway |
+            | abc    | primary |
+            | bd     | primary |
+
+       When I route I should get
+            | waypoints | route       | turns                           |
+            | a,c       | abc,abc,abc | depart,continue right,arrive    |
+            | a,d       | abc,bd,bd   | depart,new name straight,arrive |
+
+    Scenario: Road turning slight left
+        Given the node map
+            |   |   |   |   | c |
+            |   |   |   |   |   |
+            | a |   | b |   |   |
+            |   |   |   | d |   |
+
+        And the ways
+            | nodes  | highway |
+            | abc    | primary |
+            | bd     | primary |
+
+       When I route I should get
+            | waypoints | route       | turns                       |
+            | a,c       | abc,abc,abc | depart,continue left,arrive |
+            | a,d       | abc,bd,bd   | depart,turn right,arrive    |
+
+    Scenario: Road turning slight right
+        Given the node map
+            |   |   |   | d |   |
+            | a |   | b |   |   |
+            |   |   |   |   |   |
+            |   |   |   |   | c |
+
+        And the ways
+            | nodes  | highway |
+            | abc    | primary |
+            | bd     | primary |
+
+       When I route I should get
+            | waypoints | route       | turns                        |
+            | a,c       | abc,abc,abc | depart,continue right,arrive |
+            | a,d       | abc,bd,bd   | depart,turn left,arrive      |
+
+    Scenario: Road Loop
+       Given the node map
+           |   |   | f |   | e |
+           |   |   |   |   |   |
+           | a |   | b | g |   |
+           |   |   |   |   |   |
+           |   |   | c |   | d |
+
+       And the ways
+          | nodes   | highway |
+          | abcdefb | primary |
+          | bg      | primary |
+
+       When I route I should get
+          | waypoints | route                   | turns                        |
+          | a,c       | abcdefb,abcdefb,abcdefb | depart,continue right,arrive |
+          | a,f       | abcdefb,abcdefb,abcdefb | depart,continue left,arrive  |
+          | a,d       | abcdefb,abcdefb,abcdefb | depart,continue right,arrive |
+          | a,e       | abcdefb,abcdefb,abcdefb | depart,continue left,arrive  |
@@ -0,0 +1,41 @@
+@routing @guidance
+Feature: Destination Signs
+
+    Background:
+        Given the profile "car"
+
+    Scenario: Car - route name assembly with destination signs
+        Given the node map
+          | a | b |
+          | c | d |
+          | e | f |
+          | g | h |
+          | i | j |
+          | k | l |
+          | m | n |
+          | o | p |
+          | q | r |
+
+        And the ways
+          | nodes | name | ref | destination    | destination:ref | oneway | #                                    |
+          | ab    | AB   | E1  |                |                 | yes    |                                      |
+          | cd    | CD   |     | Berlin         |                 | yes    |                                      |
+          | ef    | EF   |     | Berlin         | A1              | yes    |                                      |
+          | gh    |      |     | Berlin         | A1              | yes    |                                      |
+          | ij    |      |     | Berlin         |                 | yes    |                                      |
+          | kl    | KL   | E1  | Berlin         | A1              | yes    |                                      |
+          | mn    | MN   |     | Berlin;Hamburg | A1;A2           | yes    |                                      |
+          | op    | OP   |     | Berlin;Hamburg | A1;A2           | no     | mis-tagged destination: not a oneway |
+          | qr    | QR   |     |                | A1;A2           | yes    |                                      |
+
+        When I route I should get
+          | from | to | route                                                     | #                         |
+          | a    | b  | AB (E1),AB (E1)                                           |                           |
+          | c    | d  | CD (Berlin),CD (Berlin)                                   |                           |
+          | e    | f  | EF (A1: Berlin),EF (A1: Berlin)                           |                           |
+          | g    | h  | ,                                                         |                           |
+          | i    | j  | ,                                                         |                           |
+          | k    | l  | KL (E1),KL (E1)                                           |                           |
+          | m    | n  | MN (A1, A2: Berlin, Hamburg),MN (A1, A2: Berlin, Hamburg) |                           |
+          | o    | p  | OP,OP                                                     | guard against mis-tagging |
+          | q    | r  | QR (A1, A2),QR (A1, A2)                                   |                           |
@@ -0,0 +1,123 @@
+@routing  @guidance
+Feature: End Of Road Instructions
+
+    Background:
+        Given the profile "car"
+        Given a grid size of 10 meters
+
+    Scenario: End of Road with through street
+        Given the node map
+            |   |   | c |
+            | a |   | b |
+            |   |   | d |
+
+        And the ways
+            | nodes  | highway |
+            | ab     | primary |
+            | cbd    | primary |
+
+       When I route I should get
+            | waypoints | route      | turns                           |
+            | a,c       | ab,cbd,cbd | depart,end of road left,arrive  |
+            | a,d       | ab,cbd,cbd | depart,end of road right,arrive |
+
+    Scenario: End of Road with three streets
+        Given the node map
+            |   |   | c |
+            | a |   | b |
+            |   |   | d |
+
+        And the ways
+            | nodes  | highway |
+            | ab     | primary |
+            | cb     | primary |
+            | bd     | primary |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | a,c       | ab,cb,cb | depart,end of road left,arrive  |
+            | a,d       | ab,bd,bd | depart,end of road right,arrive |
+
+    Scenario: End of Road with three streets, slightly angled
+        Given the node map
+            | a |   |   |   |   | c |
+            |   |   |   |   |   | b |
+            |   |   |   |   |   | d |
+
+        And the ways
+            | nodes  | highway |
+            | ab     | primary |
+            | cb     | primary |
+            | bd     | primary |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | a,c       | ab,cb,cb | depart,end of road left,arrive  |
+            | a,d       | ab,bd,bd | depart,end of road right,arrive |
+
+    Scenario: End of Road with three streets, slightly angled
+        Given the node map
+            |   |   |   |   |   | c |
+            |   |   |   |   |   | b |
+            | a |   |   |   |   | d |
+
+        And the ways
+            | nodes  | highway |
+            | ab     | primary |
+            | cb     | primary |
+            | bd     | primary |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | a,c       | ab,cb,cb | depart,end of road left,arrive  |
+            | a,d       | ab,bd,bd | depart,end of road right,arrive |
+
+    Scenario: End of Road with through street, slightly angled
+        Given the node map
+            | a |   |   |   |   | c |
+            |   |   |   |   |   | b |
+            |   |   |   |   |   | d |
+
+        And the ways
+            | nodes  | highway |
+            | ab     | primary |
+            | cbd    | primary |
+
+       When I route I should get
+            | waypoints | route      | turns                           |
+            | a,c       | ab,cbd,cbd | depart,end of road left,arrive  |
+            | a,d       | ab,cbd,cbd | depart,end of road right,arrive |
+
+    Scenario: End of Road with through street, slightly angled
+        Given the node map
+            |   |   |   |   |   | c |
+            |   |   |   |   |   | b |
+            | a |   |   |   |   | d |
+
+        And the ways
+            | nodes  | highway |
+            | ab     | primary |
+            | cbd    | primary |
+
+       When I route I should get
+            | waypoints | route      | turns                           |
+            | a,c       | ab,cbd,cbd | depart,end of road left,arrive  |
+            | a,d       | ab,cbd,cbd | depart,end of road right,arrive |
+
+    Scenario: End of Road with two ramps - prefer ramp over end of road
+        Given the node map
+            |   |   | c |
+            | a |   | b |
+            |   |   | d |
+
+        And the ways
+            | nodes  | highway       |
+            | ab     | primary       |
+            | bc     | motorway_link |
+            | bd     | motorway_link |
+
+       When I route I should get
+            | waypoints | route    | turns                       |
+            | a,c       | ab,bc,bc | depart,on ramp left,arrive  |
+            | a,d       | ab,bd,bd | depart,on ramp right,arrive |
+
@@ -0,0 +1,283 @@
+@routing  @guidance
+Feature: Fork Instructions
+
+    Background:
+        Given the profile "car"
+        Given a grid size of 10 meters
+
+    Scenario: Fork Same Road Class
+        Given the node map
+            |   |   |   |   | c |
+            | a |   | b |   |   |
+            |   |   |   |   | d |
+
+        And the ways
+            | nodes  | highway |
+            | ab     | primary |
+            | bc     | primary |
+            | bd     | primary |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | a,c       | ab,bc,bc | depart,fork slight left,arrive  |
+            | a,d       | ab,bd,bd | depart,fork slight right,arrive |
+
+    Scenario: Do not fork on link type
+        Given the node map
+            |   |   |   |   | c |
+            | a |   | b |   |   |
+            |   |   |   |   | d |
+
+        And the ways
+            | nodes  | highway      |
+            | abc    | primary      |
+            | bd     | primary_link |
+
+
+       When I route I should get
+            | waypoints | route      | turns                           |
+            | a,c       | abc,abc    | depart,arrive                   |
+            | a,d       | abc,bd,bd  | depart,turn slight right,arrive |
+
+    Scenario: Fork in presence of other roads
+        Given the node map
+            |   |   |   |   | c |
+            | a |   | b |   |   |
+            |   | e |   |   | d |
+
+        And the ways
+            | nodes  | highway |
+            | ab     | primary |
+            | bc     | primary |
+            | bd     | primary |
+            | eb     | primary |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | a,c       | ab,bc,bc | depart,fork slight left,arrive  |
+            | a,d       | ab,bd,bd | depart,fork slight right,arrive |
+
+    Scenario: Fork Turning Slight Left
+        Given the node map
+            |   |   |   |   |   | c |
+            |   |   |   |   |   |   |
+            | a |   | b |   |   |   |
+            |   |   |   |   | d |   |
+
+        And the ways
+            | nodes  | highway |
+            | ab     | primary |
+            | bc     | primary |
+            | bd     | primary |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | a,c       | ab,bc,bc | depart,fork slight left,arrive  |
+            | a,d       | ab,bd,bd | depart,fork slight right,arrive |
+
+    Scenario: Fork Turning Slight Right
+        Given the node map
+            |   |   |   |   | c |   |
+            | a |   | b |   |   |   |
+            |   |   |   |   |   |   |
+            |   |   |   |   |   | d |
+
+        And the ways
+            | nodes  | highway |
+            | ab     | primary |
+            | bc     | primary |
+            | bd     | primary |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | a,c       | ab,bc,bc | depart,fork slight left,arrive  |
+            | a,d       | ab,bd,bd | depart,fork slight right,arrive |
+
+    Scenario: Do not fork on service
+        Given the node map
+            |   |   |   |   | c |
+            | a |   | b |   |   |
+            |   |   |   |   | d |
+
+        And the ways
+            | nodes  | highway     |
+            | abc    | residential |
+            | bd     | service     |
+
+       When I route I should get
+            | waypoints | route     | turns                           |
+            | a,c       | abc,abc   | depart,arrive                   |
+            | a,d       | abc,bd,bd | depart,turn slight right,arrive |
+
+    Scenario: Fork Both Turning Slight Right
+        Given the node map
+            | a |   | b |   |   |   |
+            |   |   |   |   |   | c |
+            |   |   |   |   |   | d |
+
+        And the ways
+            | nodes  | highway |
+            | ab     | primary |
+            | bc     | primary |
+            | bd     | primary |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | a,c       | ab,bc,bc | depart,fork slight left,arrive  |
+            | a,d       | ab,bd,bd | depart,fork slight right,arrive |
+
+    Scenario: Fork Both Turning Slight Left
+        Given the node map
+            |   |   |   |   |   | c |
+            |   |   |   |   |   | d |
+            | a |   | b |   |   |   |
+
+        And the ways
+            | nodes  | highway |
+            | ab     | primary |
+            | bc     | primary |
+            | bd     | primary |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | a,c       | ab,bc,bc | depart,fork slight left,arrive  |
+            | a,d       | ab,bd,bd | depart,fork slight right,arrive |
+
+    Scenario: Fork Both Turning Slight Right - Unnamed
+        Given the node map
+            | a |   | b |   |   |   |
+            |   |   |   |   |   | c |
+            |   |   |   |   |   | d |
+
+        And the ways
+            | nodes  | highway | name |
+            | ab     | primary |      |
+            | bc     | primary |      |
+            | bd     | primary |      |
+
+       When I route I should get
+            | waypoints | route | turns                           |
+            | a,c       | ,,    | depart,fork slight left,arrive  |
+            | a,d       | ,,    | depart,fork slight right,arrive |
+
+    Scenario: Fork Both Turning Slight Left - Unnamed
+        Given the node map
+            |   |   |   |   |   | c |
+            |   |   |   |   |   | d |
+            | a |   | b |   |   |   |
+
+        And the ways
+            | nodes  | highway | name |
+            | ab     | primary |      |
+            | bc     | primary |      |
+            | bd     | primary |      |
+
+       When I route I should get
+            | waypoints | route | turns                           |
+            | a,c       | ,,    | depart,fork slight left,arrive  |
+            | a,d       | ,,    | depart,fork slight right,arrive |
+
+    Scenario: Fork Both Turning Very Slightly Right - Unnamed
+        Given the node map
+            | a |   | b |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |   |   | c |   |   |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | d |
+
+        And the ways
+            | nodes  | highway | name |
+            | ab     | primary |      |
+            | bc     | primary |      |
+            | bd     | primary |      |
+
+       When I route I should get
+            | waypoints | route | turns                           |
+            | a,c       | ,,    | depart,fork slight left,arrive  |
+            | a,d       | ,,    | depart,fork slight right,arrive |
+
+    Scenario: Fork Both Turning Very Slightly Right - Unnamed Ramps
+        Given the node map
+            | a |   | b |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |   |   | c |   |   |   |   |   |   |
+            |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   | d |
+
+        And the ways
+            | nodes  | highway       | name |
+            | ab     | motorway_link |      |
+            | bc     | motorway_link |      |
+            | bd     | motorway_link |      |
+
+       When I route I should get
+            | waypoints | route | turns                           |
+            | a,c       | ,,    | depart,fork slight left,arrive  |
+            | a,d       | ,,    | depart,fork slight right,arrive |
+
+    Scenario: Non-Fork on complex intersection - left
+        Given the node map
+            |   |   |   |   | c |
+            | a |   | b |   |   |
+            |   | e |   |   | d |
+
+        And the ways
+            | nodes  | highway   |
+            | abc    | secondary |
+            | bd     | tertiary  |
+            | eb     | tertiary  |
+
+       When I route I should get
+            | waypoints | route     | turns                           |
+            | a,c       | abc,abc   | depart,arrive                   |
+            | a,d       | abc,bd,bd | depart,turn slight right,arrive |
+
+    Scenario: Non-Fork on complex intersection - right
+        Given the node map
+            |   | e |   |   | c |
+            | a |   | b |   |   |
+            |   |   |   |   | d |
+
+        And the ways
+            | nodes  | highway   |
+            | abd    | secondary |
+            | bc     | tertiary  |
+            | eb     | tertiary  |
+
+       When I route I should get
+            | waypoints | route     | turns                          |
+            | a,c       | abd,bc,bc | depart,turn slight left,arrive |
+            | a,d       | abd,abd   | depart,arrive                  |
+
+    Scenario: Tripple fork
+        Given the node map
+            |   |   |   |   |   |   |   |   | c |
+            | a |   | b |   | d |   |   |   |   |
+            |   |   |   |   |   |   |   |   | e |
+
+        And the ways
+            | nodes  | highway   |
+            | ab     | secondary |
+            | bc     | secondary |
+            | bd     | secondary |
+            | be     | secondary |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | a,c       | ab,bc,bc | depart,fork slight left,arrive  |
+            | a,d       | ab,bd,bd | depart,fork straight,arrive     |
+            | a,e       | ab,be,be | depart,fork slight right,arrive |
+
+    Scenario: Tripple fork -- middle obvious
+        Given the node map
+            |   |   |   |   | c |
+            | a |   | b |   | d |
+            |   |   |   |   | e |
+
+        And the ways
+            | nodes  | highway   |
+            | abd    | secondary |
+            | bc     | secondary |
+            | be     | secondary |
+
+       When I route I should get
+            | waypoints | route     | turns                           |
+            | a,c       | abd,bc,bc | depart,turn slight left,arrive  |
+            | a,d       | abd,abd   | depart,arrive                   |
+            | a,e       | abd,be,be | depart,turn slight right,arrive |
@@ -0,0 +1,52 @@
+@routing  @guidance
+Feature: Merging
+
+    Background:
+        Given the profile "car"
+        Given a grid size of 10 meters
+
+    Scenario: Merge on Four Way Intersection
+        Given the node map
+            | d |   |   |
+            | a | b | c |
+            | e |   |   |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | db    | primary |
+            | eb    | primary |
+
+       When I route I should get
+            | waypoints | route      | turns                            |
+            | d,c       | db,abc,abc | depart,merge slight right,arrive |
+            | e,c       | eb,abc,abc | depart,merge slight left,arrive  |
+
+    Scenario: Merge on Three Way Intersection Right
+        Given the node map
+            | d |   |   |
+            | a | b | c |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | db    | primary |
+
+       When I route I should get
+            | waypoints | route      | turns                            |
+            | d,c       | db,abc,abc | depart,merge slight right,arrive |
+
+    Scenario: Merge on Three Way Intersection Right
+        Given the node map
+            | a | b | c |
+            | d |   |   |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | db    | primary |
+
+       When I route I should get
+            | waypoints | route      | turns                           |
+            | d,c       | db,abc,abc | depart,merge slight left,arrive |
+
@@ -1,8 +1,8 @@
@routing  @guidance
-Feature: Basic Roundabout
+Feature: Motorway Guidance

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

    Scenario: Ramp Exit Right
@@ -16,9 +16,9 @@ Feature: Basic Roundabout
            | bfg    | motorway_link |

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

    Scenario: Ramp Exit Right Curved Right
        Given the node map
@@ -32,9 +32,9 @@ Feature: Basic Roundabout
            | bfg    | motorway_link |

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

    Scenario: Ramp Exit Right Curved Left
        Given the node map
@@ -49,9 +49,9 @@ Feature: Basic Roundabout
            | cfg    | motorway_link |

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


    Scenario: Ramp Exit Left
@@ -65,9 +65,9 @@ Feature: Basic Roundabout
            | bfg    | motorway_link |

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

    Scenario: Ramp Exit Left Curved Left
        Given the node map
@@ -81,9 +81,9 @@ Feature: Basic Roundabout
            | bfg    | motorway_link |

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

    Scenario: Ramp Exit Left Curved Right
        Given the node map
@@ -97,9 +97,9 @@ Feature: Basic Roundabout
            | cfg    | motorway_link |

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

    Scenario: On Ramp Right
        Given the node map
@@ -112,9 +112,9 @@ Feature: Basic Roundabout
            | fgd    | motorway_link |

       When I route I should get
-            | waypoints | route           | turns                             |
-            | a,e       | abcde, abcde    | depart, arrive                    |
-            | f,e       | abcde, fgd, fgd | depart, merge-slight-left, arrive |
+            | waypoints | route           | turns                           |
+            | a,e       | abcde,abcde     | depart,arrive                   |
+            | f,e       | fgd,abcde,abcde | depart,merge slight left,arrive |

    Scenario: On Ramp Left
        Given the node map
@@ -127,9 +127,9 @@ Feature: Basic Roundabout
            | fgd    | motorway_link |

       When I route I should get
-            | waypoints | route           | turns                              |
-            | a,e       | abcde, abcde    | depart, arrive                     |
-            | f,e       | abcde, fgd, fgd | depart, merge-slight-right, arrive |
+            | waypoints | route           | turns                            |
+            | a,e       | abcde,abcde     | depart,arrive                    |
+            | f,e       | fgd,abcde,abcde | depart,merge slight right,arrive |

    Scenario: Highway Fork
        Given the node map
@@ -143,9 +143,9 @@ Feature: Basic Roundabout
            | cfg    | motorway |

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

     Scenario: Fork After Ramp
       Given the node map
@@ -160,9 +160,9 @@ Feature: Basic Roundabout
            | cfg    | motorway      |

       When I route I should get
-            | waypoints | route         | turns                      |
-            | a,e       | abc, cde, cde | depart, fork-left, arrive  |
-            | a,g       | abc, cfg, cfg | depart, fork-right, arrive |
+            | waypoints | route       | turns                           |
+            | a,e       | abc,cde,cde | depart,fork slight left,arrive  |
+            | a,g       | abc,cfg,cfg | depart,fork slight right,arrive |

     Scenario: On And Off Ramp Right
       Given the node map
@@ -176,11 +176,11 @@ Feature: Basic Roundabout
            | chi    | motorway_link |

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

    Scenario: On And Off Ramp Left
       Given the node map
@@ -194,9 +194,25 @@ Feature: Basic Roundabout
            | chi    | motorway_link |

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

+    Scenario: Merging Motorways
+        Given the node map
+            | e |   |   |
+            | a | b | c |
+            | d |   |   |
+
+        And the ways
+            | nodes | highway  |
+            | abc   | motorway |
+            | db    | motorway |
+            | eb    | motorway |
+
+        When I route I should get
+            | waypoints | route      | turns                            |
+            | d,c       | db,abc,abc | depart,merge slight left,arrive  |
+            | e,c       | eb,abc,abc | depart,merge slight right,arrive |
@@ -0,0 +1,166 @@
+@routing  @guidance
+Feature: New-Name Instructions
+
+    Background:
+        Given the profile "car"
+        Given a grid size of 10 meters
+
+    Scenario: Undisturbed name Change
+        Given the node map
+            | a |   | b |   | c |
+
+        And the ways
+            | nodes  |
+            | ab     |
+            | bc     |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | a,c       | ab,bc,bc | depart,new name straight,arrive |
+
+
+    Scenario: Undisturbed Name Change with unannounced Turn Right
+        Given the node map
+            | a |   | b |   |   |
+            |   |   |   |   | c |
+
+        And the ways
+            | nodes  |
+            | ab     |
+            | bc     |
+
+       When I route I should get
+            | waypoints | route    | turns                               |
+            | a,c       | ab,bc,bc | depart,new name slight right,arrive |
+
+    Scenario: Undisturbed Name Change with unannounced Turn Left
+        Given the node map
+            |   |   |   |   | c |
+            | a |   | b |   |   |
+
+        And the ways
+            | nodes  |
+            | ab     |
+            | bc     |
+
+       When I route I should get
+            | waypoints | route    | turns                              |
+            | a,c       | ab,bc,bc | depart,new name slight left,arrive |
+
+    Scenario: Disturbed Name Change with Turn
+        Given the node map
+            | a |   | b |   |   |
+            |   | d |   |   | c |
+
+        And the ways
+            | nodes  |
+            | ab     |
+            | bc     |
+            | db     |
+
+       When I route I should get
+            | waypoints | route    | turns                               |
+            | a,c       | ab,bc,bc | depart,new name slight right,arrive |
+
+    Scenario: Undisturbed Name Change with announced Turn Left
+        Given the node map
+            |   |   | c |
+            | a |   | b |
+
+        And the ways
+            | nodes  |
+            | ab     |
+            | bc     |
+
+       When I route I should get
+            | waypoints | route    | turns                       |
+            | a,c       | ab,bc,bc | depart,new name left,arrive |
+
+    Scenario: Undisturbed Name Change with announced Turn Sharp Left
+        Given the node map
+            | c |   |   |
+            | a |   | b |
+
+        And the ways
+            | nodes  |
+            | ab     |
+            | bc     |
+
+       When I route I should get
+            | waypoints | route    | turns                             |
+            | a,c       | ab,bc,bc | depart,new name sharp left,arrive |
+
+    Scenario: Undisturbed Name Change with announced Turn Right
+        Given the node map
+            | a |   | b |
+            |   |   | c |
+
+        And the ways
+            | nodes  |
+            | ab     |
+            | bc     |
+
+       When I route I should get
+            | waypoints | route    | turns                        |
+            | a,c       | ab,bc,bc | depart,new name right,arrive |
+
+    Scenario: Undisturbed Name Change with announced Turn Sharp Right
+        Given the node map
+            | a |   | b |
+            | c |   |   |
+
+        And the ways
+            | nodes  |
+            | ab     |
+            | bc     |
+
+       When I route I should get
+            | waypoints | route    | turns                              |
+            | a,c       | ab,bc,bc | depart,new name sharp right,arrive |
+
+
+    Scenario: Disturbed Name Change with minor road class
+        Given the node map
+            | a |   | b |   | d |
+            |   |   |   |   | c |
+
+        And the ways
+            | nodes  | highway     |
+            | ab     | residential |
+            | bc     | residential |
+            | bd     | service     |
+
+       When I route I should get
+            | waypoints | route    | turns                               |
+            | a,c       | ab,bc,bc | depart,new name slight right,arrive |
+
+    Scenario: Empty road names - Announce Change From, suppress Change To
+        Given the node map
+            | a |  | b |  | c |  | d |
+
+        And the ways
+            | nodes | name |
+            | ab    | ab   |
+            | bc    |      |
+            | cd    | cd   |
+
+        When I route I should get
+            | waypoints | route    | turns                           |
+            | a,d       | ab,cd,cd | depart,new name straight,arrive |
+            | a,c       | ab,      | depart,arrive                   |
+
+    Scenario: Empty road names - Loose name shortly
+        Given the node map
+            | a |  | b |  | c |  | d |  | e |
+
+        And the ways
+            | nodes | name      |
+            | ab    | name      |
+            | bc    | with-name |
+            | cd    |           |
+            | de    | with-name |
+
+        When I route I should get
+            | waypoints | route                    | turns                           |
+            | a,e       | name,with-name,with-name | depart,new name straight,arrive |
+            | b,e       | with-name,with-name      | depart,arrive                   |
@@ -0,0 +1,229 @@
+@routing  @guidance
+Feature: Ramp Guidance
+
+    Background:
+        Given the profile "car"
+        Given a grid size of 10 meters
+
+    Scenario: Ramp On Through Street Right
+        Given the node map
+            | a | b | c |
+            |   | d |   |
+
+        And the ways
+            | nodes | highway       |
+            | abc   | tertiary      |
+            | bd    | motorway_link |
+
+       When I route I should get
+            | waypoints | route     | turns                          |
+            | a,d       | abc,bd,bd | depart,on ramp right,arrive |
+
+    Scenario: Ramp On Through Street Left
+        Given the node map
+            |   | d |   |
+            | a | b | c |
+
+        And the ways
+            | nodes | highway       |
+            | abc   | tertiary      |
+            | bd    | motorway_link |
+
+       When I route I should get
+            | waypoints | route     | turns                         |
+            | a,d       | abc,bd,bd | depart,on ramp left,arrive |
+
+    Scenario: Ramp On Through Street Left and Right
+        Given the node map
+            |   | e |   |
+            | a | b | c |
+            |   | d |   |
+
+        And the ways
+            | nodes | highway       |
+            | be    | motorway_link |
+            | abc   | tertiary      |
+            | bd    | motorway_link |
+
+       When I route I should get
+            | waypoints | route     | turns                          |
+            | a,d       | abc,bd,bd | depart,on ramp right,arrive |
+            | a,e       | abc,be,be | depart,on ramp left,arrive  |
+
+    Scenario: Ramp On Three Way Intersection Right
+        Given the node map
+            | a | b | c |
+            |   | d |   |
+
+        And the ways
+            | nodes | highway       |
+            | ab    | tertiary      |
+            | bc    | tertiary      |
+            | bd    | motorway_link |
+
+       When I route I should get
+            | waypoints | route    | turns                          |
+            | a,d       | ab,bd,bd | depart,on ramp right,arrive |
+
+    Scenario: Ramp On Three Way Intersection Right
+        Given the node map
+            |   |   | c |
+            | a | b |   |
+            |   | d |   |
+
+        And the ways
+            | nodes | highway       |
+            | ab    | tertiary      |
+            | bc    | tertiary      |
+            | bd    | motorway_link |
+
+       When I route I should get
+            | waypoints | route    | turns                          |
+            | a,d       | ab,bd,bd | depart,on ramp right,arrive |
+
+    Scenario: Ramp Off Though Street
+        Given the node map
+            |   |   | c |
+            | a | b |   |
+            |   | d |   |
+
+        And the ways
+            | nodes | highway       |
+            | abc   | tertiary      |
+            | bd    | motorway_link |
+
+       When I route I should get
+            | waypoints | route     | turns                          |
+            | a,d       | abc,bd,bd | depart,on ramp right,arrive |
+            | a,c       | abc,abc   | depart,arrive                  |
+
+    Scenario: Straight Ramp Off Turning Though Street
+        Given the node map
+            |   |   | c |
+            | a | b | d |
+
+        And the ways
+            | nodes | highway       |
+            | abc   | tertiary      |
+            | bd    | motorway_link |
+
+       When I route I should get
+            | waypoints | route       | turns                             |
+            | a,d       | abc,bd,bd   | depart,on ramp straight,arrive |
+            | a,c       | abc,abc,abc | depart,continue left,arrive       |
+
+    Scenario: Fork Ramp Off Turning Though Street
+        Given the node map
+            |   |   | c |
+            | a | b |   |
+            |   |   | d |
+
+        And the ways
+            | nodes | highway       |
+            | abc   | tertiary      |
+            | bd    | motorway_link |
+
+       When I route I should get
+            | waypoints | route       | turns                             |
+            | a,d       | abc,bd,bd   | depart,on ramp right,arrive    |
+            | a,c       | abc,abc,abc | depart,continue left,arrive       |
+
+    Scenario: Fork Ramp
+        Given the node map
+            |   |   | c |
+            | a | b |   |
+            |   |   | d |
+
+        And the ways
+            | nodes | highway       |
+            | ab    | tertiary      |
+            | bc    | tertiary      |
+            | bd    | motorway_link |
+
+       When I route I should get
+            | waypoints | route    | turns                          |
+            | a,d       | ab,bd,bd | depart,on ramp right,arrive |
+            | a,c       | ab,bc,bc | depart,turn left,arrive        |
+
+    Scenario: Fork Slight Ramp
+        Given the node map
+            |   |   |   | c |
+            | a | b |   |   |
+            |   |   |   | d |
+
+        And the ways
+            | nodes | highway       |
+            | ab    | tertiary      |
+            | bc    | tertiary      |
+            | bd    | motorway_link |
+
+       When I route I should get
+            | waypoints | route    | turns                                 |
+            | a,d       | ab,bd,bd | depart,on ramp slight right,arrive |
+            | a,c       | ab,bc,bc | depart,turn slight left,arrive        |
+
+    Scenario: Fork Slight Ramp on Through Street
+        Given the node map
+            |   |   |   | c |
+            | a | b |   |   |
+            |   |   |   | d |
+
+        And the ways
+            | nodes | highway       |
+            | abc   | tertiary      |
+            | bd    | motorway_link |
+
+       When I route I should get
+            | waypoints | route       | turns                                    |
+            | a,d       | abc,bd,bd   | depart,on ramp slight right,arrive    |
+            | a,c       | abc,abc,abc | depart,continue slight left,arrive       |
+
+    Scenario: Fork Slight Ramp on Obvious Through Street
+        Given the node map
+            |   |   |   | c |
+            | a | b |   |   |
+            |   |   |   | d |
+
+        And the ways
+            | nodes | highway       |
+            | abc   | primary       |
+            | bd    | motorway_link |
+
+       When I route I should get
+            | waypoints | route     | turns                                 |
+            | a,d       | abc,bd,bd | depart,on ramp slight right,arrive |
+            | a,c       | abc,abc   | depart,arrive                         |
+
+    Scenario: Two Ramps Joining into common Motorway
+        Given the node map
+            | a |   |   |   |
+            |   |   | c | d |
+            | b |   |   |   |
+
+        And the ways
+            | nodes | highway       |
+            | ac    | motorway_link |
+            | bc    | motorway_link |
+            | cd    | motorway      |
+
+        When I route I should get
+            | waypoints | route    | turns                               |
+            | a,d       | ac,cd,cd | depart,new name slight left,arrive  |
+            | b,d       | bc,cd,cd | depart,new name slight right,arrive |
+
+    Scenario: Two Ramps Joining into common Motorway Unnamed
+        Given the node map
+            | a |   |   |   |
+            |   |   | c | d |
+            | b |   |   |   |
+
+        And the ways
+            | nodes | highway       | name |
+            | ac    | motorway_link |      |
+            | bc    | motorway_link |      |
+            | cd    | motorway      |      |
+
+        When I route I should get
+            | waypoints | route    | turns         |
+            | a,d       | ,        | depart,arrive |
+            | b,d       | ,        | depart,arrive |
@@ -0,0 +1,167 @@
+@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  |
@@ -0,0 +1,262 @@
+@routing  @guidance
+Feature: Rotary
+
+    Background:
+        Given the profile "car"
+        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  |
+
+       Scenario: Collinear in X,Y
+        Given the node map
+            | a |   |   |
+            | b |   |   |
+            | c | d | f |
+            | e |   |   |
+
+        And the ways
+            | nodes | junction   |
+            | ab    |            |
+            | bcdb  | roundabout |
+            | ce    |            |
+            | df    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                     |
+            | a,e       | ab,ce,ce | depart,bcdb-exit-1,arrive |
+            | a,f       | ab,df,df | depart,bcdb-exit-2,arrive |
+
+       Scenario: Collinear in X,Y
+        Given the node map
+            | a |   |   |
+            | d |   |   |
+            | b | c | f |
+            | e |   |   |
+
+        And the ways
+            | nodes | junction   |
+            | ad    |            |
+            | bcdb  | roundabout |
+            | be    |            |
+            | cf    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                     |
+            | a,e       | ad,be,be | depart,bcdb-exit-1,arrive |
+            | a,f       | ad,cf,cf | depart,bcdb-exit-2,arrive |
+
+       Scenario: Collinear in X,Y
+        Given the node map
+            | a |   |   |
+            | c |   |   |
+            | d | b | f |
+            | e |   |   |
+
+        And the ways
+            | nodes | junction   |
+            | ac    |            |
+            | bcdb  | roundabout |
+            | de    |            |
+            | bf    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                     |
+            | a,e       | ac,de,de | depart,bcdb-exit-1,arrive |
+            | a,f       | ac,bf,bf | depart,bcdb-exit-2,arrive |
+
+       Scenario: Collinear in X,Y
+        Given the node map
+            | f |   |   |
+            | d | c | e |
+            |   | b |   |
+            |   | a |   |
+
+        And the ways
+            | nodes | junction   |
+            | ab    |            |
+            | bcdb  | roundabout |
+            | ce    |            |
+            | df    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                     |
+            | a,e       | ab,ce,ce | depart,bcdb-exit-1,arrive |
+            | a,f       | ab,df,df | depart,bcdb-exit-2,arrive |
+
+       Scenario: Collinear in X,Y
+        Given the node map
+            | f |   |   |
+            | d | c | e |
+            | b |   |   |
+            | a |   |   |
+
+        And the ways
+            | nodes | junction   |
+            | ab    |            |
+            | bcdb  | roundabout |
+            | ce    |            |
+            | df    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                     |
+            | a,e       | ab,ce,ce | depart,bcdb-exit-1,arrive |
+            | a,f       | ab,df,df | depart,bcdb-exit-2,arrive |
@@ -0,0 +1,166 @@
+@routing  @guidance
+Feature: Basic Roundabout
+
+    Background:
+        Given the profile "bicycle"
+        Given a grid size of 10 meters
+
+    Scenario: Enter and Exit
+        Given the node map
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | h | g |   | c | d |
+            |   |   | e |   |   |
+            |   |   | f |   |   |
+
+       And the ways
+            | nodes  | junction   |
+            | ab     |            |
+            | cd     |            |
+            | ef     |            |
+            | gh     |            |
+            | bgecb  | roundabout |
+
+       When I route I should get
+           | waypoints | route    | turns                           |
+           | a,d       | ab,cd,cd | depart,roundabout-exit-3,arrive |
+           | a,f       | ab,ef,ef | depart,roundabout-exit-2,arrive |
+           | a,h       | ab,gh,gh | depart,roundabout-exit-1,arrive |
+           | d,f       | cd,ef,ef | depart,roundabout-exit-3,arrive |
+           | d,h       | cd,gh,gh | depart,roundabout-exit-2,arrive |
+           | d,a       | cd,ab,ab | depart,roundabout-exit-1,arrive |
+           | f,h       | ef,gh,gh | depart,roundabout-exit-3,arrive |
+           | f,a       | ef,ab,ab | depart,roundabout-exit-2,arrive |
+           | f,d       | ef,cd,cd | depart,roundabout-exit-1,arrive |
+           | h,a       | gh,ab,ab | depart,roundabout-exit-3,arrive |
+           | h,d       | gh,cd,cd | depart,roundabout-exit-2,arrive |
+           | h,f       | gh,ef,ef | depart,roundabout-exit-1,arrive |
+
+    Scenario: Only Enter
+        Given the node map
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | d | c |   | g | h |
+            |   |   | e |   |   |
+            |   |   | f |   |   |
+
+       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
+            |   |   | 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,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
+           |   | 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,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 |
@@ -0,0 +1,369 @@
+@routing  @guidance
+Feature: Basic Roundabout
+
+    Background:
+        Given the profile "car"
+        Given a grid size of 3 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    |
+
+    Scenario: Enter and Exit - Rotated
+        Given the node map
+            | a |   |   | d |
+            |   | b | c |   |
+            |   | g | e |   |
+            | h |   |   | 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    |
+
+    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
+            |   |   | 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,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 - Not an Intersection
+        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,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
+           |   | a |   | c |   |
+           | l |   | b |   | d |
+           |   | k |   | e |   |
+           | j |   | h |   | f |
+           |   | i |   | g |   |
+
+        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,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
+            | a | b | c | d | f |
+            |   |   | e |   |   |
+
+        And the ways
+            | nodes | junction   |
+            | ab    |            |
+            | bcdb  | roundabout |
+            | ce    |            |
+            | df    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                           |
+            | a,e       | ab,ce,ce | depart,roundabout-exit-1,arrive |
+            | a,f       | ab,df,df | depart,roundabout-exit-2,arrive |
+
+       Scenario: Collinear in X,Y
+        Given the node map
+            | a |   |   |
+            | b |   |   |
+            | c | d | f |
+            | e |   |   |
+
+        And the ways
+            | nodes | junction   |
+            | ab    |            |
+            | bcdb  | roundabout |
+            | ce    |            |
+            | df    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                                         |
+            | a,e       | ab,ce,ce | depart,roundabout turn straight exit-1,arrive |
+            | a,f       | ab,df,df | depart,roundabout turn left 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  | roundabout |
+            | be    |            |
+            | cf    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                                         |
+            | a,e       | ad,be,be | depart,roundabout turn straight exit-1,arrive |
+            | a,f       | ad,cf,cf | depart,roundabout turn left exit-2,arrive     |
+
+       Scenario: Collinear in X,Y
+        Given the node map
+            | a |   |   |
+            | c |   |   |
+            | d | b | f |
+            | e |   |   |
+
+        And the ways
+            | nodes | junction   |
+            | ac    |            |
+            | bcdb  | roundabout |
+            | de    |            |
+            | bf    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                                         |
+            | a,e       | ac,de,de | depart,roundabout turn straight exit-1,arrive |
+            | a,f       | ac,bf,bf | depart,roundabout turn left exit-2,arrive     |
+
+    Scenario: Enter and Exit -- too complex
+        Given the node map
+            | j |   | a |   |   |
+            |   | i | b |   |   |
+            |   | g |   | c | d |
+            | h |   | e |   |   |
+            |   |   | f |   |   |
+
+       And the ways
+            | nodes  | junction   |
+            | ab     |            |
+            | ij     |            |
+            | cd     |            |
+            | ef     |            |
+            | gh     |            |
+            | bigecb | roundabout |
+
+       When I route I should get
+           | 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
+           |   |   | a |   |   |
+           |   |   | b |   |   |
+           |   | g |   | c | d |
+           |   |   | e |   |   |
+           | h |   | f |   |   |
+
+       And the ways
+            | nodes | junction   |
+            | ab    |            |
+            | cd    |            |
+            | ef    |            |
+            | gh    |            |
+            | bgecb | roundabout |
+
+       When I route I should get
+           | waypoints | route    | turns                           |
+           | a,d       | ab,cd,cd | depart,roundabout-exit-3,arrive |
+           | a,f       | ab,ef,ef | depart,roundabout-exit-2,arrive |
+           | a,h       | ab,gh,gh | depart,roundabout-exit-1,arrive |
+           | d,f       | cd,ef,ef | depart,roundabout-exit-3,arrive |
+           | d,h       | cd,gh,gh | depart,roundabout-exit-2,arrive |
+           | d,a       | cd,ab,ab | depart,roundabout-exit-1,arrive |
+           | f,h       | ef,gh,gh | depart,roundabout-exit-3,arrive |
+           | f,a       | ef,ab,ab | depart,roundabout-exit-2,arrive |
+           | f,d       | ef,cd,cd | depart,roundabout-exit-1,arrive |
+           | h,a       | gh,ab,ab | depart,roundabout-exit-3,arrive |
+           | h,d       | gh,cd,cd | depart,roundabout-exit-2,arrive |
+           | h,f       | gh,ef,ef | depart,roundabout-exit-1,arrive |
+
@@ -2,7 +2,7 @@
 Feature: Basic Roundabout

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

    Scenario: Enter and Exit
@@ -19,28 +19,28 @@ Feature: Basic Roundabout
            | cd     |            |
            | ef     |            |
            | gh     |            |
-            | bcegb  | roundabout |
+            | bgecb  | roundabout |

       When I route I should get
           | waypoints | route    | turns                           |
-           | a,d       | ab,cd,cd | depart,roundabout-exit-1,arrive |
+           | 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-3,arrive |
-           | d,f       | cd,ef,ef | depart,roundabout-exit-1,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-3,arrive |
-           | f,h       | ef,gh,gh | depart,roundabout-exit-1,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-3,arrive |
-           | h,a       | gh,ab,ab | depart,roundabout-exit-1,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-3,arrive |
+           | h,f       | gh,ef,ef | depart,roundabout-exit-1,arrive |

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

@@ -53,29 +53,25 @@ Feature: Basic Roundabout
            | bcegb  | roundabout |

       When I route I should get
-           | waypoints | route    | turns                          |
-           | a,b       | ab,ab    | depart,arrive                  |
-           | a,c       | ab,bcegb | depart,roundabout-enter,arrive |
-           | a,e       | ab,bcegb | depart,roundabout-enter,arrive |
-           | a,g       | ab,bcegb | depart,roundabout-enter,arrive |
-           | d,c       | cd,cd    | depart,arrive                  |
-           | d,e       | cd,bcegb | depart,roundabout-enter,arrive |
-           | d,g       | cd,bcegb | depart,roundabout-enter,arrive |
-           | d,b       | cd,bcegb | depart,roundabout-enter,arrive |
-           | f,e       | ef,ef    | depart,arrive                  |
-           | f,g       | ef,bcegb | depart,roundabout-enter,arrive |
-           | f,b       | ef,bcegb | depart,roundabout-enter,arrive |
-           | f,c       | ef,bcegb | depart,roundabout-enter,arrive |
-           | h,g       | gh,gh    | depart,arrive                  |
-           | h,b       | gh,bcegb | depart,roundabout-enter,arrive |
-           | h,c       | gh,bcegb | depart,roundabout-enter,arrive |
-           | h,e       | gh,bcegb | depart,roundabout-enter,arrive |
+           | 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
            |   |   | a |   |   |
            |   |   | b |   |   |
-            | h | g |   | c | d |
+            | d | c |   | g | h |
            |   |   | e |   |   |
            |   |   | f |   |   |

@@ -89,28 +85,25 @@ Feature: Basic Roundabout

       When I route I should get
           | waypoints | route       | turns                           |
-           | b,a       | ab,ab       | depart,arrive                   |
           | 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,d       | cd,cd       | depart,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,f       | ef,ef       | depart,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,h       | gh,gh       | depart,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 |   |   |
-            | h | g |   | c | d |
+            | d | c |   | g | h |
            |   |   | e |   |   |
            |   |   | f |   |   |

@@ -139,11 +132,11 @@ Feature: Basic Roundabout

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

        And the ways
           | nodes | junction   | oneway |
@@ -151,23 +144,196 @@ Feature: Basic Roundabout
           | def   |            | yes    |
           | ghi   |            | yes    |
           | jkl   |            | yes    |
-           | behkb | roundabout | yes    |
+           | bkheb | roundabout | yes    |

        When I route I should get
           | waypoints | route       | turns                           |
           | a,c       | abc,abc,abc | depart,roundabout-exit-1,arrive |
-           | a,f       | abc,def,def | depart,roundabout-exit-2,arrive |
+           | a,l       | abc,jkl,jkl | depart,roundabout-exit-2,arrive |
           | a,i       | abc,ghi,ghi | depart,roundabout-exit-3,arrive |
-           | a,l       | abc,jkl,jkl | depart,roundabout-exit-4,arrive |
+           | a,f       | abc,def,def | depart,roundabout-exit-4,arrive |
           | d,f       | def,def,def | depart,roundabout-exit-1,arrive |
-           | d,i       | def,ghi,ghi | depart,roundabout-exit-2,arrive |
+           | d,c       | def,abc,abc | depart,roundabout-exit-2,arrive |
           | d,l       | def,jkl,jkl | depart,roundabout-exit-3,arrive |
-           | d,c       | def,abc,abc | depart,roundabout-exit-4,arrive |
+           | d,i       | def,ghi,ghi | depart,roundabout-exit-4,arrive |
           | g,i       | ghi,ghi,ghi | depart,roundabout-exit-1,arrive |
-           | g,l       | ghi,jkl,jkl | depart,roundabout-exit-2,arrive |
+           | g,f       | ghi,def,def | depart,roundabout-exit-2,arrive |
           | g,c       | ghi,abc,abc | depart,roundabout-exit-3,arrive |
-           | g,f       | ghi,edf,edf | depart,roundabout-exit-4,arrive |
+           | g,l       | ghi,jkl,jkl | depart,roundabout-exit-4,arrive |
           | j,l       | jkl,jkl,jkl | depart,roundabout-exit-1,arrive |
-           | j,c       | jkl,abc,abc | depart,roundabout-exit-2,arrive |
+           | j,i       | jkl,ghi,ghi | depart,roundabout-exit-2,arrive |
           | j,f       | jkl,def,def | depart,roundabout-exit-3,arrive |
-           | j,i       | jkl,ghi,ghi | depart,roundabout-exit-4,arrive |
+           | j,c       | jkl,abc,abc | depart,roundabout-exit-4,arrive |
+
+    Scenario: Mixed Entry and Exit - segregated roads
+        Given the node map
+           |   |   | a |   | c |   |   |
+           |   |   |   |   |   |   |   |
+           | l |   |   | b |   |   | d |
+           |   |   | k |   | e |   |   |
+           | j |   |   | h |   |   | f |
+           |   |   |   |   |   |   |   |
+           |   |   | i |   | g |   |   |
+
+        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,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 - segregated roads, different names
+        Given the node map
+           |   |   | a |   | c |   |   |
+           |   |   |   |   |   |   |   |
+           | l |   |   | b |   |   | d |
+           |   |   | k |   | e |   |   |
+           | j |   |   | h |   |   | f |
+           |   |   |   |   |   |   |   |
+           |   |   | i |   | g |   |   |
+
+        And the ways
+           | nodes | junction   | oneway |
+           | ab    |            | yes    |
+           | bc    |            | yes    |
+           | de    |            | yes    |
+           | ef    |            | yes    |
+           | gh    |            | yes    |
+           | hi    |            | yes    |
+           | jk    |            | yes    |
+           | kl    |            | yes    |
+           | bkheb | roundabout | yes    |
+
+        When I route I should get
+           | 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: Collinear in X
+        Given the node map
+            | a | b | c | d | f |
+            |   |   | e |   |   |
+
+        And the ways
+            | nodes | junction   |
+            | ab    |            |
+            | bcdb  | roundabout |
+            | ce    |            |
+            | df    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                           |
+            | a,e       | ab,ce,ce | depart,roundabout-exit-1,arrive |
+            | a,f       | ab,df,df | depart,roundabout-exit-2,arrive |
+
+       Scenario: Collinear in Y
+        Given the node map
+            |   | a |
+            |   | b |
+            | e | c |
+            |   | d |
+            |   | f |
+
+        And the ways
+            | nodes | junction   |
+            | ab    |            |
+            | bcdb  | roundabout |
+            | ce    |            |
+            | df    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                           |
+            | a,e       | ab,ce,ce | depart,roundabout-exit-1,arrive |
+            | a,f       | ab,df,df | depart,roundabout-exit-2,arrive |
+
+       Scenario: Collinear in X,Y
+        Given the node map
+            | a |   |   |
+            | b |   |   |
+            | c | d | f |
+            | e |   |   |
+
+        And the ways
+            | nodes | junction   |
+            | ab    |            |
+            | bcdb  | roundabout |
+            | ce    |            |
+            | df    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                           |
+            | a,e       | ab,ce,ce | depart,roundabout-exit-1,arrive |
+            | a,f       | ab,df,df | depart,roundabout-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  | roundabout |
+            | be    |            |
+            | cf    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                           |
+            | a,e       | ad,be,be | depart,roundabout-exit-1,arrive |
+            | a,f       | ad,cf,cf | depart,roundabout-exit-2,arrive |
+
+       Scenario: Collinear in X,Y
+        Given the node map
+            | a |   |   |
+            | c |   |   |
+            | d | b | f |
+            | e |   |   |
+
+        And the ways
+            | nodes | junction   |
+            | ac    |            |
+            | bcdb  | roundabout |
+            | de    |            |
+            | bf    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                           |
+            | a,e       | ac,de,de | depart,roundabout-exit-1,arrive |
+            | a,f       | ac,bf,bf | depart,roundabout-exit-2,arrive |
+
@@ -0,0 +1,101 @@
+@routing  @guidance
+Feature: Suppress New Names on dedicated Suffices
+
+    Background:
+        Given the profile "car"
+        Given a grid size of 10 meters
+
+    Scenario: Suffix To Suffix
+        Given the node map
+            | a |   | b |   | c |
+
+        And the ways
+            | nodes  | name |
+            | ab     | 42 N |
+            | bc     | 42 S |
+
+       When I route I should get
+            | waypoints | route     | turns         |
+            | a,c       | 42 N,42 S | depart,arrive |
+
+    Scenario: Suffix To Suffix Ref
+        Given the node map
+            | a |   | b |   | c |
+
+        And the ways
+            | nodes  | name | ref |
+            | ab     | 42 N |     |
+            | bc     | 42 S | 101 |
+
+       When I route I should get
+            | waypoints | route           | turns         |
+            | a,c       | 42 N,42 S (101) | depart,arrive |
+
+    Scenario: Prefix Change
+        Given the node map
+            | a |   | b |   | c |
+
+        And the ways
+            | nodes  | name    |
+            | ab     | West 42 |
+            | bc     | East 42 |
+
+       When I route I should get
+            | waypoints | route           | turns         |
+            | a,c       | West 42,East 42 | depart,arrive |
+
+    Scenario: Prefix Change and Reference
+        Given the node map
+            | a |   | b |   | c |
+
+        And the ways
+            | nodes  | name    | ref |
+            | ab     | West 42 | 101 |
+            | bc     | East 42 |     |
+
+       When I route I should get
+            | waypoints | route                 | turns         |
+            | a,c       | West 42 (101),East 42 | depart,arrive |
+
+    Scenario: Suffix To Suffix - Turn
+        Given the node map
+            | a |   | b |   | c |
+            |   |   | d |   |   |
+
+        And the ways
+            | nodes  | name |
+            | ab     | 42 N |
+            | bc     | 42 S |
+            | bd     | 42 E |
+
+       When I route I should get
+            | waypoints | route          | turns                    |
+            | a,c       | 42 N,42 S      | depart,arrive            |
+            | a,d       | 42 N,42 E,42 E | depart,turn right,arrive |
+
+    Scenario: Suffix To No Suffix
+        Given the node map
+            | a |   | b |   | c |
+
+        And the ways
+            | nodes  | name |
+            | ab     | 42 N |
+            | bc     | 42   |
+
+       When I route I should get
+            | waypoints | route   | turns         |
+            | a,c       | 42 N,42 | depart,arrive |
+
+    Scenario: No Suffix To Suffix
+        Given the node map
+            | a |   | b |   | c |
+
+        And the ways
+            | nodes  | name |
+            | ab     | 42   |
+            | bc     | 42 S |
+
+       When I route I should get
+            | waypoints | route   | turns         |
+            | a,c       | 42,42 S | depart,arrive |
+
@@ -0,0 +1,66 @@
+@routing  @guidance
+Feature: Suppressed Turns
+
+    Background:
+        Given the profile "car"
+        Given a grid size of 10 meters
+
+    Scenario: Do not announce passing a exit ramp
+        Given the node map
+            | a | b | c | d | e |
+            |   |   |   | f | g |
+
+        And the ways
+            | nodes  | highway       |
+            | abcde  | motorway      |
+            | bfg    | motorway_link |
+
+       When I route I should get
+            | waypoints | route         | turns         |
+            | a,e       | abcde,abcde   | depart,arrive |
+
+    Scenario: Do not announce reference changes
+        Given the node map
+            | a | b | c | d | e | f |
+
+        And the ways
+            | nodes | highway  | name     | ref   |
+            | ab    | motorway | highway  | A1    |
+            | bc    | motorway | highway  | A1,A2 |
+            | cd    | motorway | highway  | A2    |
+            | de    | motorway | highway  |       |
+            | ef    | motorway | highway  | A1    |
+
+        When I route I should get
+            | waypoints | route                     | turns         |
+            | a,f       | highway (A1),highway (A1) | depart,arrive |
+
+
+    Scenario: Don't Announce Turn on following major road class -- service
+        Given the node map
+            | a | b | d |
+            |   |   | c |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | service |
+
+        When I route I should get
+            | waypoints | route   | turns         |
+            | a,c       | abc,abc | depart,arrive |
+
+    Scenario: Don't Announce Turn on following major road class -- residential
+        Given the node map
+            | a | b | d |
+            |   |   | c |
+
+        And the ways
+            | nodes | highway     |
+            | abc   | primary     |
+            | bd    | residential |
+
+        When I route I should get
+            | waypoints | route     | turns                       |
+            | a,c       | abc,abc   | depart,arrive               |
+            | a,d       | abc,bd,bd | depart,turn straight,arrive |
@@ -0,0 +1,808 @@
+@routing  @guidance
+Feature: Simple Turns
+
+    Background:
+        Given the profile "car"
+        Given a grid size of 10 meters
+
+    Scenario: Four Way Intersection
+        Given the node map
+            |   | c |   |
+            | a | b | e |
+            |   | d |   |
+
+        And the ways
+            | nodes  | highway |
+            | ab     | primary |
+            | cb     | primary |
+            | db     | primary |
+            | eb     | primary |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | a,c       | ab,cb,cb | depart,turn left,arrive         |
+            | a,e       | ab,eb,eb | depart,new name straight,arrive |
+            | a,d       | ab,db,db | depart,turn right,arrive        |
+            | c,a       | cb,ab,ab | depart,turn right,arrive        |
+            | c,d       | cb,db,db | depart,new name straight,arrive |
+            | c,e       | cb,eb,eb | depart,turn left,arrive         |
+            | d,a       | db,ab,ab | depart,turn left,arrive         |
+            | d,c       | db,cb,cb | depart,new name straight,arrive |
+            | d,e       | db,eb,eb | depart,turn right,arrive        |
+            | e,a       | eb,ab,ab | depart,new name straight,arrive |
+            | e,c       | eb,cb,cb | depart,turn right,arrive        |
+            | e,d       | eb,db,db | depart,turn left,arrive         |
+
+    Scenario: Rotated Four Way Intersection
+        Given the node map
+            | a |   | c |
+            |   | b |   |
+            | d |   | e |
+
+        And the ways
+            | nodes  | highway |
+            | ab     | primary |
+            | cb     | primary |
+            | db     | primary |
+            | eb     | primary |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | a,c       | ab,cb,cb | depart,turn left,arrive         |
+            | a,e       | ab,eb,eb | depart,new name straight,arrive |
+            | a,d       | ab,db,db | depart,turn right,arrive        |
+            | c,a       | cb,ab,ab | depart,turn right,arrive        |
+            | c,d       | cb,db,db | depart,new name straight,arrive |
+            | c,e       | cb,eb,eb | depart,turn left,arrive         |
+            | d,a       | db,ab,ab | depart,turn left,arrive         |
+            | d,c       | db,cb,cb | depart,new name straight,arrive |
+            | d,e       | db,eb,eb | depart,turn right,arrive        |
+            | e,a       | eb,ab,ab | depart,new name straight,arrive |
+            | e,c       | eb,cb,cb | depart,turn right,arrive        |
+            | e,d       | eb,db,db | depart,turn left,arrive         |
+
+
+    Scenario: Four Way Intersection Through Street
+        Given the node map
+            |   | c |   |
+            | a | b | e |
+            |   | d |   |
+
+        And the ways
+            | nodes  | highway |
+            | abe    | primary |
+            | cb     | primary |
+            | db     | primary |
+
+       When I route I should get
+            | waypoints | route      | turns                           |
+            | a,c       | abe,cb,cb  | depart,turn left,arrive         |
+            | a,e       | abe,abe    | depart,arrive                   |
+            | a,d       | abe,db,db  | depart,turn right,arrive        |
+            | c,a       | cb,abe,abe | depart,turn right,arrive        |
+            | c,d       | cb,db,db   | depart,new name straight,arrive |
+            | c,e       | cb,abe,abe | depart,turn left,arrive         |
+            | d,a       | db,abe,abe | depart,turn left,arrive         |
+            | d,c       | db,cb,cb   | depart,new name straight,arrive |
+            | d,e       | db,abe,abe | depart,turn right,arrive        |
+            | e,a       | abe,abe    | depart,arrive                   |
+            | e,c       | abe,cb,cb  | depart,turn right,arrive        |
+            | e,d       | abe,db,db  | depart,turn left,arrive         |
+
+    Scenario: Four Way Intersection Double Through Street
+        Given the node map
+            |   | c |   |
+            | a | b | e |
+            |   | d |   |
+
+        And the ways
+            | nodes  | highway |
+            | abe    | primary |
+            | cbd    | primary |
+
+       When I route I should get
+            | waypoints | route       | turns                    |
+            | a,c       | abe,cbd,cbd | depart,turn left,arrive  |
+            | a,e       | abe,abe     | depart,arrive            |
+            | a,d       | abe,cbd,cbd | depart,turn right,arrive |
+            | c,a       | cbd,abe,abe | depart,turn right,arrive |
+            | c,d       | cbd,cbd     | depart,arrive            |
+            | c,e       | cbd,abe,abe | depart,turn left,arrive  |
+            | d,a       | cbd,abe,abe | depart,turn left,arrive  |
+            | d,c       | cbd,cbd     | depart,arrive            |
+            | d,e       | cbd,abe,abe | depart,turn right,arrive |
+            | e,a       | abe,abe     | depart,arrive            |
+            | e,c       | abe,cbd,cbd | depart,turn right,arrive |
+            | e,d       | abe,cbd,cbd | depart,turn left,arrive  |
+
+    Scenario: Three Way Intersection
+        Given the node map
+            |   | c |   |
+            | a | b | d |
+
+        And the ways
+            | nodes  | highway |
+            | ab     | primary |
+            | cb     | primary |
+            | db     | primary |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | a,c       | ab,cb,cb | depart,turn left,arrive         |
+            | a,d       | ab,db,db | depart,new name straight,arrive |
+            | d,c       | db,cb,cb | depart,turn right,arrive        |
+            | d,a       | db,ab,ab | depart,new name straight,arrive |
+
+    Scenario: Three Way Intersection on Through Street
+        Given the node map
+            |   | d |   |
+            | a | b | c |
+
+        And the ways
+            | nodes  | highway |
+            | abc    | primary |
+            | db     | primary |
+
+       When I route I should get
+            | waypoints | route     | turns                    |
+            | a,c       | abc,abc   | depart,arrive            |
+            | a,d       | abc,db,db | depart,turn left,arrive  |
+            | c,a       | abc,abc   | depart,arrive            |
+            | c,d       | abc,db,db | depart,turn right,arrive |
+
+     Scenario: High Degree Intersection
+        Given the node map
+            | i |   | b |   | c |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            | h |   | a |   | d |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            | g |   | f |   | e |
+
+        And the ways
+            | nodes | highway |
+            | ab    | primary |
+            | ac    | primary |
+            | ad    | primary |
+            | ae    | primary |
+            | af    | primary |
+            | ag    | primary |
+            | ah    | primary |
+            | ai    | primary |
+
+        When I route I should get
+            | waypoints | route    | turns                           |
+            | b,c       | ab,ac,ac | depart,turn sharp left,arrive   |
+            | b,d       | ab,ad,ad | depart,turn left,arrive         |
+            | b,e       | ab,ae,ae | depart,turn slight left,arrive  |
+            | b,f       | ab,af,af | depart,new name straight,arrive |
+            | b,g       | ab,ag,ag | depart,turn slight right,arrive |
+            | b,h       | ab,ah,ah | depart,turn right,arrive        |
+            | b,i       | ab,ai,ai | depart,turn sharp right,arrive  |
+
+    Scenario: Disturbed High Degree Intersection
+        Given the node map
+            |   |   | b |   |   |
+            | i |   |   |   | c |
+            |   |   |   |   |   |
+            | h |   | a |   | d |
+            |   |   |   |   |   |
+            | g |   |   |   | e |
+            |   |   | f |   |   |
+
+        And the ways
+            | nodes | highway |
+            | ab    | primary |
+            | ac    | primary |
+            | ad    | primary |
+            | ae    | primary |
+            | af    | primary |
+            | ag    | primary |
+            | ah    | primary |
+            | ai    | primary |
+
+        When I route I should get
+            | waypoints | route    | turns                           |
+            | b,c       | ab,ac,ac | depart,turn sharp left,arrive   |
+            | b,d       | ab,ad,ad | depart,turn left,arrive         |
+            | b,e       | ab,ae,ae | depart,turn slight left,arrive  |
+            | b,f       | ab,af,af | depart,new name straight,arrive |
+            | b,g       | ab,ag,ag | depart,turn slight right,arrive |
+            | b,h       | ab,ah,ah | depart,turn right,arrive        |
+            | b,i       | ab,ai,ai | depart,turn sharp right,arrive  |
+
+    Scenario: Turn instructions at high latitude
+        Given the node locations
+            | node | lat       | lon      |
+            | a    | 55.68740  | 12.52430 |
+            | b    | 55.68745  | 12.52409 |
+            | c    | 55.68711  | 12.52383 |
+            | d    | 55.68745  | 12.52450 |
+            | e    | 55.68755  | 12.52450 |
+            | x    | -55.68740 | 12.52430 |
+            | y    | -55.68745 | 12.52409 |
+            | z    | -55.68711 | 12.52383 |
+            | v    | -55.68745 | 12.52450 |
+            | w    | -55.68755 | 12.52450 |
+
+        And the ways
+            | nodes |
+            | ab    |
+            | bc    |
+            | bd    |
+            | be    |
+            | xy    |
+            | yz    |
+            | vy    |
+            | wy    |
+
+        When I route I should get
+            | from | to | route    | turns                    |
+            | a    | c  | ab,bc,bc | depart,turn left,arrive  |
+            | c    | a  | bc,ab,ab | depart,turn right,arrive |
+            | x    | z  | xy,yz,yz | depart,turn right,arrive |
+            | z    | x  | yz,xy,xy | depart,turn left,arrive  |
+
+    Scenario: Four Way Intersection Double Through Street Segregated
+        Given the node map
+            |   | b |   | c |   |
+            | i |   |   |   | d |
+            |   |   | a |   |   |
+            | h |   |   |   | e |
+            |   | g |   | f |   |
+
+        And the ways
+            | nodes  | highway | oneway | name   |
+            | ha     | primary | yes    | first  |
+            | ai     | primary | yes    | first  |
+            | ae     | primary | yes    | first  |
+            | da     | primary | yes    | first  |
+            | ba     | primary | yes    | second |
+            | ac     | primary | yes    | second |
+            | fa     | primary | yes    | second |
+            | ag     | primary | yes    | second |
+
+       When I route I should get
+            | waypoints | route                | turns                        |
+            | f,e       | second,first,first   | depart,turn right,arrive     |
+            | f,c       | second,second        | depart,arrive                |
+            | f,i       | second,first,first   | depart,turn left,arrive      |
+            | f,g       | second,second,second | depart,continue uturn,arrive |
+            | d,c       | first,second,second  | depart,turn right,arrive     |
+            | d,i       | first,first          | depart,arrive                |
+            | d,g       | first,second,second  | depart,turn left,arrive      |
+            | d,e       | first,first,first    | depart,continue uturn,arrive |
+            | b,i       | second,first,first   | depart,turn right,arrive     |
+            | b,g       | second,second        | depart,arrive                |
+            | b,e       | second,first,first   | depart,turn left,arrive      |
+            | b,c       | second,second,second | depart,continue uturn,arrive |
+            | h,g       | first,second,second  | depart,turn right,arrive     |
+            | h,e       | first,first          | depart,arrive                |
+            | h,c       | first,second,second  | depart,turn left,arrive      |
+            | h,i       | first,first,first    | depart,continue uturn,arrive |
+
+    Scenario: Three Way Similar Sharp Turns
+        Given the node map
+            | a |   |   |   | b |
+            | c |   |   |   |   |
+            |   | d |   |   |   |
+
+        And the ways
+            | nodes | highway |
+            | ab    | primary |
+            | bc    | primary |
+            | bd    | primary |
+
+        When I route I should get
+            | waypoints | route    | turns                          |
+            | a,c       | ab,bc,bc | depart,turn sharp right,arrive |
+            | a,d       | ab,bd,bd | depart,turn sharp right,arrive |
+            | d,c       | bd,bc,bc | depart,turn sharp left,arrive  |
+            | d,a       | bd,ab,ab | depart,turn sharp left,arrive  |
+
+    Scenario: Left Turn Assignment (1)
+        Given the node map
+            |   |   |   |   | d |
+            | a |   | b |   | c |
+            |   |   | e |   |   |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                          |
+            | a,d       | abc,bd,bd | depart,turn slight left,arrive |
+
+    Scenario: Left Turn Assignment (2)
+        Given the node map
+            |   |   |   |   | d |
+            |   |   |   |   |   |
+            | a |   | b |   | c |
+            |   |   | e |   |   |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                   |
+            | a,d       | abc,bd,bd | depart,turn left,arrive |
+
+    Scenario: Left Turn Assignment (3)
+        Given the node map
+            |   |   |   | d |   |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            | a |   | b |   | c |
+            |   |   | e |   |   |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                   |
+            | a,d       | abc,bd,bd | depart,turn left,arrive |
+
+    Scenario: Left Turn Assignment (4)
+        Given the node map
+            |   |   | d |   |   |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            | a |   | b |   | c |
+            |   |   | e |   |   |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                   |
+            | a,d       | abc,bd,bd | depart,turn left,arrive |
+
+    Scenario: Left Turn Assignment (5)
+        Given the node map
+            |   | d |   |   |   |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            | a |   | b |   | c |
+            |   |   | e |   |   |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                   |
+            | a,d       | abc,bd,bd | depart,turn left,arrive |
+
+    Scenario: Left Turn Assignment (6)
+        Given the node map
+            | d |   |   |   |   |
+            |   |   |   |   |   |
+            | a |   | b |   | c |
+            |   |   | e |   |   |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                         |
+            | a,d       | abc,bd,bd | depart,turn sharp left,arrive |
+
+    Scenario: Left Turn Assignment (7)
+        Given the node map
+            | d |   |   |   |   |
+            | a |   | b |   | c |
+            |   |   | e |   |   |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                         |
+            | a,d       | abc,bd,bd | depart,turn sharp left,arrive |
+
+    Scenario: Right Turn Assignment (1)
+        Given the node map
+            |   |   | e |   |   |
+            | a |   | b |   | c |
+            |   |   |   |   | d |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                           |
+            | a,d       | abc,bd,bd | depart,turn slight right,arrive |
+
+    Scenario: Right Turn Assignment (2)
+        Given the node map
+            |   |   | e |   |   |
+            | a |   | b |   | c |
+            |   |   |   |   |   |
+            |   |   |   |   | d |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                    |
+            | a,d       | abc,bd,bd | depart,turn right,arrive |
+
+    Scenario: Right Turn Assignment (3)
+        Given the node map
+            |   |   | e |   |   |
+            | a |   | b |   | c |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            |   |   |   | d |   |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                    |
+            | a,d       | abc,bd,bd | depart,turn right,arrive |
+
+    Scenario: Right Turn Assignment (4)
+        Given the node map
+            |   |   | e |   |   |
+            | a |   | b |   | c |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            |   |   | d |   |   |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                    |
+            | a,d       | abc,bd,bd | depart,turn right,arrive |
+
+    Scenario: Right Turn Assignment (5)
+        Given the node map
+            |   |   | e |   |   |
+            | a |   | b |   | c |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            |   | d |   |   |   |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                    |
+            | a,d       | abc,bd,bd | depart,turn right,arrive |
+
+    Scenario: Right Turn Assignment (6)
+        Given the node map
+            |   |   | e |   |   |
+            | a |   | b |   | c |
+            |   |   |   |   |   |
+            | d |   |   |   |   |
+
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                          |
+            | a,d       | abc,bd,bd | depart,turn sharp right,arrive |
+
+    Scenario: Right Turn Assignment (7)
+        Given the node map
+            |   |   | e |   |   |
+            | a |   | b |   | c |
+            | d |   |   |   |   |
+
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                          |
+            | a,d       | abc,bd,bd | depart,turn sharp right,arrive |
+
+   Scenario: Right Turn Assignment Two Turns
+        Given the node map
+            |   |   | f |   |   |
+            | a |   | b |   | c |
+            |   |   |   |   |   |
+            | d | e |   |   |   |
+
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+            | bf    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                          |
+            | a,d       | abc,bd,bd | depart,turn sharp right,arrive |
+            | a,e       | abc,be,be | depart,turn right,arrive       |
+
+   Scenario: Right Turn Assignment Two Turns (2)
+        Given the node map
+            |   |   | f |   | c |
+            | a |   | b |   |   |
+            |   |   |   |   | e |
+            |   |   |   | d |   |
+
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+            | bf    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                           |
+            | a,d       | abc,bd,bd | depart,turn right,arrive        |
+            | a,e       | abc,be,be | depart,turn slight right,arrive |
+
+   Scenario: Right Turn Assignment Two Turns (3)
+        Given the node map
+            |   |   | f |   |   |
+            | a |   | b |   | c |
+            |   |   |   |   | e |
+            |   |   |   | d |   |
+
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+            | bf    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                           |
+            | a,d       | abc,bd,bd | depart,turn right,arrive        |
+            | a,e       | abc,be,be | depart,turn slight right,arrive |
+
+   Scenario: Right Turn Assignment Two Turns (4)
+        Given the node map
+            |   |   | f |   |   |
+            | a |   | b |   | c |
+            |   |   |   |   |   |
+            |   |   | d |   | e |
+
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+            | bf    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                           |
+            | a,d       | abc,bd,bd | depart,turn right,arrive        |
+            | a,e       | abc,be,be | depart,turn slight right,arrive |
+
+   Scenario: Right Turn Assignment Three Turns
+        Given the node map
+            |   |   | g |   |   |
+            | a |   | b |   | c |
+            |   | d |   | f |   |
+            |   |   | e |   |   |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+            | bf    | primary |
+            | bg    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                           |
+            | a,d       | abc,bd,bd | depart,turn sharp right,arrive  |
+            | a,e       | abc,be,be | depart,turn right,arrive        |
+            | a,f       | abc,bf,bf | depart,turn slight right,arrive |
+
+    Scenario: Slight Turn involving Oneways
+        Given the node map
+            |   |   | a |   |   |
+            |   |   |   |   |   |
+            |   |   | b |   | e |
+            | d |   |   |   |   |
+            |   |   | c |   |   |
+
+        And the ways
+            | nodes | highway | oneway |
+            | abc   | primary | yes    |
+            | dbe   | primary | no     |
+
+        When I route I should get
+            | waypoints | route   | turns         |
+            | a,c       | abc,abc | depart,arrive |
+            | d,e       | dbe,dbe | depart,arrive |
+            | e,d       | dbe,dbe | depart,arrive |
+
+    Scenario: Slight Turn involving Oneways
+        Given the node map
+            |   |   |   | a |   |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            |   |   | b |   | e |
+            | d |   |   |   |   |
+            |   |   | c |   |   |
+
+        And the ways
+            | nodes | highway | oneway |
+            | abc   | primary | yes    |
+            | dbe   | primary | no     |
+
+        When I route I should get
+            | waypoints | route   | turns         |
+            | a,c       | abc,abc | depart,arrive |
+            | d,e       | dbe,dbe | depart,arrive |
+            | e,d       | dbe,dbe | depart,arrive |
+
+
+    Scenario: Slight Turn involving Oneways - Name Change
+        Given the node map
+            |   |   | a |   |   |
+            |   |   |   |   |   |
+            |   |   | b |   | e |
+            | d |   |   |   |   |
+            |   |   | c |   |   |
+
+        And the ways
+            | nodes | highway | oneway |
+            | abc   | primary | yes    |
+            | db    | primary | no     |
+            | be    | primary | no     |
+
+        When I route I should get
+            | waypoints | route    | turns                               |
+            | a,c       | abc,abc  | depart,arrive                       |
+            | d,e       | db,be,be | depart,new name slight right,arrive |
+            | e,d       | be,db,db | depart,new name slight left,arrive  |
+
+     Scenario: Right Turn Assignment Three Conflicting Turns with invalid - 1
+        Given the node map
+            |   |   | g |   |   |
+            | a |   | b |   | c |
+            |   |   |   |   |   |
+            |   | d | e | f |   |
+
+        And the ways
+            | nodes | highway | oneway |
+            | abc   | primary | no     |
+            | db    | primary | yes    |
+            | eb    | primary | no     |
+            | fb    | primary | no     |
+            | bg    | primary | no     |
+
+        When I route I should get
+            | waypoints | route     | turns                           |
+            | a,e       | abc,eb,eb | depart,turn right,arrive        |
+            | a,f       | abc,fb,fb | depart,turn slight right,arrive |
+
+     Scenario: Right Turn Assignment Three Conflicting Turns with invalid - 2
+        Given the node map
+            |   |   | g |   |   |
+            | a |   | b |   | c |
+            |   |   |   |   |   |
+            |   | d | e | f |   |
+
+        And the ways
+            | nodes | highway | oneway |
+            | abc   | primary | no     |
+            | db    | primary | no     |
+            | eb    | primary | yes    |
+            | fb    | primary | no     |
+            | bg    | primary | no     |
+
+        When I route I should get
+            | waypoints | route     | turns                          |
+            | a,d       | abc,db,db | depart,turn sharp right,arrive |
+            | a,f       | abc,fb,fb | depart,turn right,arrive       |
+
+    Scenario: Right Turn Assignment Three Conflicting Turns with invalid - 3
+        Given the node map
+            |   |   | g |   |   |
+            | a |   | b |   | c |
+            |   |   |   |   |   |
+            |   | d | e | f |   |
+
+        And the ways
+            | nodes | highway | oneway |
+            | abc   | primary | no     |
+            | db    | primary | no     |
+            | be    | primary | no     |
+            | fb    | primary | yes    |
+            | bg    | primary | no     |
+
+        When I route I should get
+            | waypoints | route     | turns                          |
+            | a,d       | abc,db,db | depart,turn sharp right,arrive |
+            | a,e       | abc,be,be | depart,turn right,arrive       |
+
+    Scenario: Conflicting Turns with well distinguished turn
+        Given the node map
+            | a |   |   | b |   |   | c |
+            |   |   |   |   |   |   |   |
+            | f |   |   |   |   |   | d |
+            |   |   |   |   |   |   | e |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+            | bf    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                           |
+            | a,d       | abc,bd,bd | depart,turn slight right,arrive |
+            | a,e       | abc,be,be | depart,turn right,arrive        |
+            | a,f       | abc,bf,bf | depart,turn sharp right,arrive  |
+
+    Scenario: Conflicting Turns with well distinguished turn (back)
+        Given the node map
+            | a |   |   | b |   |   | c |
+            |   |   |   |   |   |   |   |
+            | d |   |   |   |   |   | f |
+            |   | e |   |   |   |   |   |
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+            | bd    | primary |
+            | be    | primary |
+            | bf    | primary |
+
+        When I route I should get
+            | waypoints | route     | turns                           |
+            | a,d       | abc,bd,bd | depart,turn sharp right,arrive  |
+            | a,e       | abc,be,be | depart,turn right,arrive        |
+            | a,f       | abc,bf,bf | depart,turn slight right,arrive |
+
@@ -10,13 +10,11 @@ module.exports = function () {
    });

    this.Given(/^the extract extra arguments "(.*?)"$/, (args, callback) => {
-        this.setExtractArgs(args);
-        callback();
+        this.setExtractArgs(args, callback);
    });

    this.Given(/^the contract extra arguments "(.*?)"$/, (args, callback) => {
-        this.setContractArgs(args);
-        callback();
+        this.setContractArgs(args, callback);
    });

    this.Given(/^a grid size of (\d+) meters$/, (meters, callback) => {
@@ -49,18 +47,27 @@ module.exports = function () {

        var addNode = (name, ri, ci, cb) => {
            if (name) {
-                if (name.length !== 1) throw new Error(util.format('*** node invalid name %s, must be single characters', name));
-                if (!name.match(/[a-z0-9]/)) throw new Error(util.format('*** invalid node name %s, must me alphanumeric', name));
-
-                var lonLat;
-                if (name.match(/[a-z]/)) {
-                    if (this.nameNodeHash[name]) throw new Error(util.format('*** duplicate node %s', name));
+                var nodeWithID = name.match(/([a-z])\:([0-9]*)/);
+                if (nodeWithID) {
+                    var nodeName = nodeWithID[1],
+                        nodeID = nodeWithID[2];
+                    if (this.nameNodeHash[nodeName]) throw new Error(util.format('*** duplicate node %s', name));
                    lonLat = this.tableCoordToLonLat(ci, ri);
-                    this.addOSMNode(name, lonLat[0], lonLat[1], null);
+                    this.addOSMNode(nodeName, lonLat[0], lonLat[1], nodeID);
                } else {
-                    if (this.locationHash[name]) throw new Error(util.format('*** duplicate node %s'), name);
-                    lonLat = this.tableCoordToLonLat(ci, ri);
-                    this.addLocation(name, lonLat[0], lonLat[1], null);
+                    if (name.length !== 1) throw new Error(util.format('*** node invalid name %s, must be single characters', name));
+                    if (!name.match(/[a-z0-9]/)) throw new Error(util.format('*** invalid node name %s, must me alphanumeric', name));
+
+                    var lonLat;
+                    if (name.match(/[a-z]/)) {
+                        if (this.nameNodeHash[name]) throw new Error(util.format('*** duplicate node %s', name));
+                        lonLat = this.tableCoordToLonLat(ci, ri);
+                        this.addOSMNode(name, lonLat[0], lonLat[1], null);
+                    } else {
+                        if (this.locationHash[name]) throw new Error(util.format('*** duplicate node %s'), name);
+                        lonLat = this.tableCoordToLonLat(ci, ri);
+                        this.addLocation(name, lonLat[0], lonLat[1], null);
+                    }
                }

                cb();
@@ -228,6 +235,10 @@ module.exports = function () {
        fs.writeFile(path.resolve(this.TEST_FOLDER, 'speeds.csv'), data, callback);
    });

+    this.Given(/^the turn penalty file$/, (data, callback) => {
+        fs.writeFile(path.resolve(this.TEST_FOLDER, 'penalties.csv'), data, callback);
+    });
+
    this.Given(/^the data has been saved to disk$/, (callback) => {
        try {
            this.reprocess(callback);
@@ -1,7 +1,7 @@
 var assert = require('assert');

 module.exports = function () {
-    this.When(/^I run "osrm\-routed\s?(.*?)"$/, { timeout: this.SHUTDOWN_TIMEOUT }, (options, callback) => {
+    this.When(/^I run "osrm\-routed\s?(.*?)"$/, { timeout: this.TIMEOUT }, (options, callback) => {
        this.runBin('osrm-routed', options, () => {
            callback();
        });
@@ -44,12 +44,9 @@ module.exports = function () {

    this.Then(/^response should be a well-formed route$/, () => {
        this.ShouldBeWellFormed();
-        assert.equal(typeof this.json.status_message, 'string');
-        assert.equal(typeof this.json.route_summary, 'object');
-        assert.equal(typeof this.json.route_geometry, 'string');
-        assert.ok(Array.isArray(this.json.route_instructions));
-        assert.ok(Array.isArray(this.json.via_points));
-        assert.ok(Array.isArray(this.json.via_indices));
+        assert.equal(this.json.code, 'ok');
+        assert.ok(Array.isArray(this.json.routes));
+        assert.ok(Array.isArray(this.json.waypoints));
    });

    this.Then(/^"([^"]*)" should return code (\d+)$/, (binary, code) => {
@@ -71,6 +71,7 @@ module.exports = function () {
                r.status = res.statusCode === 200 ? 'x' : null;
                if (r.status) {
                    r.route = this.wayList(r.json.routes[0]);
+                    r.summary = r.json.routes[0].legs.map(l => l.summary).join(',');

                    if (r.route.split(',')[0] === util.format('w%d', i)) {
                        r.time = r.json.routes[0].duration;
@@ -3,8 +3,7 @@ var d3 = require('d3-queue');
 module.exports = function () {
    this.When(/^I route I should get$/, this.WhenIRouteIShouldGet);

-    // This is used to route 100 times; timeout for entire step is therefore set to 100 * STRESS_TIMEOUT
-    this.When(/^I route (\d+) times I should get$/, { timeout: 30000 }, (n, table, callback) => {
+    this.When(/^I route (\d+) times I should get$/, { timeout: 100 * this.TIMEOUT }, (n, table, callback) => {
        var q = d3.queue(1);

        for (var i=0; i<n; i++) {
@@ -110,6 +110,7 @@ module.exports = function () {
                } else {
                    var params = this.queryParams,
                        waypoints = [];
+                    params['steps'] = 'true';
                    if (row.from && row.to) {
                        var fromNode = this.findNodeByName(row.from);
                        if (!fromNode) throw new Error(util.format('*** unknown from-node "%s"', row.from));
@@ -19,8 +19,6 @@ module.exports = function () {

        this.osmData = new classes.osmData(this);

-        this.STRESS_TIMEOUT = 300;
-
        this.OSRMLoader = this._OSRMLoader();

        this.PREPROCESS_LOG_FILE = path.resolve(this.TEST_FOLDER, 'preprocessing.log');
@@ -105,11 +103,16 @@ module.exports = function () {
        } else cb();
    };

-    this.setExtractArgs = (args) => {
+    this.setExtractArgs = (args, callback) => {
        this.extractArgs = args;
+        this.forceExtract = true;
+        this.forceContract = true;
+        callback();
    };

-    this.setContractArgs = (args) => {
+    this.setContractArgs = (args, callback) => {
        this.contractArgs = args;
+        this.forceContract = true;
+        callback();
    };
 };
@@ -295,9 +295,10 @@ module.exports = function () {
        this.writeAndExtract((e) => {
            if (e) return callback(e);
            this.isContracted((isContracted) => {
-                var contractFn = isContracted ? noop : this.contractData;
+                var contractFn = (isContracted && !this.forceContract) ? noop : this.contractData;
                if (isContracted) this.log('Already contracted ' + this.osmData.contractedFile, 'preprocess');
                contractFn((e) => {
+                    this.forceContract = false;
                    if (e) return callback(e);
                    this.logPreprocessDone();
                    callback();
@@ -311,9 +312,10 @@ module.exports = function () {
            this.writeInputData((e) => {
                if (e) return callback(e);
                this.isExtracted((isExtracted) => {
-                    var extractFn = isExtracted ? noop : this.extractData;
+                    var extractFn = (isExtracted && !this.forceExtract) ? noop : this.extractData;
                    if (isExtracted) this.log('Already extracted ' + this.osmData.extractedFile, 'preprocess');
                    extractFn((e) => {
+                        this.forceExtract = false;
                        callback(e);
                    });
                });
@@ -6,9 +6,9 @@ var d3 = require('d3-queue');

 module.exports = function () {
    this.initializeEnv = (callback) => {
-        this.DEFAULT_PORT = 5000;
-        this.DEFAULT_TIMEOUT = 2000;
-        this.setDefaultTimeout(this.DEFAULT_TIMEOUT);
+        this.OSRM_PORT = process.env.OSRM_PORT && parseInt(process.env.OSRM_PORT) || 5000;
+        this.TIMEOUT = process.env.CUCUMBER_TIMEOUT && parseInt(process.env.CUCUMBER_TIMEOUT) || 3000;
+        this.setDefaultTimeout(this.TIMEOUT);
        this.ROOT_FOLDER = process.cwd();
        this.OSM_USER = 'osrm';
        this.OSM_GENERATOR = 'osrm-test';
@@ -24,8 +24,6 @@ module.exports = function () {
        this.BIN_PATH = path.resolve(this.ROOT_FOLDER, 'build');
        this.DEFAULT_INPUT_FORMAT = 'osm';
        this.DEFAULT_ORIGIN = [1,1];
-        this.LAUNCH_TIMEOUT = 1000;
-        this.SHUTDOWN_TIMEOUT = 10000;
        this.DEFAULT_LOAD_METHOD = 'datastore';
        this.OSRM_ROUTED_LOG_FILE = path.resolve(this.TEST_FOLDER, 'osrm-routed.log');
        this.ERROR_LOG_FILE = path.resolve(this.TEST_FOLDER, 'error.log');
@@ -50,26 +48,6 @@ module.exports = function () {
        console.info(util.format('Node Version', process.version));
        if (parseInt(process.version.match(/v(\d)/)[1]) < 4) throw new Error('*** PLease upgrade to Node 4.+ to run OSRM cucumber tests');

-        if (process.env.OSRM_PORT) {
-            this.OSRM_PORT = parseInt(process.env.OSRM_PORT);
-            // eslint-disable-next-line no-console
-            console.info(util.format('Port set to %d', this.OSRM_PORT));
-        } else {
-            this.OSRM_PORT = this.DEFAULT_PORT;
-            // eslint-disable-next-line no-console
-            console.info(util.format('Using default port %d', this.OSRM_PORT));
-        }
-
-        if (process.env.OSRM_TIMEOUT) {
-            this.OSRM_TIMEOUT = parseInt(process.env.OSRM_TIMEOUT);
-            // eslint-disable-next-line no-console
-            console.info(util.format('Timeout set to %d', this.OSRM_TIMEOUT));
-        } else {
-            this.OSRM_TIMEOUT = this.DEFAULT_TIMEOUT;
-            // eslint-disable-next-line no-console
-            console.info(util.format('Using default timeout %d', this.OSRM_TIMEOUT));
-        }
-
        fs.exists(this.TEST_FOLDER, (exists) => {
            if (!exists) throw new Error(util.format('*** Test folder %s doesn\'t exist.', this.TEST_FOLDER));
            callback();
@@ -24,10 +24,12 @@ module.exports = function () {
    });

    this.After((scenario, callback) => {
-        this.setExtractArgs('');
-        this.setContractArgs('');
-        if (this.loadMethod === 'directly' && !!this.OSRMLoader.loader) this.OSRMLoader.shutdown(callback);
-        else callback();
+        this.setExtractArgs('', () => {
+            this.setContractArgs('', () => {
+                if (this.loadMethod === 'directly' && !!this.OSRMLoader.loader) this.OSRMLoader.shutdown(callback);
+                else callback();
+            });
+        });
    });

    this.Around('@stress', (scenario, callback) => {
@@ -20,7 +20,7 @@ module.exports = function () {
    };

    this.sendRequest = (baseUri, parameters, callback) => {
-        var limit = Timeout(this.OSRM_TIMEOUT, { err: { statusCode: 408 } });
+        var limit = Timeout(this.TIMEOUT, { err: { statusCode: 408 } });

        var runRequest = (cb) => {
            var params = this.paramsToString(parameters);
@@ -12,7 +12,7 @@ var OSRMBaseLoader = class {
    }

    launch (callback) {
-        var limit = Timeout(this.scope.LAUNCH_TIMEOUT, { err: this.scope.RoutedError('Launching osrm-routed timed out.') });
+        var limit = Timeout(this.scope.TIMEOUT, { err: this.scope.RoutedError('Launching osrm-routed timed out.') });

        var runLaunch = (cb) => {
            this.osrmUp(() => {
@@ -24,7 +24,7 @@ var OSRMBaseLoader = class {
    }

    shutdown (callback) {
-        var limit = Timeout(this.scope.SHUTDOWN_TIMEOUT, { err: this.scope.RoutedError('Shutting down osrm-routed timed out.')});
+        var limit = Timeout(this.scope.TIMEOUT, { err: this.scope.RoutedError('Shutting down osrm-routed timed out.')});

        var runShutdown = (cb) => {
            this.osrmDown(cb);
@@ -15,7 +15,7 @@ module.exports = function () {

    this.requestUrl = (path, callback) => {
        var uri = this.query = [this.HOST, path].join('/'),
-            limit = Timeout(this.OSRM_TIMEOUT, { err: { statusCode: 408 } });
+            limit = Timeout(this.TIMEOUT, { err: { statusCode: 408 } });

        function runRequest (cb) {
            request(uri, cb);
@@ -127,6 +127,12 @@ module.exports = function () {
        }
    };

+    this.summary = (instructions) => {
+        if (instructions) {
+            return instructions.legs.map(l => l.summary).join(',');
+        }
+    };
+
    this.wayList = (instructions) => {
        return this.extractInstructionList(instructions, s => s.name);
    };
@@ -142,11 +148,21 @@ module.exports = function () {
                case 'depart':
                case 'arrive':
                    return v.maneuver.type;
+                case 'on ramp':
+                case 'off ramp':
+                    return v.maneuver.type + ' ' + v.maneuver.modifier;
                case 'roundabout':
                    return 'roundabout-exit-' + v.maneuver.exit;
+                case 'rotary':
+                    if( 'rotary_name' in v )
+                        return v.rotary_name + '-exit-' + v.maneuver.exit;
+                    else
+                        return 'rotary-exit-' + v.maneuver.exit;
+                case 'roundabout turn':
+                    return v.maneuver.type + ' ' + v.maneuver.modifier + ' exit-' + v.maneuver.exit;
                // FIXME this is a little bit over-simplistic for merge/fork instructions
                default:
-                    return v.maneuver.modifier;
+                    return v.maneuver.type + ' ' + v.maneuver.modifier;
                }
            })
            .join(',');
@@ -31,11 +31,11 @@ module.exports = function () {
                var afterRequest = (err, res, body) => {
                    if (err) return cb(err);
                    if (body && body.length) {
-                        var instructions, bearings, turns, modes, times, distances;
+                        var instructions, bearings, turns, modes, times, distances, summary;

                        var json = JSON.parse(body);

-                        var hasRoute = json.code === 'ok';
+                        var hasRoute = json.code === 'Ok';

                        if (hasRoute) {
                            instructions = this.wayList(json.routes[0]);
@@ -44,6 +44,7 @@ module.exports = function () {
                            modes = this.modeList(json.routes[0]);
                            times = this.timeList(json.routes[0]);
                            distances = this.distanceList(json.routes[0]);
+                            summary = this.summary(json.routes[0]);
                        }

                        if (headers.has('status')) {
@@ -59,14 +60,6 @@ module.exports = function () {
                            got['#'] = row['#'];
                        }

-                        if (headers.has('start')) {
-                            got.start = instructions ? json.route_summary.start_point : null;
-                        }
-
-                        if (headers.has('end')) {
-                            got.end = instructions ? json.route_summary.end_point : null;
-                        }
-
                        if (headers.has('geometry')) {
                            got.geometry = json.routes[0].geometry;
                        }
@@ -74,6 +67,10 @@ module.exports = function () {
                        if (headers.has('route')) {
                            got.route = (instructions || '').trim();

+                            if (headers.has('summary')) {
+                                got.summary = (summary || '').trim();
+                            }
+
                            if (headers.has('alternative')) {
                                // TODO examine more than first alternative?
                                got.alternative ='';
@@ -1,10 +1,10 @@
-@routing @uturn @via @testbot
+@routing @continue_straight @via @testbot
 Feature: U-turns at via points

    Background:
        Given the profile "testbot"

-    Scenario: U-turns at via points disabled by default
+    Scenario: Continue straight at waypoints enabled by default
        Given the node map
            | a | b | c | d |
            |   | e | f | g |
@@ -20,16 +20,16 @@ Feature: U-turns at via points
            | fg    |

        When I route I should get
-            | waypoints | route                   | turns                                                |
-            | a,e,c     | ab,be,be,ef,fg,dg,cd,cd | depart,right,arrive,depart,straight,left,left,arrive |
+            | waypoints | route                   |
+            | a,e,c     | ab,be,be,ef,fg,dg,cd,cd |

-    Scenario: Query param to allow U-turns at all via points
+    Scenario: Query parameter to disallow changing direction at all waypoints
        Given the node map
            | a | b | c | d |
            |   | e | f | g |

        And the query options
-            | uturns | true |
+            | continue_straight | false |

        And the ways
            | nodes |
@@ -45,14 +45,13 @@ Feature: U-turns at via points
            | waypoints | route             |
            | a,e,c     | ab,be,be,be,bc,bc |

-    @todo
-    Scenario: Instructions at via points at u-turns
+    Scenario: Instructions at waypoints at u-turns
        Given the node map
            | a | b | c | d |
            |   | e | f | g |

        And the query options
-            | uturns | true |
+            | continue_straight | false |

        And the ways
            | nodes |
@@ -65,8 +64,8 @@ Feature: U-turns at via points
            | fg    |

        When I route I should get
-            | waypoints | route          | turns                           |
-            | a,e,c     | ab,be,be,bc,bc | depart,right,uturn,right,arrive |
+            | waypoints | route             |
+            | a,e,c     | ab,be,be,be,bc,bc |

    Scenario: u-turn mixed with non-uturn vias
        Given the node map
@@ -75,19 +74,19 @@ Feature: U-turns at via points
            |   |   | e |   | f |   | g |

        And the query options
-            | uturns | true |
+            | continue_straight | false |

        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | cd    |
-            | be    |
-            | dg    |
-            | ef    |
-            | fg    |
+            | nodes | oneway |
+            | ab    | no     |
+            | bc    | no     |
+            | cd    | no     |
+            | be    | yes    |
+            | dg    | no     |
+            | ef    | no     |
+            | fg    | no     |

        When I route I should get
-            | waypoints | route                                        |
-            | 1,2,3,4,5 | ab,be,be,be,bc,bc,bc,be,ef,fg,dg,dg,dg,cd,cd |
+            | waypoints | route                                           |
+            | 1,2,3,4,5 | ab,be,be,be,ef,fg,dg,cd,bc,bc,bc,cd,dg,dg,dg,cd,cd |

@@ -36,5 +36,5 @@ Feature: Basic Routing
            | fy     | last  |

        When I route I should get
-            | from | to | route                 | turns                    |
-            | x    | y  | first,compr,last,last | depart,right,left,arrive |
+            | from | to | route                 |
+            | x    | y  | first,compr,last,last |
@@ -85,3 +85,22 @@ Feature: Basic Map Matching
            | trace | matchings |
            | dcba  | hgfe      |

+    Scenario: Testbot - Matching with oneway streets
+        Given a grid size of 10 meters
+        Given the node map
+            | a | b | c | d |
+            | e | f | g | h |
+
+        And the ways
+            | nodes | oneway |
+            | ab    | yes    |
+            | bc    | yes    |
+            | cd    | yes    |
+            | hg    | yes    |
+            | gf    | yes    |
+            | fe    | yes    |
+
+        When I match I should get
+            | trace | matchings |
+            | dcba  | hg,gf,fe  |
+            | efgh  | ab,bc,cd  |
@@ -12,7 +12,6 @@ Feature: Testbot - Travel mode
    Background:
       Given the profile "testbot"

-    @mokob @2166
    Scenario: Testbot - Always announce mode change
        Given the node map
            | a | b | c | d |
@@ -28,7 +27,6 @@ Feature: Testbot - Travel mode
            | a    | d  | foo,foo,foo,foo | driving,river downstream,driving,driving |
            | b    | d  | foo,foo,foo     | river downstream,driving,driving         |

-    @mokob @2166
    Scenario: Testbot - Compressed Modes
        Given the node map
            | a | b | c | d | e | f | g |
@@ -44,7 +42,6 @@ Feature: Testbot - Travel mode
            | a    | g  | road,liquid,solid,solid  | driving,river downstream,driving,driving |
            | c    | g  | liquid,solid,solid       | river downstream,driving,driving         |

-    @mokob @2166
    Scenario: Testbot - Modes in each direction, different forward/backward speeds
        Given the node map
            |   | 0 | 1 |   |
@@ -79,7 +76,7 @@ Feature: Testbot - Travel mode
            | 0    | 1  | ab,ab | steps down,steps down | 60s +-1 |
            | 1    | 0  | ab,ab | steps up,steps up     | 60s +-1 |

-    @oneway @mokob @2166
+    @oneway
    Scenario: Testbot - Modes for oneway, different forward/backward speeds
        Given the node map
            | a | b |
@@ -107,7 +104,7 @@ Feature: Testbot - Travel mode
            | a    | b  | ab,ab | steps down,steps down |
            | b    | a  |       |                       |

-    @oneway @mokob @2166
+    @oneway
    Scenario: Testbot - Modes for reverse oneway, different forward/backward speeds
        Given the node map
            | a | b |
@@ -135,7 +132,7 @@ Feature: Testbot - Travel mode
            | a    | b  |       |                   |
            | b    | a  | ab,ab | steps up,steps up |

-    @via @mokob @2166
+    @via
    Scenario: Testbot - Mode should be set at via points
        Given the node map
            | a | 1 | b |
@@ -149,7 +146,6 @@ Feature: Testbot - Travel mode
            | a,1,b     | ab,ab,ab,ab | river downstream,river downstream,river downstream,river downstream |
            | b,1,a     | ab,ab,ab,ab | river upstream,river upstream,river upstream,river upstream         |

-    @mokob @2166
    Scenario: Testbot - Starting at a tricky node
       Given the node map
            |  | a |  |   |   |
@@ -164,7 +160,6 @@ Feature: Testbot - Travel mode
            | from | to | route | modes                         |
            | b    | a  | ab,ab | river upstream,river upstream |

-    @mokob @2166
    Scenario: Testbot - Mode changes on straight way without name change
       Given the node map
            | a | 1 | b | 2 | c |
@@ -204,7 +199,6 @@ Feature: Testbot - Travel mode
            | b    | d  | bc,cd,cd          | route,driving,driving                         |
            | a    | f  | ab,bc,cd,de,ef,ef | driving,route,driving,driving,driving,driving |

-    @mokob @2166
    Scenario: Testbot - Modes, triangle map
        Given the node map
            |   |   |   |   |   |   | d |
@@ -239,7 +233,6 @@ Feature: Testbot - Travel mode
            | a    | d  | abc,cd,cd        | driving,driving,driving                        |
            | d    | a  | de,ce,abc,abc    | driving,river upstream,driving,driving         |

-    @mokob @2166
    Scenario: Testbot - River in the middle
        Given the node map
            | a | b | c |   |   |
@@ -1,10 +1,9 @@
-@routing @testbot @overlap
+@routing @testbot @overlap @todo
 Feature: Testbot - overlapping ways
- 
+
    Background:
        Given the profile "testbot"

-    @bug @610
    Scenario: Testbot - multiple way between same nodes 
    Note that cb is connecting the same two nodes as bc
        Given the node map
@@ -18,11 +17,10 @@ Feature: Testbot - overlapping ways
            | cb    | secondary |

        When I route I should get
-            | from | to | route    |
-            | a    | d  | ab,bc,cd |
-            | d    | a  | cd,bc,ab |
-    
-    @bug @610
+            | from | to | route       |
+            | a    | d  | ab,bc,cd,cd |
+            | d    | a  | cd,bc,ab,ab |
+
    Scenario: Testbot - area on top of way
        Given the node map
            | x | a | b | y |
@@ -34,6 +32,6 @@ Feature: Testbot - overlapping ways
            | abcda | secondary | yes  |

        When I route I should get
-            | from | to | route |
-            | x    | y  | xaby  |
-            | y    | x  | xaby  |
+            | from | to | route      |
+            | x    | y  | xaby,xaby  |
+            | y    | x  | xaby,xaby  |
@@ -1,76 +0,0 @@
-@routing @testbot @roundabout @instruction
-Feature: Roundabout Instructions
-
-    Background:
-        Given the profile "testbot"
-
-    Scenario: Testbot - Roundabout
-        Given the node map
-            |   |   | v |   |   |
-            |   |   | d |   |   |
-            | s | a |   | c | u |
-            |   |   | b |   |   |
-            |   |   | t |   |   |
-
-        And the ways
-            | nodes | junction   |
-            | sa    |            |
-            | tb    |            |
-            | uc    |            |
-            | vd    |            |
-            | abcda | roundabout |
-
-        When I route I should get
-            | from | to | route    | turns                            |
-            | s    | t  | sa,tb,tb | depart,roundabout-exit-1,arrive |
-            | s    | u  | sa,uc,uc | depart,roundabout-exit-2,arrive |
-            | s    | v  | sa,vd,vd | depart,roundabout-exit-3,arrive |
-            | t    | u  | tb,uc,uc | depart,roundabout-exit-1,arrive |
-            | t    | v  | tb,vd,vd | depart,roundabout-exit-2,arrive |
-            | t    | s  | tb,sa,sa | depart,roundabout-exit-3,arrive |
-            | u    | v  | uc,vd,vd | depart,roundabout-exit-1,arrive |
-            | u    | s  | uc,sa,sa | depart,roundabout-exit-2,arrive |
-            | u    | t  | uc,tb,tb | depart,roundabout-exit-3,arrive |
-            | v    | s  | vd,sa,sa | depart,roundabout-exit-1,arrive |
-            | v    | t  | vd,tb,tb | depart,roundabout-exit-2,arrive |
-            | v    | u  | vd,uc,uc | depart,roundabout-exit-3,arrive |
-
-    Scenario: Testbot - Roundabout with oneway links
-        Given the node map
-            |   |   | p | o |   |   |
-            |   |   | h | g |   |   |
-            | i | a |   |   | f | n |
-            | j | b |   |   | e | m |
-            |   |   | c | d |   |   |
-            |   |   | k | l |   |   |
-
-        And the ways
-            | nodes     | junction   | oneway |
-            | ai        |            | yes    |
-            | jb        |            | yes    |
-            | ck        |            | yes    |
-            | ld        |            | yes    |
-            | em        |            | yes    |
-            | nf        |            | yes    |
-            | go        |            | yes    |
-            | ph        |            | yes    |
-            | abcdefgha | roundabout |        |
-
-        When I route I should get
-            | from | to | route    | turns                            |
-            | j    | k  | jb,ck,ck | depart,roundabout-exit-1,arrive |
-            | j    | m  | jb,em,em | depart,roundabout-exit-2,arrive |
-            | j    | o  | jb,go,go | depart,roundabout-exit-3,arrive |
-            | j    | i  | jb,ai,ai | depart,roundabout-exit-4,arrive |
-            | l    | m  | ld,em,em | depart,roundabout-exit-1,arrive |
-            | l    | o  | ld,go,go | depart,roundabout-exit-2,arrive |
-            | l    | i  | ld,ai,ai | depart,roundabout-exit-3,arrive |
-            | l    | k  | ld,ck,ck | depart,roundabout-exit-4,arrive |
-            | n    | o  | nf,go,go | depart,roundabout-exit-1,arrive |
-            | n    | i  | nf,ai,ai | depart,roundabout-exit-2,arrive |
-            | n    | k  | nf,ck,ck | depart,roundabout-exit-3,arrive |
-            | n    | m  | nf,em,em | depart,roundabout-exit-4,arrive |
-            | p    | i  | ph,ai,ai | depart,roundabout-exit-1,arrive |
-            | p    | k  | ph,ck,ck | depart,roundabout-exit-2,arrive |
-            | p    | m  | ph,em,em | depart,roundabout-exit-3,arrive |
-            | p    | o  | ph,go,go | depart,roundabout-exit-4,arrive |
@@ -46,22 +46,22 @@ Feature: Status messages
            | ab    |

        When I route I should get
-            | request                     | status | message                                         |
-            | route/v1/driving/1,1;1,2    | 200    |                                                 |
-            | nonsense                    | 400    | URL string malformed close to position 0: "/no" |
-            | nonsense/v1/driving/1,1;1,2 | 400    | Service nonsense not found!                     |
-            |                             | 400    | URL string malformed close to position 0: "/"   |
-            | /                           | 400    | URL string malformed close to position 0: "//"  |
-            | ?                           | 400    | URL string malformed close to position 0: "/?"  |
-            | route/v1/driving            | 400    | URL string malformed close to position 0: "/ro" |
-            | route/v1/driving/           | 400    | URL string malformed close to position 0: "/ro" |
-            | route/v1/driving/1          | 400    | Query string malformed close to position 0      |
-            | route/v1/driving/1,1        | 400    | Number of coordinates needs to be at least two. |
-            | route/v1/driving/1,1,1      | 400    | Query string malformed close to position 3      |
-            | route/v1/driving/x          | 400    | Query string malformed close to position 0      |
-            | route/v1/driving/x,y        | 400    | Query string malformed close to position 0      |
-            | route/v1/driving/1,1;       | 400    | Query string malformed close to position 3      |
-            | route/v1/driving/1,1;1      | 400    | Query string malformed close to position 3      |
-            | route/v1/driving/1,1;1,1,1  | 400    | Query string malformed close to position 7      |
-            | route/v1/driving/1,1;x      | 400    | Query string malformed close to position 3      |
-            | route/v1/driving/1,1;x,y    | 400    | Query string malformed close to position 3      |
+            | request                     | status | message                                           |
+            | route/v1/driving/1,1;1,2    | 200    |                                                   |
+            | nonsense                    | 400    | URL string malformed close to position 9: "nse"   |
+            | nonsense/v1/driving/1,1;1,2 | 400    | Service nonsense not found!                       |
+            |                             | 400    | URL string malformed close to position 1: "/"     |
+            | /                           | 400    | URL string malformed close to position 1: "//"    |
+            | ?                           | 400    | URL string malformed close to position 1: "/?"    |
+            | route/v1/driving            | 400    | URL string malformed close to position 17: "ing"  |
+            | route/v1/driving/           | 400    | URL string malformed close to position 18: "ng/"  |
+            | route/v1/driving/1          | 400    | Query string malformed close to position 19       |
+            | route/v1/driving/1,1        | 400    | Number of coordinates needs to be at least two.   |
+            | route/v1/driving/1,1,1      | 400    | Query string malformed close to position 21       |
+            | route/v1/driving/x          | 400    | Query string malformed close to position 18       |
+            | route/v1/driving/x,y        | 400    | Query string malformed close to position 18       |
+            | route/v1/driving/1,1;       | 400    | Query string malformed close to position 21       |
+            | route/v1/driving/1,1;1      | 400    | Query string malformed close to position 23       |
+            | route/v1/driving/1,1;1,1,1  | 400    | Query string malformed close to position 25       |
+            | route/v1/driving/1,1;x      | 400    | Query string malformed close to position 21       |
+            | route/v1/driving/1,1;x,y    | 400    | Query string malformed close to position 21       |
@@ -0,0 +1,77 @@
+@routing @basic @testbot
+Feature: Basic Routing
+
+    Background:
+        Given the profile "testbot"
+
+    @smallest
+    Scenario: Checking 
+        Given the node map
+            | a | b |  | c | d | e |
+
+        And the ways
+            | nodes |
+            | ab    |
+            | bc    |
+            | cd    |
+            | de    |
+
+        When I route I should get
+            | from | to | route          | summary  |
+            | a    | e  | ab,bc,cd,de,de | ab, bc   |
+            | e    | a  | de,cd,bc,ab,ab | de, bc   |
+            | a    | b  | ab,ab          | ab       |
+            | b    | d  | bc,cd,cd       | bc, cd   |
+
+    @smallest
+    Scenario: Check handling empty values
+        Given the node map
+            | a | b |  | c |   | d | f |
+            |   |   |  |   |   | e |
+
+        And the ways
+            | nodes | name |
+            | ab    | ab   |
+            | bc    | bc   |
+            | cd    |      |
+            | de    | de   |
+            | df    | df   |
+
+        When I route I should get
+            | from | to | route          | summary  |
+            | e    | a  | de,,bc,ab,ab   | de, bc   |
+
+    @smallest @todo
+    Scenario: Summaries when routing on a simple network
+        Given the node map
+            | a | b |
+
+        And the ways
+            | nodes |
+            | ab    |
+
+        When I route I should get
+            | from | to | route | summary  |
+            | a    | b  | ab,ab | ab       |
+            | b    | a  | ab,ab | ab       |
+
+    @repeated
+    Scenario: Check handling empty values
+        Given the node map
+            | f |   |   | x |   |   |
+            | b | c | d | e | 1 | g |
+            | a |   |   | y |   |   |
+
+        And the ways
+            | nodes | name   | # |
+            | ab    | first  |   |
+            | bc    | first  |   |
+            | cd    | first  |   |
+            | deg   | second |   |
+            | bf    | third  |   |
+            | xey   | cross  |we need this because phantom node segments are not considered for the summary |
+
+        When I route I should get
+            | from | to | route                     | summary       |
+            | a    | 1  | first,first,second,second | first, second |
+
@@ -0,0 +1,37 @@
+@routing @speed @traffic
+Feature: Traffic - turn penalties applied to turn onto which a phantom node snaps
+
+    Background: Simple map with phantom nodes
+        Given the node map
+            |     | 1   |     | 2   |     | 3   |     |
+            | a:1 |     | b:2 |     | c:3 |     | d:4 |
+            |     |     |     |     |     |     |     |
+            |     |     | e:5 |     | f:6 |     | g:7 |
+        And the ways
+            | nodes | highway |
+            | ab    | primary |
+            | bc    | primary |
+            | cd    | primary |
+
+            | be    | primary |
+            | cf    | primary |
+            | dg    | primary |
+        And the profile "testbot"
+        # Since testbot doesn't have turn penalties, a penalty from file of 0 should produce a neutral effect
+        And the extract extra arguments "--generate-edge-lookup"
+
+    Scenario: Weighting based on turn penalty file, with an extreme negative value -- clamps and does not fail
+        Given the turn penalty file
+            """
+            1,2,5,0
+            3,4,7,-20
+            """
+        And the contract extra arguments "--turn-penalty-file penalties.csv"
+        When I route I should get
+            | from | to | route    | speed   | time    |
+            | a    | e  | ab,be,be | 36 km/h | 40s +-1 |
+            | 1    | e  | ab,be,be | 36 km/h | 30s +-1 |
+            | b    | f  | bc,cf,cf | 36 km/h | 40s +-1 |
+            | 2    | f  | bc,cf,cf | 36 km/h | 30s +-1 |
+            | c    | g  | cd,dg,dg | 71 km/h | 20s +-1 |
+            | 3    | g  | cd,dg,dg | 54 km/h | 20s +-1 |
@@ -1,74 +0,0 @@
-@routing @testbot @via
-Feature: Via points
-
-    Background:
-        Given the profile "testbot"
-
-        And a grid size of 4 meters
-
-    Scenario: Basic Right Turn
-        Given the node map
-            | a | b | c | d | e | f | g |
-            |   |   |   |   |   | h |   |
-            |   |   |   |   |   | i |   |
-            |   |   |   |   |   | j |   |
-            |   |   |   |   |   | k |   |
-
-        And the ways
-            | nodes   | oneway |
-            | abcdefg | yes    |
-            | ehijk   | yes    |
-
-        When I route I should get
-            | from | to | route               | distance  | turns               |
-            | a    | k  | abcdefg,ehijk,ehijk |  34m +-1  | depart,right,arrive |
-
-    Scenario: Slight Turn
-        Given the node map
-            | a | b | c | d | e | f | g |   |
-            |   |   |   |   |   | h | i |   |
-            |   |   |   |   |   |   |   | j |
-            |   |   |   |   |   |   |   | k |
-
-        And the ways
-            | nodes   | oneway |
-            | abcdefg | yes    |
-            | ehijk   | yes    |
-
-        When I route I should get
-            | from | to | route               | distance  | turns                      |
-            | a    | k  | abcdefg,ehijk,ehijk |  35m +-1  | depart,slight right,arrive |
-
-    Scenario: Nearly Slight Turn
-        Given the node map
-            | a | b | c | d | e | f | g |   |
-            |   |   |   |   |   | h |   |   |
-            |   |   |   |   |   |   | i |   |
-            |   |   |   |   |   |   |   | j |
-            |   |   |   |   |   |   |   | k |
-
-        And the ways
-            | nodes   | oneway |
-            | abcdefg | yes    |
-            | ehijk   | yes    |
-
-        When I route I should get
-            | from | to | route               | distance  | turns                      |
-            | a    | k  | abcdefg,ehijk,ehijk |  37m +-1  | depart,right,arrive        |
-
-    Scenario: Nearly Slight Turn (Variation)
-        Given the node map
-            | a | b | c | d | e | f | g |   |
-            |   |   |   |   |   | h |   |   |
-            |   |   |   |   |   |   | i |   |
-            |   |   |   |   |   |   | j |   |
-            |   |   |   |   |   |   |   | k |
-
-        And the ways
-            | nodes   | oneway |
-            | abcdefg | yes    |
-            | ehijk   | yes    |
-
-        When I route I should get
-            | from | to | route               | distance  | turns                      |
-            | a    | k  | abcdefg,ehijk,ehijk |  37m +-1  | depart,right,arrive        |
@@ -1,115 +0,0 @@
-@routing @turns @testbot
-Feature: Turn directions/codes
-
-    Background:
-        Given the profile "testbot"
-
-    Scenario: Turn directions
-        Given the node map
-            | o | p | a | b | c |
-            | n |   |   |   | d |
-            | m |   | x |   | e |
-            | l |   |   |   | f |
-            | k | j | i | h | g |
-
-        And the ways
-            | nodes |
-            | xi    |
-            | xk    |
-            | xm    |
-            | xo    |
-            | xa    |
-            | xc    |
-            | xe    |
-            | xg    |
-
-        When I route I should get
-            | from | to | route    | turns                      |
-            | i    | k  | xi,xk,xk | depart,sharp left,arrive   |
-            | i    | m  | xi,xm,xm | depart,left,arrive         |
-            | i    | o  | xi,xo,xo | depart,slight left,arrive  |
-            | i    | a  | xi,xa,xa | depart,straight,arrive     |
-            | i    | c  | xi,xc,xc | depart,slight right,arrive |
-            | i    | e  | xi,xe,xe | depart,right,arrive        |
-            | i    | g  | xi,xg,xg | depart,sharp right,arrive  |
-
-            | k | m | xk,xm,xm | depart,sharp left,arrive   |
-            | k | o | xk,xo,xo | depart,left,arrive         |
-            | k | a | xk,xa,xa | depart,slight left,arrive  |
-            | k | c | xk,xc,xc | depart,straight,arrive     |
-            | k | e | xk,xe,xe | depart,slight right,arrive |
-            | k | g | xk,xg,xg | depart,right,arrive        |
-            | k | i | xk,xi,xi | depart,sharp right,arrive  |
-
-            | m | o | xm,xo,xo | depart,sharp left,arrive   |
-            | m | a | xm,xa,xa | depart,left,arrive         |
-            | m | c | xm,xc,xc | depart,slight left,arrive  |
-            | m | e | xm,xe,xe | depart,straight,arrive     |
-            | m | g | xm,xg,xg | depart,slight right,arrive |
-            | m | i | xm,xi,xi | depart,right,arrive        |
-            | m | k | xm,xk,xk | depart,sharp right,arrive  |
-
-            | o | a | xo,xa,xa | depart,sharp left,arrive   |
-            | o | c | xo,xc,xc | depart,left,arrive         |
-            | o | e | xo,xe,xe | depart,slight left,arrive  |
-            | o | g | xo,xg,xg | depart,straight,arrive     |
-            | o | i | xo,xi,xi | depart,slight right,arrive |
-            | o | k | xo,xk,xk | depart,right,arrive        |
-            | o | m | xo,xm,xm | depart,sharp right,arrive  |
-
-            | a | c | xa,xc,xc | depart,sharp left,arrive   |
-            | a | e | xa,xe,xe | depart,left,arrive         |
-            | a | g | xa,xg,xg | depart,slight left,arrive  |
-            | a | i | xa,xi,xi | depart,straight,arrive     |
-            | a | k | xa,xk,xk | depart,slight right,arrive |
-            | a | m | xa,xm,xm | depart,right,arrive        |
-            | a | o | xa,xo,xo | depart,sharp right,arrive  |
-
-            | c | e | xc,xe,xe | depart,sharp left,arrive   |
-            | c | g | xc,xg,xg | depart,left,arrive         |
-            | c | i | xc,xi,xi | depart,slight left,arrive  |
-            | c | k | xc,xk,xk | depart,straight,arrive     |
-            | c | m | xc,xm,xm | depart,slight right,arrive |
-            | c | o | xc,xo,xo | depart,right,arrive        |
-            | c | a | xc,xa,xa | depart,sharp right,arrive  |
-
-            | e | g | xe,xg,xg | depart,sharp left,arrive   |
-            | e | i | xe,xi,xi | depart,left,arrive         |
-            | e | k | xe,xk,xk | depart,slight left,arrive  |
-            | e | m | xe,xm,xm | depart,straight,arrive     |
-            | e | o | xe,xo,xo | depart,slight right,arrive |
-            | e | a | xe,xa,xa | depart,right,arrive        |
-            | e | c | xe,xc,xc | depart,sharp right,arrive  |
-
-            | g | i | xg,xi,xi | depart,sharp left,arrive   |
-            | g | k | xg,xk,xk | depart,left,arrive         |
-            | g | m | xg,xm,xm | depart,slight left,arrive  |
-            | g | o | xg,xo,xo | depart,straight,arrive     |
-            | g | a | xg,xa,xa | depart,slight right,arrive |
-            | g | c | xg,xc,xc | depart,right,arrive        |
-            | g | e | xg,xe,xe | depart,sharp right,arrive  |
-
-    Scenario: Turn instructions at high latitude
-    # https://github.com/DennisOSRM/Project-OSRM/issues/532
-        Given the node locations
-            | node | lat       | lon      |
-            | a    | 55.68740  | 12.52430 |
-            | b    | 55.68745  | 12.52409 |
-            | c    | 55.68711  | 12.52383 |
-            | x    | -55.68740 | 12.52430 |
-            | y    | -55.68745 | 12.52409 |
-            | z    | -55.68711 | 12.52383 |
-
-        And the ways
-            | nodes |
-            | ab    |
-            | bc    |
-            | xy    |
-            | yz    |
-
-        When I route I should get
-            | from | to | route    | turns               |
-            | a    | c  | ab,bc,bc | depart,left,arrive  |
-            | c    | a  | bc,ab,ab | depart,right,arrive |
-            | x    | z  | xy,yz,yz | depart,right,arrive |
-            | z    | x  | yz,xy,xy | depart,left,arrive  |
@@ -46,7 +46,6 @@ Feature: Via points
            | a,d,c     | abc,bd,bd,bd,abc,abc |
            | c,d,a     | abc,bd,bd,bd,abc,abc |

-    @mokob
    Scenario: Multiple via points
        Given the node map
            | a |   |   |   | e | f | g |   |
@@ -149,6 +148,47 @@ Feature: Via points
            | a,d,c     | abc,bd,bd,bd,abc,abc |
            | c,d,a     | abc,bd,bd,bd,abc,abc |

+    # See issue #2349
+    Scenario: Via point at a dead end with oneway
+        Given the node map
+            | a | b | c |
+            |   | d |   |
+            |   | e |   |
+
+        And the ways
+            | nodes | oneway |
+            | abc   |  no    |
+            | bd    |  no    |
+            | ed    |  yes   |
+
+        When I route I should get
+            | waypoints | route                |
+            | a,d,c     | abc,bd,bd,bd,abc,abc |
+            | c,d,a     | abc,bd,bd,bd,abc,abc |
+
+    # See issue #2349
+    @bug
+    Scenario: Via point at a dead end with oneway
+        Given the node map
+            | a | b | c |
+            |   | d |   |
+            |   | e | g |
+            |   | f |   |
+
+        And the ways
+            | nodes | oneway |
+            | abc   |  no    |
+            | bd    |  no    |
+            | ed    |  yes   |
+            | dg    |  yes   |
+            | ef    |  no    |
+            | fg    |  yes   |
+
+        When I route I should get
+            | waypoints | route                |
+            | a,d,c     | abc,bd,bd,bd,abc,abc |
+            | c,d,a     | abc,bd,bd,bd,abc,abc |
+
    # See issue #1896
    Scenario: Via point at a dead end with barrier
        Given the profile "car"
@@ -84,6 +84,7 @@ class Contractor
                          const std::string &edge_segment_lookup_path,
                          const std::string &edge_penalty_path,
                          const std::vector<std::string> &segment_speed_path,
+                          const std::vector<std::string> &turn_penalty_path,
                          const std::string &nodes_filename,
                          const std::string &geometry_filename,
                          const std::string &datasource_names_filename,
@@ -81,6 +81,7 @@ struct ContractorConfig
    double core_factor;

    std::vector<std::string> segment_speed_lookup_paths;
+    std::vector<std::string> turn_penalty_lookup_paths;
    std::string datasource_indexes_path;
    std::string datasource_names_path;
 };
@@ -17,9 +17,9 @@ namespace contractor
 class IteratorbasedCRC32
 {
  public:
-    bool using_hardware() const { return use_hardware_implementation; }
+    bool UsingHardware() const { return use_hardware_implementation; }

-    IteratorbasedCRC32() : crc(0) { use_hardware_implementation = detect_hardware_support(); }
+    IteratorbasedCRC32() : crc(0) { use_hardware_implementation = DetectHardwareSupport(); }

    template <class Iterator> unsigned operator()(Iterator iter, const Iterator end)
    {
@@ -31,11 +31,11 @@ class IteratorbasedCRC32

            if (use_hardware_implementation)
            {
-                crc = compute_in_hardware(data, sizeof(value_type));
+                crc = ComputeInHardware(data, sizeof(value_type));
            }
            else
            {
-                crc = compute_in_software(data, sizeof(value_type));
+                crc = ComputeInSoftware(data, sizeof(value_type));
            }
            ++iter;
        }
@@ -43,7 +43,7 @@ class IteratorbasedCRC32
    }

  private:
-    bool detect_hardware_support() const
+    bool DetectHardwareSupport() const
    {
        static const int sse42_bit = 0x00100000;
        const unsigned ecx = cpuid();
@@ -51,14 +51,14 @@ class IteratorbasedCRC32
        return sse42_found;
    }

-    unsigned compute_in_software(const char *str, unsigned len)
+    unsigned ComputeInSoftware(const char *str, unsigned len)
    {
        crc_processor.process_bytes(str, len);
        return crc_processor.checksum();
    }

    // adapted from http://byteworm.com/2010/10/13/crc32/
-    unsigned compute_in_hardware(const char *str, unsigned len)
+    unsigned ComputeInHardware(const char *str, unsigned len)
    {
 #if defined(__x86_64__)
        unsigned q = len / sizeof(unsigned);
@@ -114,7 +114,7 @@ struct RangebasedCRC32
        return crc32(std::begin(iterable), std::end(iterable));
    }

-    bool using_hardware() const { return crc32.using_hardware(); }
+    bool UsingHardware() const { return crc32.UsingHardware(); }

  private:
    IteratorbasedCRC32 crc32;
@@ -115,7 +115,7 @@ class GraphContractor
    {
        explicit ThreadDataContainer(int number_of_nodes) : number_of_nodes(number_of_nodes) {}

-        inline ContractorThreadData *getThreadData()
+        inline ContractorThreadData *GetThreadData()
        {
            bool exists = false;
            auto &ref = data.local(exists);
@@ -302,7 +302,7 @@ class GraphContractor
                              [this, &node_priorities, &node_depth,
                               &thread_data_list](const tbb::blocked_range<int> &range)
                              {
-                                  ContractorThreadData *data = thread_data_list.getThreadData();
+                                  ContractorThreadData *data = thread_data_list.GetThreadData();
                                  for (int x = range.begin(), end = range.end(); x != end; ++x)
                                  {
                                      node_priorities[x] =
@@ -342,7 +342,7 @@ class GraphContractor
                // remaining graph
                std::vector<NodeID> new_node_id_from_orig_id_map(number_of_nodes, SPECIAL_NODEID);

-                for (const auto new_node_id : util::irange<std::size_t>(0, remaining_nodes.size()))
+                for (const auto new_node_id : util::irange<std::size_t>(0UL, remaining_nodes.size()))
                {
                    auto &node = remaining_nodes[new_node_id];
                    BOOST_ASSERT(node_priorities.size() > node.id);
@@ -352,7 +352,7 @@ class GraphContractor
                }

                // build forward and backward renumbering map and remap ids in remaining_nodes
-                for (const auto new_node_id : util::irange<std::size_t>(0, remaining_nodes.size()))
+                for (const auto new_node_id : util::irange<std::size_t>(0UL, remaining_nodes.size()))
                {
                    auto &node = remaining_nodes[new_node_id];
                    // create renumbering maps in both directions
@@ -362,7 +362,7 @@ class GraphContractor
                }
                // walk over all nodes
                for (const auto source :
-                     util::irange<NodeID>(0, contractor_graph->GetNumberOfNodes()))
+                     util::irange<NodeID>(0UL, contractor_graph->GetNumberOfNodes()))
                {
                    for (auto current_edge : contractor_graph->GetAdjacentEdgeRange(source))
                    {
@@ -424,7 +424,7 @@ class GraphContractor
                [this, &node_priorities, &remaining_nodes,
                 &thread_data_list](const tbb::blocked_range<std::size_t> &range)
                {
-                    ContractorThreadData *data = thread_data_list.getThreadData();
+                    ContractorThreadData *data = thread_data_list.GetThreadData();
                    // determine independent node set
                    for (auto i = range.begin(), end = range.end(); i != end; ++i)
                    {
@@ -481,7 +481,7 @@ class GraphContractor
                              [this, &remaining_nodes,
                               &thread_data_list](const tbb::blocked_range<std::size_t> &range)
                              {
-                                  ContractorThreadData *data = thread_data_list.getThreadData();
+                                  ContractorThreadData *data = thread_data_list.GetThreadData();
                                  for (int position = range.begin(), end = range.end();
                                       position != end; ++position)
                                  {
@@ -495,7 +495,7 @@ class GraphContractor
                                        DeleteGrainSize),
                [this, &remaining_nodes, &thread_data_list](const tbb::blocked_range<int> &range)
                {
-                    ContractorThreadData *data = thread_data_list.getThreadData();
+                    ContractorThreadData *data = thread_data_list.GetThreadData();
                    for (int position = range.begin(), end = range.end(); position != end;
                         ++position)
                    {
@@ -547,7 +547,7 @@ class GraphContractor
                    [this, &node_priorities, &remaining_nodes, &node_depth,
                     &thread_data_list](const tbb::blocked_range<int> &range)
                    {
-                        ContractorThreadData *data = thread_data_list.getThreadData();
+                        ContractorThreadData *data = thread_data_list.GetThreadData();
                        for (int position = range.begin(), end = range.end(); position != end;
                             ++position)
                        {
@@ -561,7 +561,7 @@ class GraphContractor
            number_of_contracted_nodes += end_independent_nodes_idx - begin_independent_nodes_idx;
            remaining_nodes.resize(begin_independent_nodes_idx);

-            p.printStatus(number_of_contracted_nodes);
+            p.PrintStatus(number_of_contracted_nodes);
            ++current_level;
        }

@@ -627,7 +627,7 @@ class GraphContractor
            Edge new_edge;
            for (const auto node : util::irange(0u, number_of_nodes))
            {
-                p.printStatus(node);
+                p.PrintStatus(node);
                for (auto edge : contractor_graph->GetAdjacentEdgeRange(node))
                {
                    const NodeID target = contractor_graph->GetTarget(edge);
@@ -710,9 +710,9 @@ class GraphContractor

    inline void Dijkstra(const int max_distance,
                         const unsigned number_of_targets,
-                         const int maxNodes,
+                         const int max_nodes,
                         ContractorThreadData &data,
-                         const NodeID middleNode)
+                         const NodeID middle_node)
    {

        ContractorHeap &heap = data.heap;
@@ -723,7 +723,7 @@ class GraphContractor
        {
            const NodeID node = heap.DeleteMin();
            const auto distance = heap.GetKey(node);
-            if (++nodes > maxNodes)
+            if (++nodes > max_nodes)
            {
                return;
            }
@@ -742,7 +742,7 @@ class GraphContractor
                }
            }

-            RelaxNode(node, middleNode, distance, heap);
+            RelaxNode(node, middle_node, distance, heap);
        }
    }

@@ -1032,7 +1032,7 @@ class GraphContractor
            }
            // tie breaking
            if (std::abs(priority - target_priority) < std::numeric_limits<float>::epsilon() &&
-                bias(node, target))
+                Bias(node, target))
            {
                return false;
            }
@@ -1061,7 +1061,7 @@ class GraphContractor
                }
                // tie breaking
                if (std::abs(priority - target_priority) < std::numeric_limits<float>::epsilon() &&
-                    bias(node, target))
+                    Bias(node, target))
                {
                    return false;
                }
@@ -1071,7 +1071,7 @@ class GraphContractor
    }

    // This bias function takes up 22 assembly instructions in total on X86
-    inline bool bias(const NodeID a, const NodeID b) const
+    inline bool Bias(const NodeID a, const NodeID b) const
    {
        const unsigned short hasha = fast_hash(a);
        const unsigned short hashb = fast_hash(b);
@@ -14,8 +14,9 @@

 #include <boost/optional.hpp>

-#include <string>
 #include <algorithm>
+#include <iterator>
+#include <string>
 #include <vector>

 namespace osrm
@@ -47,13 +48,25 @@ template <typename ForwardIter> util::json::String makePolyline(ForwardIter begi
 }

 template <typename ForwardIter>
-util::json::Object makeGeoJSONLineString(ForwardIter begin, ForwardIter end)
+util::json::Object makeGeoJSONGeometry(ForwardIter begin, ForwardIter end)
 {
+    auto num_coordinates = std::distance(begin, end);
+    BOOST_ASSERT(num_coordinates != 0);
    util::json::Object geojson;
-    geojson.values["type"] = "LineString";
-    util::json::Array coordinates;
-    std::transform(begin, end, std::back_inserter(coordinates.values), &detail::coordinateToLonLat);
-    geojson.values["coordinates"] = std::move(coordinates);
+    if (num_coordinates > 1)
+    {
+        geojson.values["type"] = "LineString";
+        util::json::Array coordinates;
+        std::transform(begin, end, std::back_inserter(coordinates.values), &detail::coordinateToLonLat);
+        geojson.values["coordinates"] = std::move(coordinates);
+    }
+    else if (num_coordinates > 0)
+    {
+        geojson.values["type"] = "Point";
+        util::json::Array coordinates;
+        coordinates.values.push_back(detail::coordinateToLonLat(*begin));
+        geojson.values["coordinates"] = std::move(coordinates);
+    }
    return geojson;
 }

@@ -45,7 +45,7 @@ class MatchAPI final : public RouteAPI
        }
        response.values["tracepoints"] = MakeTracepoints(sub_matchings);
        response.values["matchings"] = std::move(routes);
-        response.values["code"] = "ok";
+        response.values["code"] = "Ok";
    }

    // FIXME gcc 4.8 doesn't support for lambdas to call protected member functions
@@ -90,7 +90,7 @@ class MatchAPI final : public RouteAPI
            }
        }

-        for (auto trace_index : util::irange(0UL, parameters.coordinates.size()))
+        for (auto trace_index : util::irange<std::size_t>(0UL, parameters.coordinates.size()))
        {
            auto matching_index = trace_idx_to_matching_idx[trace_index];
            if (matching_index.NotMatched())
@@ -43,7 +43,7 @@ class NearestAPI final : public BaseAPI
                           return waypoint;
                       });

-        response.values["code"] = "ok";
+        response.values["code"] = "Ok";
        response.values["waypoints"] = std::move(waypoints);
    }

@@ -2,15 +2,15 @@
 #define ENGINE_API_ROUTE_HPP

 #include "engine/api/base_api.hpp"
-#include "engine/api/route_parameters.hpp"
 #include "engine/api/json_factory.hpp"
+#include "engine/api/route_parameters.hpp"

 #include "engine/datafacade/datafacade_base.hpp"

-#include "engine/guidance/assemble_leg.hpp"
-#include "engine/guidance/assemble_route.hpp"
 #include "engine/guidance/assemble_geometry.hpp"
+#include "engine/guidance/assemble_leg.hpp"
 #include "engine/guidance/assemble_overview.hpp"
+#include "engine/guidance/assemble_route.hpp"
 #include "engine/guidance/assemble_steps.hpp"
 #include "engine/guidance/post_processing.hpp"

@@ -19,6 +19,7 @@
 #include "util/coordinate.hpp"
 #include "util/integer_range.hpp"

+#include <iterator>
 #include <vector>

 namespace osrm
@@ -54,7 +55,7 @@ class RouteAPI : public BaseAPI
        }
        response.values["waypoints"] = BaseAPI::MakeWaypoints(raw_route.segment_end_coordinates);
        response.values["routes"] = std::move(routes);
-        response.values["code"] = "ok";
+        response.values["code"] = "Ok";
    }

    // FIXME gcc 4.8 doesn't support for lambdas to call protected member functions
@@ -68,7 +69,7 @@ class RouteAPI : public BaseAPI
        }

        BOOST_ASSERT(parameters.geometries == RouteParameters::GeometriesType::GeoJSON);
-        return json::makeGeoJSONLineString(begin, end);
+        return json::makeGeoJSONGeometry(begin, end);
    }

    util::json::Object MakeRoute(const std::vector<PhantomNodes> &segment_end_coordinates,
@@ -82,7 +83,7 @@ class RouteAPI : public BaseAPI
        legs.reserve(number_of_legs);
        leg_geometries.reserve(number_of_legs);

-        for (auto idx : util::irange(0UL, number_of_legs))
+        for (auto idx : util::irange<std::size_t>(0UL, number_of_legs))
        {
            const auto &phantoms = segment_end_coordinates[idx];
            const auto &path_data = unpacked_path_segments[idx];
@@ -92,8 +93,8 @@ class RouteAPI : public BaseAPI

            auto leg_geometry = guidance::assembleGeometry(
                BaseAPI::facade, path_data, phantoms.source_phantom, phantoms.target_phantom);
-            auto leg = guidance::assembleLeg(BaseAPI::facade, path_data, leg_geometry,
-                                             phantoms.source_phantom, phantoms.target_phantom, reversed_target);
+            auto leg = guidance::assembleLeg(facade, path_data, leg_geometry, phantoms.source_phantom,
+                                             phantoms.target_phantom, reversed_target, parameters.steps);

            if (parameters.steps)
            {
@@ -131,6 +132,7 @@ class RouteAPI : public BaseAPI

                guidance::trimShortSegments(steps, leg_geometry);
                leg.steps = guidance::postProcess(std::move(steps));
+                leg.steps = guidance::collapseTurns(std::move(leg.steps));
                leg.steps = guidance::assignRelativeLocations(std::move(leg.steps), leg_geometry,
                                                              phantoms.source_phantom,
                                                              phantoms.target_phantom);
@@ -155,13 +157,12 @@ class RouteAPI : public BaseAPI
        }

        std::vector<util::json::Value> step_geometries;
-        for (const auto idx : util::irange(0UL, legs.size()))
+        for (const auto idx : util::irange<std::size_t>(0UL, legs.size()))
        {
            auto &leg_geometry = leg_geometries[idx];
            std::transform(
                legs[idx].steps.begin(), legs[idx].steps.end(), std::back_inserter(step_geometries),
-                [this, &leg_geometry](const guidance::RouteStep &step)
-                {
+                [this, &leg_geometry](const guidance::RouteStep &step) {
                    if (parameters.geometries == RouteParameters::GeometriesType::Polyline)
                    {
                        return static_cast<util::json::Value>(
@@ -169,7 +170,7 @@ class RouteAPI : public BaseAPI
                                               leg_geometry.locations.begin() + step.geometry_end));
                    }
                    BOOST_ASSERT(parameters.geometries == RouteParameters::GeometriesType::GeoJSON);
-                    return static_cast<util::json::Value>(json::makeGeoJSONLineString(
+                    return static_cast<util::json::Value>(json::makeGeoJSONGeometry(
                        leg_geometry.locations.begin() + step.geometry_begin,
                        leg_geometry.locations.begin() + step.geometry_end));
                });
@@ -48,7 +48,7 @@ namespace api
 *  - geometries: route geometry encoded in Polyline or GeoJSON
 *  - overview: adds overview geometry either Full, Simplified (according to highest zoom level) or
 *              False (not at all)
- *  - uturns: enable or disable uturns (disabled by default)
+ *  - continue_straight: enable or disable continue_straight (disabled by default)
 *
 * \see OSRM, Coordinate, Hint, Bearing, RouteParame, RouteParameters, TableParameters,
 *      NearestParameters, TripParameters, MatchParameters and TileParameters
@@ -74,18 +74,18 @@ struct RouteParameters : public BaseParameters
                    const bool alternatives_,
                    const GeometriesType geometries_,
                    const OverviewType overview_,
-                    const boost::optional<bool> uturns_,
+                    const boost::optional<bool> continue_straight_,
                    Args... args_)
        : BaseParameters{std::forward<Args>(args_)...}, steps{steps_}, alternatives{alternatives_},
-          geometries{geometries_}, overview{overview_}, uturns{uturns_}
+          geometries{geometries_}, overview{overview_}, continue_straight{continue_straight_}
    {
    }

-    bool steps = true;
-    bool alternatives = true;
+    bool steps = false;
+    bool alternatives = false;
    GeometriesType geometries = GeometriesType::Polyline;
    OverviewType overview = OverviewType::Simplified;
-    boost::optional<bool> uturns;
+    boost::optional<bool> continue_straight;

    bool IsValid() const { return coordinates.size() >= 2 && BaseParameters::IsValid(); }
 };
@@ -19,6 +19,8 @@

 #include <boost/range/algorithm/transform.hpp>

+#include <iterator>
+
 namespace osrm
 {
 namespace engine
@@ -65,7 +67,7 @@ class TableAPI final : public BaseAPI

        response.values["durations"] =
            MakeTable(durations, number_of_sources, number_of_destinations);
-        response.values["code"] = "ok";
+        response.values["code"] = "Ok";
    }

    // FIXME gcc 4.8 doesn't support for lambdas to call protected member functions
@@ -103,7 +105,7 @@ class TableAPI final : public BaseAPI
                                        std::size_t number_of_columns) const
    {
        util::json::Array json_table;
-        for (const auto row : util::irange<std::size_t>(0, number_of_rows))
+        for (const auto row : util::irange<std::size_t>(0UL, number_of_rows))
        {
            util::json::Array json_row;
            auto row_begin_iterator = values.begin() + (row * number_of_columns);
@@ -44,7 +44,7 @@ class TripAPI final : public RouteAPI
        }
        response.values["waypoints"] = MakeWaypoints(sub_trips, phantoms);
        response.values["trips"] = std::move(routes);
-        response.values["code"] = "ok";
+        response.values["code"] = "Ok";
    }

    // FIXME gcc 4.8 doesn't support for lambdas to call protected member functions
@@ -77,17 +77,17 @@ class TripAPI final : public RouteAPI
        };

        std::vector<TripIndex> input_idx_to_trip_idx(parameters.coordinates.size());
-        for (auto sub_trip_index : util::irange(0u, static_cast<unsigned>(sub_trips.size())))
+        for (auto sub_trip_index : util::irange<unsigned>(0u, sub_trips.size()))
        {
            for (auto point_index :
-                 util::irange(0u, static_cast<unsigned>(sub_trips[sub_trip_index].size())))
+                 util::irange<unsigned>(0u, sub_trips[sub_trip_index].size()))
            {
                input_idx_to_trip_idx[sub_trips[sub_trip_index][point_index]] =
                    TripIndex{sub_trip_index, point_index};
            }
        }

-        for (auto input_index : util::irange(0UL, parameters.coordinates.size()))
+        for (auto input_index : util::irange<std::size_t>(0UL, parameters.coordinates.size()))
        {
            auto trip_index = input_idx_to_trip_idx[input_index];
            BOOST_ASSERT(!trip_index.NotUsed());
@@ -15,6 +15,9 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/range/algorithm/copy.hpp>

+namespace osrm
+{
+
 // RFC 4648 "The Base16, Base32, and Base64 Data Encodings"
 // See: https://tools.ietf.org/html/rfc4648

@@ -36,9 +39,6 @@ using BinaryFromBase64 = boost::archive::iterators::transform_width<
    6  // from a sequence of 6 bit
    >;
 } // ns detail
-
-namespace osrm
-{
 namespace engine
 {

@@ -144,7 +144,7 @@ class BaseDataFacade

    virtual std::string GetTimestamp() const = 0;

-    virtual bool GetUTurnsDefault() const = 0;
+    virtual bool GetContinueStraightDefault() const = 0;
 };
 }
 }
@@ -7,6 +7,7 @@

 #include "extractor/guidance/turn_instruction.hpp"

+#include "storage/storage_config.hpp"
 #include "engine/geospatial_query.hpp"
 #include "extractor/original_edge_data.hpp"
 #include "extractor/profile_properties.hpp"
@@ -55,8 +56,8 @@ class InternalDataFacade final : public BaseDataFacade
  private:
    using super = BaseDataFacade;
    using QueryGraph = util::StaticGraph<typename super::EdgeData>;
-    using InputEdge = typename QueryGraph::InputEdge;
-    using RTreeLeaf = typename super::RTreeLeaf;
+    using InputEdge = QueryGraph::InputEdge;
+    using RTreeLeaf = super::RTreeLeaf;
    using InternalRTree =
        util::StaticRTree<RTreeLeaf, util::ShM<util::Coordinate, false>::vector, false>;
    using InternalGeospatialQuery = GeospatialQuery<InternalRTree, BaseDataFacade>;
@@ -112,8 +113,8 @@ class InternalDataFacade final : public BaseDataFacade

    void LoadGraph(const boost::filesystem::path &hsgr_path)
    {
-        typename util::ShM<typename QueryGraph::NodeArrayEntry, false>::vector node_list;
-        typename util::ShM<typename QueryGraph::EdgeArrayEntry, false>::vector edge_list;
+        util::ShM<QueryGraph::NodeArrayEntry, false>::vector node_list;
+        util::ShM<QueryGraph::EdgeArrayEntry, false>::vector edge_list;

        util::SimpleLogger().Write() << "loading graph from " << hsgr_path.string();

@@ -649,7 +650,7 @@ class InternalDataFacade final : public BaseDataFacade

    std::string GetTimestamp() const override final { return m_timestamp; }

-    bool GetUTurnsDefault() const override final { return m_profile_properties.allow_u_turn_at_via; }
+    bool GetContinueStraightDefault() const override final { return m_profile_properties.continue_straight_at_waypoint; }
 };
 }
 }
@@ -9,6 +9,7 @@

 #include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/profile_properties.hpp"
+#include "extractor/compressed_edge_container.hpp"

 #include "engine/geospatial_query.hpp"
 #include "util/range_table.hpp"
@@ -21,6 +22,7 @@
 #include <cstddef>

 #include <algorithm>
+#include <iterator>
 #include <limits>
 #include <memory>
 #include <string>
@@ -45,16 +47,16 @@ class SharedDataFacade final : public BaseDataFacade
  private:
    using super = BaseDataFacade;
    using QueryGraph = util::StaticGraph<EdgeData, true>;
-    using GraphNode = typename QueryGraph::NodeArrayEntry;
-    using GraphEdge = typename QueryGraph::EdgeArrayEntry;
-    using NameIndexBlock = typename util::RangeTable<16, true>::BlockT;
-    using InputEdge = typename QueryGraph::InputEdge;
-    using RTreeLeaf = typename super::RTreeLeaf;
+    using GraphNode = QueryGraph::NodeArrayEntry;
+    using GraphEdge = QueryGraph::EdgeArrayEntry;
+    using NameIndexBlock = util::RangeTable<16, true>::BlockT;
+    using InputEdge = QueryGraph::InputEdge;
+    using RTreeLeaf = super::RTreeLeaf;
    using SharedRTree =
        util::StaticRTree<RTreeLeaf, util::ShM<util::Coordinate, true>::vector, true>;
    using SharedGeospatialQuery = GeospatialQuery<SharedRTree, BaseDataFacade>;
    using TimeStampedRTreePair = std::pair<unsigned, std::shared_ptr<SharedRTree>>;
-    using RTreeNode = typename SharedRTree::TreeNode;
+    using RTreeNode = SharedRTree::TreeNode;

    storage::SharedDataLayout *data_layout;
    char *shared_memory;
@@ -139,9 +141,9 @@ class SharedDataFacade final : public BaseDataFacade
        auto graph_edges_ptr = data_layout->GetBlockPtr<GraphEdge>(
            shared_memory, storage::SharedDataLayout::GRAPH_EDGE_LIST);

-        typename util::ShM<GraphNode, true>::vector node_list(
+        util::ShM<GraphNode, true>::vector node_list(
            graph_nodes_ptr, data_layout->num_entries[storage::SharedDataLayout::GRAPH_NODE_LIST]);
-        typename util::ShM<GraphEdge, true>::vector edge_list(
+        util::ShM<GraphEdge, true>::vector edge_list(
            graph_edges_ptr, data_layout->num_entries[storage::SharedDataLayout::GRAPH_EDGE_LIST]);
        m_query_graph.reset(new QueryGraph(node_list, edge_list));
    }
@@ -156,14 +158,14 @@ class SharedDataFacade final : public BaseDataFacade

        auto travel_mode_list_ptr = data_layout->GetBlockPtr<extractor::TravelMode>(
            shared_memory, storage::SharedDataLayout::TRAVEL_MODE);
-        typename util::ShM<extractor::TravelMode, true>::vector travel_mode_list(
+        util::ShM<extractor::TravelMode, true>::vector travel_mode_list(
            travel_mode_list_ptr, data_layout->num_entries[storage::SharedDataLayout::TRAVEL_MODE]);
        m_travel_mode_list = std::move(travel_mode_list);

        auto turn_instruction_list_ptr =
            data_layout->GetBlockPtr<extractor::guidance::TurnInstruction>(
                shared_memory, storage::SharedDataLayout::TURN_INSTRUCTION);
-        typename util::ShM<extractor::guidance::TurnInstruction, true>::vector
+        util::ShM<extractor::guidance::TurnInstruction, true>::vector
            turn_instruction_list(
                turn_instruction_list_ptr,
                data_layout->num_entries[storage::SharedDataLayout::TURN_INSTRUCTION]);
@@ -171,7 +173,7 @@ class SharedDataFacade final : public BaseDataFacade

        auto name_id_list_ptr = data_layout->GetBlockPtr<unsigned>(
            shared_memory, storage::SharedDataLayout::NAME_ID_LIST);
-        typename util::ShM<unsigned, true>::vector name_id_list(
+        util::ShM<unsigned, true>::vector name_id_list(
            name_id_list_ptr, data_layout->num_entries[storage::SharedDataLayout::NAME_ID_LIST]);
        m_name_ID_list = std::move(name_id_list);
    }
@@ -180,7 +182,7 @@ class SharedDataFacade final : public BaseDataFacade
    {
        auto via_node_list_ptr = data_layout->GetBlockPtr<NodeID>(
            shared_memory, storage::SharedDataLayout::VIA_NODE_LIST);
-        typename util::ShM<NodeID, true>::vector via_node_list(
+        util::ShM<NodeID, true>::vector via_node_list(
            via_node_list_ptr, data_layout->num_entries[storage::SharedDataLayout::VIA_NODE_LIST]);
        m_via_node_list = std::move(via_node_list);
    }
@@ -191,14 +193,14 @@ class SharedDataFacade final : public BaseDataFacade
            shared_memory, storage::SharedDataLayout::NAME_OFFSETS);
        auto blocks_ptr = data_layout->GetBlockPtr<NameIndexBlock>(
            shared_memory, storage::SharedDataLayout::NAME_BLOCKS);
-        typename util::ShM<unsigned, true>::vector name_offsets(
+        util::ShM<unsigned, true>::vector name_offsets(
            offsets_ptr, data_layout->num_entries[storage::SharedDataLayout::NAME_OFFSETS]);
-        typename util::ShM<NameIndexBlock, true>::vector name_blocks(
+        util::ShM<NameIndexBlock, true>::vector name_blocks(
            blocks_ptr, data_layout->num_entries[storage::SharedDataLayout::NAME_BLOCKS]);

        auto names_list_ptr = data_layout->GetBlockPtr<char>(
            shared_memory, storage::SharedDataLayout::NAME_CHAR_LIST);
-        typename util::ShM<char, true>::vector names_char_list(
+        util::ShM<char, true>::vector names_char_list(
            names_list_ptr, data_layout->num_entries[storage::SharedDataLayout::NAME_CHAR_LIST]);
        m_name_table = util::make_unique<util::RangeTable<16, true>>(
            name_offsets, name_blocks, static_cast<unsigned>(names_char_list.size()));
@@ -215,7 +217,7 @@ class SharedDataFacade final : public BaseDataFacade

        auto core_marker_ptr = data_layout->GetBlockPtr<unsigned>(
            shared_memory, storage::SharedDataLayout::CORE_MARKER);
-        typename util::ShM<bool, true>::vector is_core_node(
+        util::ShM<bool, true>::vector is_core_node(
            core_marker_ptr, data_layout->num_entries[storage::SharedDataLayout::CORE_MARKER]);
        m_is_core_node = std::move(is_core_node);
    }
@@ -224,7 +226,7 @@ class SharedDataFacade final : public BaseDataFacade
    {
        auto geometries_index_ptr = data_layout->GetBlockPtr<unsigned>(
            shared_memory, storage::SharedDataLayout::GEOMETRIES_INDEX);
-        typename util::ShM<unsigned, true>::vector geometry_begin_indices(
+        util::ShM<unsigned, true>::vector geometry_begin_indices(
            geometries_index_ptr,
            data_layout->num_entries[storage::SharedDataLayout::GEOMETRIES_INDEX]);
        m_geometry_indices = std::move(geometry_begin_indices);
@@ -232,35 +234,35 @@ class SharedDataFacade final : public BaseDataFacade
        auto geometries_list_ptr =
            data_layout->GetBlockPtr<extractor::CompressedEdgeContainer::CompressedEdge>(
                shared_memory, storage::SharedDataLayout::GEOMETRIES_LIST);
-        typename util::ShM<extractor::CompressedEdgeContainer::CompressedEdge, true>::vector
+        util::ShM<extractor::CompressedEdgeContainer::CompressedEdge, true>::vector
            geometry_list(geometries_list_ptr,
                          data_layout->num_entries[storage::SharedDataLayout::GEOMETRIES_LIST]);
        m_geometry_list = std::move(geometry_list);

        auto datasources_list_ptr = data_layout->GetBlockPtr<uint8_t>(
            shared_memory, storage::SharedDataLayout::DATASOURCES_LIST);
-        typename util::ShM<uint8_t, true>::vector datasources_list(
+        util::ShM<uint8_t, true>::vector datasources_list(
            datasources_list_ptr,
            data_layout->num_entries[storage::SharedDataLayout::DATASOURCES_LIST]);
        m_datasource_list = std::move(datasources_list);

        auto datasource_name_data_ptr = data_layout->GetBlockPtr<char>(
            shared_memory, storage::SharedDataLayout::DATASOURCE_NAME_DATA);
-        typename util::ShM<char, true>::vector datasource_name_data(
+        util::ShM<char, true>::vector datasource_name_data(
            datasource_name_data_ptr,
            data_layout->num_entries[storage::SharedDataLayout::DATASOURCE_NAME_DATA]);
        m_datasource_name_data = std::move(datasource_name_data);

        auto datasource_name_offsets_ptr = data_layout->GetBlockPtr<std::size_t>(
            shared_memory, storage::SharedDataLayout::DATASOURCE_NAME_OFFSETS);
-        typename util::ShM<std::size_t, true>::vector datasource_name_offsets(
+        util::ShM<std::size_t, true>::vector datasource_name_offsets(
            datasource_name_offsets_ptr,
            data_layout->num_entries[storage::SharedDataLayout::DATASOURCE_NAME_OFFSETS]);
        m_datasource_name_offsets = std::move(datasource_name_offsets);

        auto datasource_name_lengths_ptr = data_layout->GetBlockPtr<std::size_t>(
            shared_memory, storage::SharedDataLayout::DATASOURCE_NAME_LENGTHS);
-        typename util::ShM<std::size_t, true>::vector datasource_name_lengths(
+        util::ShM<std::size_t, true>::vector datasource_name_lengths(
            datasource_name_lengths_ptr,
            data_layout->num_entries[storage::SharedDataLayout::DATASOURCE_NAME_LENGTHS]);
        m_datasource_name_lengths = std::move(datasource_name_lengths);
@@ -708,7 +710,7 @@ class SharedDataFacade final : public BaseDataFacade

    std::string GetTimestamp() const override final { return m_timestamp; }

-    bool GetUTurnsDefault() const override final { return m_profile_properties->allow_u_turn_at_via; }
+    bool GetContinueStraightDefault() const override final { return m_profile_properties->continue_straight_at_waypoint; }
 };
 }
 }
@@ -12,26 +12,47 @@ namespace engine
 {
 namespace detail
 {
-const constexpr int DOUGLAS_PEUCKER_THRESHOLDS[19] = {
-    512440, // z0
-    256720, // z1
-    122560, // z2
-    56780,  // z3
-    28800,  // z4
-    14400,  // z5
-    7200,   // z6
-    3200,   // z7
-    2400,   // z8
-    1000,   // z9
-    600,    // z10
-    120,    // z11
-    60,     // z12
-    45,     // z13
-    36,     // z14
-    20,     // z15
-    8,      // z16
-    6,      // z17
-    4,      // z18
+
+// This is derived from the following formular:
+// x = b * (1 + lon/180) => dx = b * dlon/180
+// y = b * (1 - lat/180) => dy = b * dlat/180
+// dx^2 + dy^2 < min_pixel^2
+// => dlon^2 + dlat^2 < min_pixel^2 / b^2 * 180^2
+inline std::vector<std::uint64_t> generateThreshold(double min_pixel, unsigned number_of_zoomlevels)
+{
+    std::vector<std::uint64_t> thresholds(number_of_zoomlevels);
+    for (unsigned zoom = 0; zoom < number_of_zoomlevels; ++zoom)
+    {
+        const double shift = (1u << zoom) * 256;
+        const double b = shift / 2.0;
+        const double pixel_to_deg = 180. / b;
+        const std::uint64_t min_deg = min_pixel * pixel_to_deg * COORDINATE_PRECISION;
+        thresholds[zoom] = min_deg * min_deg;
+    }
+
+    return thresholds;
+}
+
+const constexpr std::uint64_t DOUGLAS_PEUCKER_THRESHOLDS[19] = {
+    49438476562500, // z0
+    12359619140625, // z1
+    3089903027344,  // z2
+    772475756836,   // z3
+    193118939209,   // z4
+    48279515076,    // z5
+    12069878769,    // z6
+    3017414761,     // z7
+    754326225,      // z8
+    188567824,      // z9
+    47141956,       // z10
+    11785489,       // z11
+    2944656,        // z12
+    736164,         // z13
+    184041,         // z14
+    45796,          // z15
+    11449,          // z16
+    2809,           // z17
+    676,            // z18
 };

 const constexpr auto DOUGLAS_PEUCKER_THRESHOLDS_SIZE =
@@ -6,6 +6,7 @@
 #include "engine/phantom_node.hpp"
 #include "util/bearing.hpp"
 #include "util/rectangle.hpp"
+#include "util/web_mercator.hpp"

 #include "osrm/coordinate.hpp"

@@ -55,7 +56,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
                          [this, max_distance, input_coordinate](const std::size_t,
                                                                 const CandidateSegment &segment)
                          {
-                              return checkSegmentDistance(input_coordinate, segment, max_distance);
+                              return CheckSegmentDistance(input_coordinate, segment, max_distance);
                          });

        return MakePhantomNodes(input_coordinate, results);
@@ -73,12 +74,12 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
            input_coordinate,
            [this, bearing, bearing_range, max_distance](const CandidateSegment &segment)
            {
-                return checkSegmentBearing(segment, bearing, bearing_range);
+                return CheckSegmentBearing(segment, bearing, bearing_range);
            },
            [this, max_distance, input_coordinate](const std::size_t,
                                                   const CandidateSegment &segment)
            {
-                return checkSegmentDistance(input_coordinate, segment, max_distance);
+                return CheckSegmentDistance(input_coordinate, segment, max_distance);
            });

        return MakePhantomNodes(input_coordinate, results);
@@ -96,7 +97,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
            rtree.Nearest(input_coordinate,
                          [this, bearing, bearing_range](const CandidateSegment &segment)
                          {
-                              return checkSegmentBearing(segment, bearing, bearing_range);
+                              return CheckSegmentBearing(segment, bearing, bearing_range);
                          },
                          [max_results](const std::size_t num_results, const CandidateSegment &)
                          {
@@ -120,13 +121,13 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
            rtree.Nearest(input_coordinate,
                          [this, bearing, bearing_range](const CandidateSegment &segment)
                          {
-                              return checkSegmentBearing(segment, bearing, bearing_range);
+                              return CheckSegmentBearing(segment, bearing, bearing_range);
                          },
                          [this, max_distance, max_results, input_coordinate](
                              const std::size_t num_results, const CandidateSegment &segment)
                          {
                              return num_results >= max_results ||
-                                     checkSegmentDistance(input_coordinate, segment, max_distance);
+                                     CheckSegmentDistance(input_coordinate, segment, max_distance);
                          });

        return MakePhantomNodes(input_coordinate, results);
@@ -168,7 +169,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
                              const std::size_t num_results, const CandidateSegment &segment)
                          {
                              return num_results >= max_results ||
-                                     checkSegmentDistance(input_coordinate, segment, max_distance);
+                                     CheckSegmentDistance(input_coordinate, segment, max_distance);
                          });

        return MakePhantomNodes(input_coordinate, results);
@@ -199,7 +200,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
             input_coordinate](const std::size_t num_results, const CandidateSegment &segment)
            {
                return (num_results > 0 && has_big_component) ||
-                       checkSegmentDistance(input_coordinate, segment, max_distance);
+                       CheckSegmentDistance(input_coordinate, segment, max_distance);
            });

        if (results.size() == 0)
@@ -265,7 +266,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery

                if (use_segment)
                {
-                    use_directions = checkSegmentBearing(segment, bearing, bearing_range);
+                    use_directions = CheckSegmentBearing(segment, bearing, bearing_range);
                    if (use_directions.first || use_directions.second)
                    {
                        has_big_component = has_big_component || !segment.data.component.is_tiny;
@@ -311,7 +312,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery

                if (use_segment)
                {
-                    use_directions = checkSegmentBearing(segment, bearing, bearing_range);
+                    use_directions = CheckSegmentBearing(segment, bearing, bearing_range);
                    if (use_directions.first || use_directions.second)
                    {
                        has_big_component = has_big_component || !segment.data.component.is_tiny;
@@ -325,7 +326,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
             input_coordinate](const std::size_t num_results, const CandidateSegment &segment)
            {
                return (num_results > 0 && has_big_component) ||
-                       checkSegmentDistance(input_coordinate, segment, max_distance);
+                       CheckSegmentDistance(input_coordinate, segment, max_distance);
            });

        if (results.size() == 0)
@@ -415,7 +416,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
        return transformed;
    }

-    bool checkSegmentDistance(const Coordinate input_coordinate,
+    bool CheckSegmentDistance(const Coordinate input_coordinate,
                              const CandidateSegment &segment,
                              const double max_distance)
    {
@@ -424,13 +425,14 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
        BOOST_ASSERT(segment.data.reverse_segment_id.id != SPECIAL_SEGMENTID ||
                     !segment.data.reverse_segment_id.enabled);

-        Coordinate wsg84_coordinate = util::coordinate_calculation::mercator::toWGS84(
-            segment.fixed_projected_coordinate);
+        Coordinate wsg84_coordinate =
+            util::web_mercator::toWGS84(segment.fixed_projected_coordinate);

-        return util::coordinate_calculation::haversineDistance(input_coordinate, wsg84_coordinate) > max_distance;
+        return util::coordinate_calculation::haversineDistance(input_coordinate, wsg84_coordinate) >
+               max_distance;
    }

-    std::pair<bool, bool> checkSegmentBearing(const CandidateSegment &segment,
+    std::pair<bool, bool> CheckSegmentBearing(const CandidateSegment &segment,
                                              const int filter_bearing,
                                              const int filter_bearing_range)
    {
@@ -1,20 +1,21 @@
 #ifndef ENGINE_GUIDANCE_ASSEMBLE_LEG_HPP_
 #define ENGINE_GUIDANCE_ASSEMBLE_LEG_HPP_

+#include "engine/datafacade/datafacade_base.hpp"
+#include "engine/guidance/leg_geometry.hpp"
 #include "engine/guidance/route_leg.hpp"
 #include "engine/guidance/route_step.hpp"
-#include "engine/guidance/leg_geometry.hpp"
 #include "engine/internal_route_result.hpp"

 #include <cstddef>
 #include <cstdint>

-#include <vector>
+#include <algorithm>
 #include <array>
+#include <numeric>
 #include <string>
 #include <utility>
-#include <numeric>
-#include <algorithm>
+#include <vector>

 namespace osrm
 {
@@ -27,12 +28,13 @@ namespace detail
 const constexpr std::size_t MAX_USED_SEGMENTS = 2;
 struct NamedSegment
 {
-    double duration;
+    EdgeWeight duration;
    std::uint32_t position;
    std::uint32_t name_id;
 };

 template <std::size_t SegmentNumber>
+
 std::array<std::uint32_t, SegmentNumber> summarizeRoute(const std::vector<PathData> &route_data)
 {
    // merges segments with same name id
@@ -40,7 +42,14 @@ std::array<std::uint32_t, SegmentNumber> summarizeRoute(const std::vector<PathDa
    {
        auto out = segments.begin();
        auto end = segments.end();
-        for (auto in = segments.begin(); in != end; ++in)
+
+        // Do nothing if we were given an empty array
+        if (out == end)
+        {
+            return end;
+        }
+
+        for (auto in = std::next(out); in != end; ++in)
        {
            if (in->name_id == out->name_id)
            {
@@ -53,7 +62,8 @@ std::array<std::uint32_t, SegmentNumber> summarizeRoute(const std::vector<PathDa
                *out = *in;
            }
        }
-        return out;
+        BOOST_ASSERT(out != end);
+        return ++out;
    };

    std::vector<NamedSegment> segments(route_data.size());
@@ -61,7 +71,7 @@ std::array<std::uint32_t, SegmentNumber> summarizeRoute(const std::vector<PathDa
    std::transform(
        route_data.begin(), route_data.end(), segments.begin(), [&index](const PathData &point)
        {
-            return NamedSegment{point.duration_until_turn / 10.0, index++, point.name_id};
+            return NamedSegment{point.duration_until_turn, index++, point.name_id};
        });
    // this makes sure that the segment with the lowest position comes first
    std::sort(segments.begin(), segments.end(), [](const NamedSegment &lhs, const NamedSegment &rhs)
@@ -71,10 +81,19 @@ std::array<std::uint32_t, SegmentNumber> summarizeRoute(const std::vector<PathDa
              });
    auto new_end = collapse_segments(segments);
    segments.resize(new_end - segments.begin());
+
+    // Filter out segments with an empty name (name_id == 0)
+    new_end = std::remove_if(segments.begin(), segments.end(), [](const NamedSegment &segment)
+              {
+                  return segment.name_id == 0;
+              });
+    segments.resize(new_end - segments.begin());
+
    // sort descending
    std::sort(segments.begin(), segments.end(), [](const NamedSegment &lhs, const NamedSegment &rhs)
              {
-                  return lhs.duration > rhs.duration;
+                  return lhs.duration > rhs.duration ||
+                         (lhs.duration == rhs.duration && lhs.position < rhs.position);
              });

    // make sure the segments are sorted by position
@@ -95,13 +114,13 @@ std::array<std::uint32_t, SegmentNumber> summarizeRoute(const std::vector<PathDa
 }
 }

-template <typename DataFacadeT>
-RouteLeg assembleLeg(const DataFacadeT &facade,
-                     const std::vector<PathData> &route_data,
-                     const LegGeometry &leg_geometry,
-                     const PhantomNode &source_node,
-                     const PhantomNode &target_node,
-                     const bool target_traversed_in_reverse)
+inline RouteLeg assembleLeg(const datafacade::BaseDataFacade &facade,
+                            const std::vector<PathData> &route_data,
+                            const LegGeometry &leg_geometry,
+                            const PhantomNode &source_node,
+                            const PhantomNode &target_node,
+                            const bool target_traversed_in_reverse,
+                            const bool needs_summary)
 {
    const auto target_duration =
        (target_traversed_in_reverse ? target_node.reverse_weight : target_node.forward_weight) /
@@ -110,8 +129,7 @@ RouteLeg assembleLeg(const DataFacadeT &facade,
    auto distance = std::accumulate(leg_geometry.segment_distances.begin(),
                                    leg_geometry.segment_distances.end(), 0.);
    auto duration = std::accumulate(route_data.begin(), route_data.end(), 0.,
-                                    [](const double sum, const PathData &data)
-                                    {
+                                    [](const double sum, const PathData &data) {
                                        return sum + data.duration_until_turn;
                                    }) /
                    10.;
@@ -140,24 +158,29 @@ RouteLeg assembleLeg(const DataFacadeT &facade,
    duration = duration + target_duration;
    if (route_data.empty())
    {
-        duration -=
-            (target_traversed_in_reverse ? source_node.reverse_weight : source_node.forward_weight) / 10;
+        duration -= (target_traversed_in_reverse ? source_node.reverse_weight
+                                                 : source_node.forward_weight) /
+                    10.0;
    }
-    auto summary_array = detail::summarizeRoute<detail::MAX_USED_SEGMENTS>(route_data);

-    BOOST_ASSERT(detail::MAX_USED_SEGMENTS > 0);
-    BOOST_ASSERT(summary_array.begin() != summary_array.end());
-    std::string summary =
-        std::accumulate(std::next(summary_array.begin()), summary_array.end(),
-                        facade.GetNameForID(summary_array.front()),
-                        [&facade](std::string previous, const std::uint32_t name_id)
-                        {
-                            if (name_id != 0)
-                            {
-                                previous += ", " + facade.GetNameForID(name_id);
-                            }
-                            return previous;
-                        });
+    std::string summary;
+    if (needs_summary)
+    {
+        auto summary_array = detail::summarizeRoute<detail::MAX_USED_SEGMENTS>(route_data);
+
+        BOOST_ASSERT(detail::MAX_USED_SEGMENTS > 0);
+        BOOST_ASSERT(summary_array.begin() != summary_array.end());
+        summary = std::accumulate(std::next(summary_array.begin()), summary_array.end(),
+                                  facade.GetNameForID(summary_array.front()),
+                                  [&facade](std::string previous, const std::uint32_t name_id)
+                                  {
+                                      if (name_id != 0)
+                                      {
+                                          previous += ", " + facade.GetNameForID(name_id);
+                                      }
+                                      return previous;
+                                  });
+    }

    return RouteLeg{duration, distance, summary, {}};
 }
@@ -1,20 +1,21 @@
 #ifndef ENGINE_GUIDANCE_ASSEMBLE_STEPS_HPP_
 #define ENGINE_GUIDANCE_ASSEMBLE_STEPS_HPP_

+#include "engine/guidance/leg_geometry.hpp"
 #include "engine/guidance/route_step.hpp"
 #include "engine/guidance/step_maneuver.hpp"
-#include "engine/guidance/leg_geometry.hpp"
 #include "engine/guidance/toolkit.hpp"
-#include "extractor/guidance/turn_instruction.hpp"
 #include "engine/internal_route_result.hpp"
 #include "engine/phantom_node.hpp"
-#include "util/coordinate_calculation.hpp"
-#include "util/coordinate.hpp"
-#include "util/bearing.hpp"
+#include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/travel_mode.hpp"
+#include "util/bearing.hpp"
+#include "util/coordinate.hpp"
+#include "util/coordinate_calculation.hpp"

-#include <vector>
 #include <boost/optional.hpp>
+#include <cstddef>
+#include <vector>

 namespace osrm
 {
@@ -44,6 +45,7 @@ std::vector<RouteStep> assembleSteps(const DataFacadeT &facade,
                                     const bool target_traversed_in_reverse)
 {
    const double constexpr ZERO_DURATION = 0., ZERO_DISTANCE = 0.;
+    const constexpr char *NO_ROTARY_NAME = "";
    const EdgeWeight source_duration =
        source_traversed_in_reverse ? source_node.reverse_weight : source_node.forward_weight;
    const auto source_mode = source_traversed_in_reverse ? source_node.backward_travel_mode
@@ -74,24 +76,30 @@ std::vector<RouteStep> assembleSteps(const DataFacadeT &facade,
        // We need to skip the first segment because it is already covered by the
        // initial start of a route
        int segment_duration = 0;
-        for (const auto &path_point : leg_data)
+
+        // some name changes are not announced in our processing. For these, we have to keep the
+        // first name on the segment
+        auto step_name_id = source_node.name_id;
+        for (std::size_t leg_data_index = 0; leg_data_index < leg_data.size(); ++leg_data_index)
        {
+            const auto &path_point = leg_data[leg_data_index];
            segment_duration += path_point.duration_until_turn;

            // all changes to this check have to be matched with assemble_geometry
            if (path_point.turn_instruction.type != extractor::guidance::TurnType::NoTurn)
            {
                BOOST_ASSERT(segment_duration >= 0);
-                const auto name = facade.GetNameForID(path_point.name_id);
+                const auto name = facade.GetNameForID(step_name_id);
                const auto distance = leg_geometry.segment_distances[segment_index];
-                steps.push_back(RouteStep{path_point.name_id,
-                                          name,
-                                          segment_duration / 10.0,
-                                          distance,
-                                          path_point.travel_mode,
-                                          maneuver,
-                                          leg_geometry.FrontIndex(segment_index),
+                steps.push_back(RouteStep{step_name_id, name, NO_ROTARY_NAME,
+                                          segment_duration / 10.0, distance, path_point.travel_mode,
+                                          maneuver, leg_geometry.FrontIndex(segment_index),
                                          leg_geometry.BackIndex(segment_index) + 1});
+                if (leg_data_index + 1 < leg_data.size()){
+                    step_name_id = leg_data[leg_data_index + 1].name_id;
+                } else {
+                    step_name_id = target_node.name_id;
+                }
                maneuver = detail::stepManeuverFromGeometry(path_point.turn_instruction,
                                                            leg_geometry, segment_index);
                segment_index++;
@@ -101,12 +109,8 @@ std::vector<RouteStep> assembleSteps(const DataFacadeT &facade,
        const auto distance = leg_geometry.segment_distances[segment_index];
        const int duration = segment_duration + target_duration;
        BOOST_ASSERT(duration >= 0);
-        steps.push_back(RouteStep{target_node.name_id,
-                                  facade.GetNameForID(target_node.name_id),
-                                  duration / 10.,
-                                  distance,
-                                  target_mode,
-                                  maneuver,
+        steps.push_back(RouteStep{step_name_id, facade.GetNameForID(step_name_id),
+                                  NO_ROTARY_NAME, duration / 10., distance, target_mode, maneuver,
                                  leg_geometry.FrontIndex(segment_index),
                                  leg_geometry.BackIndex(segment_index) + 1});
    }
@@ -124,13 +128,10 @@ std::vector<RouteStep> assembleSteps(const DataFacadeT &facade,
        int duration = target_duration - source_duration;
        BOOST_ASSERT(duration >= 0);

-        steps.push_back(RouteStep{source_node.name_id,
-                                  facade.GetNameForID(source_node.name_id),
-                                  duration / 10.,
-                                  leg_geometry.segment_distances[segment_index],
-                                  source_mode,
-                                  std::move(maneuver),
-                                  leg_geometry.FrontIndex(segment_index),
+        steps.push_back(RouteStep{source_node.name_id, facade.GetNameForID(source_node.name_id),
+                                  NO_ROTARY_NAME, duration / 10.,
+                                  leg_geometry.segment_distances[segment_index], source_mode,
+                                  std::move(maneuver), leg_geometry.FrontIndex(segment_index),
                                  leg_geometry.BackIndex(segment_index) + 1});
    }

@@ -138,13 +139,11 @@ std::vector<RouteStep> assembleSteps(const DataFacadeT &facade,
    // This step has length zero, the only reason we need it is the target location
    auto final_maneuver = detail::stepManeuverFromGeometry(
        extractor::guidance::TurnInstruction::NO_TURN(), WaypointType::Arrive, leg_geometry);
-    steps.push_back(RouteStep{target_node.name_id,
-                              facade.GetNameForID(target_node.name_id),
-                              ZERO_DURATION,
-                              ZERO_DISTANCE,
-                              target_mode,
-                              final_maneuver,
-                              leg_geometry.locations.size(),
+
+    BOOST_ASSERT(!leg_geometry.locations.empty());
+    steps.push_back(RouteStep{target_node.name_id, facade.GetNameForID(target_node.name_id),
+                              NO_ROTARY_NAME, ZERO_DURATION, ZERO_DISTANCE, target_mode,
+                              final_maneuver, leg_geometry.locations.size() - 1,
                              leg_geometry.locations.size()});

    return steps;
@@ -17,6 +17,13 @@ namespace guidance
 // passed as none-reference to modify in-place and move out again
 std::vector<RouteStep> postProcess(std::vector<RouteStep> steps);

+// Multiple possible reasons can result in unnecessary/confusing instructions
+// A prime example would be a segregated intersection. Turning around at this
+// intersection would result in two instructions to turn left.
+// Collapsing such turns into a single turn instruction, we give a clearer
+// set of instructionst that is not cluttered by unnecessary turns/name changes.
+std::vector<RouteStep> collapseTurns(std::vector<RouteStep> steps);
+
 // trim initial/final segment of very short length.
 // This function uses in/out parameter passing to modify both steps and geometry in place.
 // We use this method since both steps and geometry are closely coupled logically but
@@ -30,6 +37,9 @@ std::vector<RouteStep> assignRelativeLocations(std::vector<RouteStep> steps,
                                               const PhantomNode &source_node,
                                               const PhantomNode &target_node);

+//remove steps invalidated by post-processing
+std::vector<RouteStep> removeNoTurnInstructions(std::vector<RouteStep> steps);
+
 // postProcess will break the connection between the leg geometry
 // for which a segment is supposed to represent exactly the coordinates
 // between routing maneuvers and the route steps itself.
--- a/Show More
+++ b/Show More