Make gcc 4.8 happy and disable protected because of lambdas

Include edge duration information.
Implement viewport code to fix simplification
2016-03-19 00:01:43 +01:00 · 2016-03-18 23:34:28 +01:00 · 2016-03-18 23:25:54 +01:00 · 2016-03-18 23:25:44 +01:00 · 2016-03-18 23:25:44 +01:00 · 2016-03-18 19:29:09 +01:00
409 changed files with 20228 additions and 30842 deletions
@@ -1,28 +0,0 @@
-{
-    "rules": {
-        "indent": [
-            2,
-            4
-        ],
-        "quotes": [
-            1,
-            "single"
-        ],
-        "linebreak-style": [
-            2,
-            "unix"
-        ],
-        "semi": [
-            2,
-            "always"
-        ],
-        "no-console": [
-            1
-        ]
-    },
-    "env": {
-        "es6": true,
-        "node": true
-    },
-    "extends": "eslint:recommended"
-}
@@ -41,7 +41,6 @@ Thumbs.db
 #######################
 /build/
 /example/build/
-/test/data/monaco*
 /cmake/postinst

 # Eclipse related files #
@@ -75,13 +74,7 @@ stxxl.errlog
 ###################
 /sandbox/

-# Test related files #
-######################
 /test/profile.lua
-/test/cache
-/test/speeds.csv
-/test/data/monaco.*
-node_modules

 # Deprecated config file #
 ##########################
@@ -26,29 +26,29 @@ matrix:
      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', 'pip']
-      env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Debug' COVERAGE=ON
+          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'rubygems-integration', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      env: COMPILER='g++-5' BUILD_TYPE='Debug'

    - 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='Debug'
+          packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'rubygems-integration', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      env: COMPILER='g++-4.8' BUILD_TYPE='Debug'

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

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

    # Release Builds
    - os: linux
@@ -56,29 +56,29 @@ matrix:
      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: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release'
+          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'rubygems-integration', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      env: COMPILER='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: CCOMPILER='gcc-4.8' CXXCOMPILER='g++-4.8' BUILD_TYPE='Release'
+          packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'rubygems-integration', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      env: COMPILER='g++-4.8' BUILD_TYPE='Release'

    - 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'
+          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', 'rubygems-integration', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      env: COMPILER='clang++-3.8' BUILD_TYPE='Release'

    - os: osx
      osx_image: xcode7.3
      compiler: clang
-      env: CCOMPILER='clang' CXXCOMPILER='clang++' BUILD_TYPE='Release'
+      env: COMPILER='clang++' BUILD_TYPE='Release'

    # Shared Library
    - os: linux
@@ -86,33 +86,51 @@ matrix:
      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: CCOMPILER='gcc-5' CXXCOMPILER='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', 'rubygems-integration', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      env: COMPILER='g++-5' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON

    - os: linux
      compiler: clang
      addons: &clang38
        apt:
-          sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
-          packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
-      env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
+          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', 'rubygems-integration', '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

-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 [[ -n "${COVERAGE}" ]]; then
-      pip install --user cpp-coveralls
-    fi
  - |
    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
-      CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.1-Linux-x86_64.tar.gz"
+      CMAKE_URL="http://www.cmake.org/files/v3.3/cmake-3.3.2-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
@@ -124,10 +142,13 @@ before_script:
    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
      ./scripts/check_taginfo.py taginfo.json profiles/car.lua
    fi
+  - rvm use 1.9.3
+  - gem install bundler
+  - bundle install
  - mkdir build && pushd build
-  - export CC=${CCOMPILER} CXX=${CXXCOMPILER}
-  - export OSRM_PORT=5000 OSRM_TIMEOUT=6000
-  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DCOVERAGE=${COVERAGE:-OFF} -DBUILD_TOOLS=1 -DENABLE_CCACHE=0
+  - export CXX=${COMPILER}
+  - export OSRM_PORT=5000 OSRM_TIMEOUT=60
+  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DBUILD_TOOLS=1 -DENABLE_CCACHE=0

 script:
  - make --jobs=2
@@ -138,29 +159,18 @@ script:
    if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
      sudo ldconfig
    fi
-  - echo "travis_fold:start:UNIT_TESTS"
-  - ./unit_tests/extractor-tests
-  - ./unit_tests/engine-tests
-  - ./unit_tests/util-tests
-  - ./unit_tests/server-tests
-  - echo "travis_fold:end:UNIT_TESTS"
+  - ./extractor-tests
+  - ./engine-tests
+  - ./util-tests
  - popd
-  - echo "travis_fold:start:CUCUMBER"
-  - npm test
-  - echo "travis_fold:end:CUCUMBER"
-  - echo "travis_fold:start:BENCHMARK"
-  - make -C test/data benchmark
-  - echo "travis_fold:end:BENCHMARK"
-  - ./build/unit_tests/library-tests test/data/monaco.osrm
+  - cucumber -p verify
+  - make -C test/data
  - mkdir example/build && pushd example/build
  - cmake ..
  - make
  - ./osrm-example ../../test/data/monaco.osrm
  - popd
-
-after_success:
  - |
    if [ -n "$RUN_CLANG_FORMAT" ]; then
      ./scripts/format.sh || true # we don't want to fail just yet
    fi
-  - coveralls --build-root build --exclude unit_tests --exclude third_party --exclude node_modules --gcov-options '\-lp'
@@ -1,88 +1,3 @@
 # 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
-   - New public HTTP API, find documentation [here](https://github.com/Project-OSRM/osrm-backend/wiki/New-Server-api)
-   - POST support is discontinued, please use library bindings for more complex requests
-   - Removed timestamp plugin
-   - Coordinate order is now Longitude,Latitude
-   - Cucumber tests now based on Javascript (run with `npm test`)
-   - Profile API changed:
-      - `forward_mode` and `backward_mode` now need to be selected from a pre-defined list
-      - Global profile properties are now stored in a global `properties` element. This includes:
-        - `properties.traffic_signal_penalty`
-        - `properties.use_turn_restrictions`
-        - `properties.u_turn_penalty`
-        - `properties.allow_u_turn_at_via`
-
-
@@ -7,9 +7,9 @@ This process created the file `CMakeCache.txt' and the directory `CMakeFiles'. P
 endif()

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

 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 include(CheckCXXCompilerFlag)
@@ -32,10 +32,7 @@ endif()
 option(ENABLE_CCACHE "Speed up incremental rebuilds via ccache" ON)
 option(ENABLE_JSON_LOGGING "Adds additional JSON debug logging to the response" OFF)
 option(BUILD_TOOLS "Build OSRM tools" OFF)
-option(BUILD_COMPONENTS "Build osrm-components" ON)
 option(ENABLE_ASSERTIONS OFF)
-option(COVERAGE OFF)
-option(SANITIZER OFF)

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

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

 configure_file(
  ${CMAKE_CURRENT_SOURCE_DIR}/include/util/version.hpp.in
@@ -60,6 +60,11 @@ 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 IOTestsGlob unit_tests/io/*.cpp)

 add_library(UTIL OBJECT ${UtilGlob})
 add_library(EXTRACTOR OBJECT ${ExtractorGlob})
@@ -75,11 +80,23 @@ add_executable(osrm-extract src/tools/extract.cpp)
 add_executable(osrm-contract src/tools/contract.cpp)
 add_executable(osrm-routed src/tools/routed.cpp $<TARGET_OBJECTS:SERVER> $<TARGET_OBJECTS:UTIL>)
 add_executable(osrm-datastore src/tools/store.cpp $<TARGET_OBJECTS:UTIL>)
-add_library(osrm src/osrm/osrm.cpp $<TARGET_OBJECTS:ENGINE> $<TARGET_OBJECTS:UTIL> $<TARGET_OBJECTS:STORAGE>)
+add_library(osrm src/osrm/osrm.cpp $<TARGET_OBJECTS:ENGINE> $<TARGET_OBJECTS:UTIL>)
 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: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>)
+
+# Benchmarks
+add_executable(rtree-bench EXCLUDE_FROM_ALL src/benchmarks/static_rtree.cpp $<TARGET_OBJECTS:UTIL>)
+
+target_include_directories(util-tests PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/unit_tests)
+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)
@@ -135,19 +152,8 @@ if(CMAKE_BUILD_TYPE MATCHES Release)
  endif()
 endif()

-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()
-  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")
+if(NOT WIN32)
+  add_definitions(-DBOOST_TEST_DYN_LINK)
 endif()

 # Configuring compilers
@@ -171,10 +177,8 @@ elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
 elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
  # using Visual Studio C++
  set(BOOST_COMPONENTS ${BOOST_COMPONENTS} date_time chrono zlib)
-  add_definitions(-DBOOST_LIB_DIAGNOSTIC)
  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
  add_definitions(-DNOMINMAX) # avoid min and max macros that can break compilation
-  add_definitions(-D_USE_MATH_DEFINES) #needed for M_PI with cmath.h
  add_definitions(-D_WIN32_WINNT=0x0501)
  add_definitions(-DXML_STATIC)
  find_library(ws2_32_LIBRARY_PATH ws2_32)
@@ -231,13 +235,8 @@ find_package(Osmium REQUIRED COMPONENTS io)
 include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS})


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

 find_package(Threads REQUIRED)
@@ -248,7 +247,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})

@@ -298,8 +297,7 @@ set(EXTRACTOR_LIBRARIES
    ${OSMIUM_LIBRARIES}
    ${STXXL_LIBRARY}
    ${TBB_LIBRARIES}
-    ${ZLIB_LIBRARY}
-    ${MAYBE_COVERAGE_LIBRARIES})
+    ${ZLIB_LIBRARY})
 set(CONTRACTOR_LIBRARIES
    ${Boost_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
@@ -307,34 +305,37 @@ set(CONTRACTOR_LIBRARIES
    ${USED_LUA_LIBRARIES}
    ${STXXL_LIBRARY}
    ${TBB_LIBRARIES}
-    ${MAYBE_RT_LIBRARY}
-    ${MAYBE_COVERAGE_LIBRARIES})
+    ${MAYBE_RT_LIBRARY})
 set(ENGINE_LIBRARIES
    ${Boost_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
    ${STXXL_LIBRARY}
    ${TBB_LIBRARIES}
-    ${MAYBE_RT_LIBRARY}
-    ${MAYBE_COVERAGE_LIBRARIES})
+    ${MAYBE_RT_LIBRARY})
 set(STORAGE_LIBRARIES
    ${Boost_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
    ${TBB_LIBRARIES}
-    ${MAYBE_RT_LIBRARY}
-    ${MAYBE_COVERAGE_LIBRARIES})
+    ${MAYBE_RT_LIBRARY})
 set(UTIL_LIBRARIES
    ${Boost_LIBRARIES}
    ${CMAKE_THREAD_LIBS_INIT}
    ${STXXL_LIBRARY}
-    ${TBB_LIBRARIES}
-    ${MAYBE_COVERAGE_LIBRARIES})
+    ${TBB_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})

-if(BUILD_COMPONENTS)
+if(BUILD_TOOLS)
+  message(STATUS "Activating OSRM internal tools")
  find_package(GDAL)
  if(GDAL_FOUND)
    add_executable(osrm-components src/tools/components.cpp $<TARGET_OBJECTS:UTIL>)
@@ -345,10 +346,6 @@ if(BUILD_COMPONENTS)
  else()
    message(WARNING "libgdal and/or development headers not found")
  endif()
-endif()
-
-if(BUILD_TOOLS)
-  message(STATUS "Activating OSRM internal tools")
  add_executable(osrm-io-benchmark src/tools/io-benchmark.cpp $<TARGET_OBJECTS:UTIL>)
  target_link_libraries(osrm-io-benchmark ${Boost_LIBRARIES})
  add_executable(osrm-unlock-all src/tools/unlock_all_mutexes.cpp $<TARGET_OBJECTS:UTIL>)
@@ -384,10 +381,9 @@ set(EngineHeader include/engine/status.hpp include/engine/engine_config.hpp incl
 set(UtilHeader include/util/coordinate.hpp include/util/json_container.hpp include/util/typedefs.hpp include/util/strong_typedef.hpp)
 set(ExtractorHeader include/extractor/extractor.hpp include/extractor/extractor_config.hpp include/extractor/travel_mode.hpp)
 set(ContractorHeader include/contractor/contractor.hpp include/contractor/contractor_config.hpp)
-set(StorageHeader include/storage/storage.hpp include/storage/storage_config.hpp)
+#set(StorageHeader include/storage/storage.hpp include/storage/storage_config.hpp)
 install(FILES ${EngineHeader} DESTINATION include/osrm/engine)
 install(FILES ${UtilHeader} DESTINATION include/osrm/util)
-install(FILES ${StorageHeader} DESTINATION include/osrm/storage)
 install(FILES ${ExtractorHeader} DESTINATION include/osrm/extractor)
 install(FILES ${ContractorHeader} DESTINATION include/osrm/contractor)
 install(FILES ${LibraryGlob} DESTINATION include/osrm)
@@ -449,8 +445,3 @@ 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)
@@ -18,7 +18,6 @@ RECURSIVE              = YES

 EXCLUDE                = @CMAKE_CURRENT_SOURCE_DIR@/third_party \
                         @CMAKE_CURRENT_SOURCE_DIR@/build \
-                         @CMAKE_CURRENT_SOURCE_DIR@/node_modules \
                         @CMAKE_CURRENT_SOURCE_DIR@/unit_tests \
 			 @CMAKE_CURRENT_SOURCE_DIR@/benchmarks \
                         @CMAKE_CURRENT_SOURCE_DIR@/features
@@ -0,0 +1,7 @@
+source "http://rubygems.org"
+
+gem "cucumber"
+gem "rake"
+gem "osmlib-base"
+gem "sys-proctable"
+gem "rspec-expectations"
@@ -0,0 +1,35 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (3.2.2)
+    cucumber (2.0.0)
+      builder (>= 2.1.2)
+      cucumber-core (~> 1.1.3)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.1.3)
+      gherkin (~> 2.12.0)
+    diff-lcs (1.2.5)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    multi_json (1.11.0)
+    multi_test (0.1.2)
+    osmlib-base (0.1.4)
+    rake (10.4.2)
+    rspec-expectations (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    sys-proctable (0.9.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber
+  osmlib-base
+  rake
+  rspec-expectations
+  sys-proctable
@@ -10,7 +10,6 @@ The Open Source Routing Machine is a high performance routing engine written in
 | Linux        | develop | [![Build Status](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=develop)](https://travis-ci.org/Project-OSRM/osrm-backend) |
 | Windows      | master/develop | [![Build status](https://ci.appveyor.com/api/projects/status/4iuo3s9gxprmcjjh)](https://ci.appveyor.com/project/DennisOSRM/osrm-backend) |
 | LUAbind fork | master  | [![Build Status](https://travis-ci.org/DennisOSRM/luabind.png?branch=master)](https://travis-ci.org/DennisOSRM/luabind) |
-| Coverage     | develop | [![Coverage Status](https://coveralls.io/repos/github/Project-OSRM/osrm-backend/badge.svg?branch=develop)](https://coveralls.io/github/Project-OSRM/osrm-backend?branch=develop) |

 ## Building

@@ -0,0 +1,190 @@
+require 'OSM/StreamParser'
+require 'socket'
+require 'digest/sha1'
+require 'cucumber/rake/task'
+require 'sys/proctable'
+
+BUILD_FOLDER = 'build'
+DATA_FOLDER = 'sandbox'
+PROFILE = 'bicycle'
+OSRM_PORT = 5000
+PROFILES_FOLDER = '../profiles'
+
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = %w{--format pretty}
+end
+
+areas = {
+  :kbh => { :country => 'denmark', :bbox => 'top=55.6972 left=12.5222 right=12.624 bottom=55.6376' },
+  :frd => { :country => 'denmark', :bbox => 'top=55.7007 left=12.4765 bottom=55.6576 right=12.5698' },
+  :regh => { :country => 'denmark', :bbox => 'top=56.164 left=11.792 bottom=55.403 right=12.731' },
+  :denmark => { :country => 'denmark', :bbox => nil },
+  :skaane => { :country => 'sweden', :bbox => 'top=56.55 left=12.4 bottom=55.3 right=14.6' }
+}
+
+
+
+osm_data_area_name = ARGV[1] ? ARGV[1].to_s.to_sym : :kbh
+raise "Unknown data area." unless areas[osm_data_area_name]
+osm_data_country = areas[osm_data_area_name][:country]
+osm_data_area_bbox = areas[osm_data_area_name][:bbox]
+
+
+task osm_data_area_name.to_sym {}   #define empty task to prevent rake from whining. will break if area has same name as a task
+
+
+def each_process name, &block
+  Sys::ProcTable.ps do |process|
+    if process.comm.strip == name.strip && process.state != 'zombie'
+      yield process.pid.to_i, process.state.strip
+    end
+  end
+end
+
+def up?
+  find_pid('osrm-routed') != nil
+end
+
+def find_pid name
+  each_process(name) { |pid,state| return pid.to_i }
+  return nil
+end
+
+def wait_for_shutdown name
+  timeout = 10
+  (timeout*10).times do
+    return if find_pid(name) == nil
+    sleep 0.1
+  end
+  raise "*** Could not terminate #{name}."
+end
+
+
+desc "Rebuild and run tests."
+task :default => [:build]
+
+desc "Build using CMake."
+task :build do
+  if Dir.exists? BUILD_FOLDER
+    Dir.chdir BUILD_FOLDER do
+      system "make"
+    end
+  else
+    system "mkdir build; cd build; cmake ..; make"
+  end
+end
+
+desc "Setup config files."
+task :setup do
+end
+
+desc "Download OSM data."
+task :download do
+  Dir.mkdir "#{DATA_FOLDER}" unless File.exist? "#{DATA_FOLDER}"
+  puts "Downloading..."
+  puts "curl http://download.geofabrik.de/europe/#{osm_data_country}-latest.osm.pbf -o #{DATA_FOLDER}/#{osm_data_country}.osm.pbf"
+  raise "Error while downloading data." unless system "curl http://download.geofabrik.de/europe/#{osm_data_country}-latest.osm.pbf -o #{DATA_FOLDER}/#{osm_data_country}.osm.pbf"
+  if osm_data_area_bbox
+    puts "Cropping and converting to protobuffer..."
+    raise "Error while cropping data." unless system "osmosis --read-pbf file=#{DATA_FOLDER}/#{osm_data_country}.osm.pbf --bounding-box #{osm_data_area_bbox} --write-pbf file=#{DATA_FOLDER}/#{osm_data_area_name}.osm.pbf omitmetadata=true"
+  end
+end
+
+desc "Crop OSM data"
+task :crop do
+  if osm_data_area_bbox
+    raise "Error while cropping data." unless system "osmosis --read-pbf file=#{DATA_FOLDER}/#{osm_data_country}.osm.pbf --bounding-box #{osm_data_area_bbox} --write-pbf file=#{DATA_FOLDER}/#{osm_data_area_name}.osm.pbf omitmetadata=true"
+  end
+end
+
+desc "Reprocess OSM data."
+task :process => [:extract,:contract] do
+end
+
+desc "Extract OSM data."
+task :extract do
+  Dir.chdir DATA_FOLDER do
+    raise "Error while extracting data." unless system "../#{BUILD_FOLDER}/osrm-extract #{osm_data_area_name}.osm.pbf --profile ../profiles/#{PROFILE}.lua"
+  end
+end
+
+desc "Contract OSM data."
+task :contract do
+  Dir.chdir DATA_FOLDER do
+    raise "Error while contracting data." unless system "../#{BUILD_FOLDER}/osrm-contract #{osm_data_area_name}.osrm"
+  end
+end
+
+desc "Delete preprocessing files."
+task :clean do
+  File.delete *Dir.glob("#{DATA_FOLDER}/*.osrm")
+  File.delete *Dir.glob("#{DATA_FOLDER}/*.osrm.*")
+end
+
+desc "Run all cucumber test"
+task :test do
+  system "cucumber"
+  puts
+end
+
+desc "Run the routing server in the terminal. Press Ctrl-C to stop."
+task :run do
+  Dir.chdir DATA_FOLDER do
+    system "../#{BUILD_FOLDER}/osrm-routed #{osm_data_area_name}.osrm --port #{OSRM_PORT}"
+  end
+end
+
+desc "Launch the routing server in the background. Use rake:down to stop it."
+task :up do
+  Dir.chdir DATA_FOLDER do
+    abort("Already up.") if up?
+    pipe = IO.popen("../#{BUILD_FOLDER}/osrm-routed #{osm_data_area_name}.osrm --port #{OSRM_PORT} 1>>osrm-routed.log 2>>osrm-routed.log")
+    timeout = 5
+    (timeout*10).times do
+      begin
+        socket = TCPSocket.new('localhost', OSRM_PORT)
+        socket.puts 'ping'
+      rescue Errno::ECONNREFUSED
+        sleep 0.1
+      end
+    end
+  end
+end
+
+desc "Stop the routing server."
+task :down do
+  pid = find_pid 'osrm-routed'
+  if pid
+    Process.kill 'TERM', pid
+  else
+    puts "Already down."
+  end 
+end
+
+desc "Kill all osrm-extract, osrm-contract and osrm-routed processes."
+task :kill do
+  each_process('osrm-routed') { |pid,state| Process.kill 'KILL', pid }
+  each_process('osrm-contract') { |pid,state| Process.kill 'KILL', pid }
+  each_process('osrm-extract') { |pid,state| Process.kill 'KILL', pid }
+  wait_for_shutdown 'osrm-routed'
+  wait_for_shutdown 'osrm-contract'
+  wait_for_shutdown 'osrm-extract'  
+end
+
+desc "Get PIDs of all osrm-extract, osrm-contract and osrm-routed processes."
+task :pid do
+  each_process 'osrm-routed' do |pid,state|
+    puts "#{pid}\t#{state}"
+  end
+end
+
+desc "Stop, reprocess and restart."
+task :update => [:down,:process,:up] do
+end
+
+
+desc "Remove test cache files."
+task :sweep do
+  system "rm test/cache/*"
+end
+
@@ -8,39 +8,16 @@ SET PROJECT_DIR=%CD%
 ECHO PROJECT_DIR^: %PROJECT_DIR%
 ECHO NUMBER_OF_PROCESSORS^: %NUMBER_OF_PROCESSORS%
 ECHO cmake^: && cmake --version
-IF %ERRORLEVEL% NEQ 0 ECHO CMAKE not found GOTO ERROR
-
-FOR /F %%G IN ("--version") DO cmake %%G 2>&1 | findstr /C:"3.5.0" > nul && goto CMAKE_NOT_OK
-GOTO CMAKE_OK
-
-:CMAKE_NOT_OK
-ECHO CMAKE NOT OK - downloading new CMake
-IF NOT EXIST cm.zip powershell Invoke-WebRequest https://cmake.org/files/v3.5/cmake-3.5.1-win32-x86.zip -OutFile $env:PROJECT_DIR\cm.zip
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-IF NOT EXIST cmake-3.5.1-win32-x86 7z -y x cm.zip | %windir%\system32\FIND "ing archive"
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-SET PATH=%PROJECT_DIR%\cmake-3.5.1-win32-x86\bin;%PATH%
-
-:CMAKE_OK
-ECHO CMAKE_OK
-cmake --version

 ECHO activating VS command prompt ...
 SET PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
 CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64

 ECHO platform^: %platform%
-
-ECHO cl.exe version
-cl
-ECHO msbuild version
-msbuild /version
-
 :: HARDCODE "x64" as it is uppercase on AppVeyor and download from S3 is case sensitive
 SET DEPSPKG=osrm-deps-win-x64-14.0.7z

 :: local development
-ECHO.
 ECHO LOCAL_DEV^: %LOCAL_DEV%
 IF NOT DEFINED LOCAL_DEV SET LOCAL_DEV=0
 IF DEFINED LOCAL_DEV IF %LOCAL_DEV% EQU 1 IF EXIST %DEPSPKG% ECHO skipping deps download && GOTO SKIPDL
@@ -56,39 +33,27 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR

 IF EXIST osrm-deps ECHO deleting osrm-deps... && RD /S /Q osrm-deps
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-IF EXIST build ECHO deleting build dir... && RD /S /Q build
+IF EXIST build ECHO deletings build dir... && RD /S /Q build
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR

 7z -y x %DEPSPKG% | %windir%\system32\FIND "ing archive"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR

-::tree osrm-deps
-
 MKDIR build
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 cd build
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR

-SET OSRMDEPSDIR=%PROJECT_DIR%/osrm-deps
+SET OSRMDEPSDIR=%PROJECT_DIR%\osrm-deps
 set PREFIX=%OSRMDEPSDIR%/libs
 set BOOST_ROOT=%OSRMDEPSDIR%/boost
-set BOOST_LIBRARYDIR=%BOOST_ROOT%/lib
 set TBB_INSTALL_DIR=%OSRMDEPSDIR%/tbb
 set TBB_ARCH_PLATFORM=intel64/vc14

-ECHO OSRMDEPSDIR       ^: %OSRMDEPSDIR%
-ECHO PREFIX            ^: %PREFIX%
-ECHO BOOST_ROOT        ^: %BOOST_ROOT%
-ECHO BOOST_LIBRARYDIR  ^: %BOOST_LIBRARYDIR%
-ECHO TBB_INSTALL_DIR   ^: %TBB_INSTALL_DIR%
-ECHO TBB_ARCH_PLATFORM ^: %TBB_ARCH_PLATFORM%
-
-
 ECHO calling cmake ....
 cmake .. ^
 -G "Visual Studio 14 2015 Win64" ^
 -DBOOST_ROOT=%BOOST_ROOT% ^
-DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% ^
 -DBoost_ADDITIONAL_VERSIONS=1.58 ^
 -DBoost_USE_MULTITHREADED=ON ^
 -DBoost_USE_STATIC_LIBS=ON ^
@@ -116,17 +81,14 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR

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

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

 IF NOT "%APPVEYOR_REPO_BRANCH%"=="develop" GOTO DONE
@@ -41,3 +41,9 @@ deploy:
  folder: /
  enable_ssl: true
  active_mode: false
+
+# notifications:
+#   - provider: HipChat
+#     auth_token:
+#       secure: boLE7BjcahdIUxv9jkN7U3F8iOASF+MkhtctlVoWJoo=
+#     room: Directions
@@ -11,8 +11,7 @@ SET CONFIGURATION=Release
 FOR /F "tokens=*" %%i in ('git rev-parse --abbrev-ref HEAD') do SET APPVEYOR_REPO_BRANCH=%%i
 ECHO APPVEYOR_REPO_BRANCH^: %APPVEYOR_REPO_BRANCH%

-::SET PATH=C:\mb\windows-builds-64\tmp-bin\cmake-3.5.0-win32-x86\bin;%PATH%
-SET PATH=C:\mb\windows-builds-64\tmp-bin\cmake-3.5.1-win32-x86\bin;%PATH%
+SET PATH=C:\mb\windows-builds-64\tmp-bin\cmake-3.4.0-win32-x86\bin;%PATH%
 SET PATH=C:\Program Files\7-Zip;%PATH%

 powershell Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force
@@ -1,5 +1,5 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-includedir=${prefix}/include
+includedir=${prefix}/include ${prefix}/include/osrm
 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} -I${includedir}/osrm
+Cflags: -I${includedir}
@@ -0,0 +1,9 @@
+# config/cucumber.yml
+##YAML Template
+---
+default: --require features --tags ~@todo --tags ~@bug --tag ~@stress
+verify: --require features --tags ~@todo --tags ~@bug --tags ~@stress -f progress
+jenkins: --require features --tags ~@todo --tags ~@bug --tags ~@stress --tags ~@options -f progress
+bugs: --require features --tags @bug
+todo: --require features --tags @todo
+all: --require features
@@ -1,11 +0,0 @@
-module.exports = {
-    default: '--require features --tags ~@stress --tags ~@todo',
-    verify: '--require features --tags ~@todo --tags ~@bug --tags ~@stress -f progress',
-    jenkins: '--require features --tags ~@todo --tags ~@bug --tags ~@stress --tags ~@options -f progress',
-    bugs: '--require features --tags @bug',
-    todo: '--require features --tags @todo',
-    all: '--require features'
-}
-
-
-
@@ -29,8 +29,7 @@ int main(int argc, const char *argv[]) try
    using namespace osrm;

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

    // Routing machine with several services (such as Route, Table, Nearest, Trip, Match)
@@ -5,7 +5,7 @@ Feature: Bike - Access tags on ways
    Background:
        Given the profile "bicycle"

-    Scenario: Bike - Access tag hierarchy on ways
+    Scenario: Bike - Access tag hierachy on ways
        Then routability should be
            | highway | access | vehicle | bicycle | bothw |
            |         |        |         |         | x     |
@@ -121,7 +121,6 @@ Feature: Bike - Access tags on ways
            | private      |              |              |       |
            | agricultural |              |              |       |
            | forestry     |              |              |       |
-            | delivery     |              |              |       |
            |              | yes          |              | x     |
            |              | permissive   |              | x     |
            |              | designated   |              | x     |
@@ -130,7 +129,6 @@ Feature: Bike - Access tags on ways
            |              | private      |              |       |
            |              | agricultural |              |       |
            |              | forestry     |              |       |
-            |              | delivery     |              |       |
            |              |              | yes          | x     |
            |              |              | permissive   | x     |
            |              |              | designated   | x     |
@@ -139,7 +137,6 @@ 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 hierarchy on nodes
+    Scenario: Bike - Access tag hierachy on nodes
        Then routability should be
            | node/access | node/vehicle | node/bicycle | node/highway  | bothw |
            |             |              |              |               | x     |
@@ -47,7 +47,6 @@ Feature: Bike - Access tags on nodes
            | private      |              |              |       |
            | agricultural |              |              |       |
            | forestry     |              |              |       |
-            | delivery     |              |              |       |
            |              | yes          |              | x     |
            |              | permissive   |              | x     |
            |              | designated   |              | x     |
@@ -56,7 +55,6 @@ Feature: Bike - Access tags on nodes
            |              | private      |              |       |
            |              | agricultural |              |       |
            |              | forestry     |              |       |
-            |              | delivery     |              |       |
            |              |              | yes          | x     |
            |              |              | permissive   | x     |
            |              |              | designated   | x     |
@@ -65,4 +63,3 @@ 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 |   |
@@ -17,15 +17,15 @@ Feature: Bike - Squares and other areas
            | abcda | yes  | residential |

        When I route I should get
-            | from | to | route       |
-            | a    | b  | abcda,abcda |
-            | a    | d  | abcda,abcda |
-            | b    | c  | abcda,abcda |
-            | c    | b  | abcda,abcda |
-            | c    | d  | abcda,abcda |
-            | d    | c  | abcda,abcda |
-            | d    | a  | abcda,abcda |
-            | a    | d  | abcda,abcda |
+            | from | to | route |
+            | a    | b  | abcda |
+            | a    | d  | abcda |
+            | b    | c  | abcda |
+            | c    | b  | abcda |
+            | c    | d  | abcda |
+            | d    | c  | abcda |
+            | d    | a  | abcda |
+            | a    | d  | abcda |

    @building
    Scenario: Bike - Don't route on buildings
@@ -41,16 +41,16 @@ Feature: Bike - Squares and other areas

        When I route I should get
            | from | to | route |
-            | a    | b  | xa,xa |
-            | a    | d  | xa,xa |
-            | b    | c  | xa,xa |
-            | c    | b  | xa,xa |
-            | c    | d  | xa,xa |
-            | d    | c  | xa,xa |
-            | d    | a  | xa,xa |
-            | a    | d  | xa,xa |
+            | a    | b  | xa    |
+            | a    | d  | xa    |
+            | b    | c  | xa    |
+            | c    | b  | xa    |
+            | c    | d  | xa    |
+            | d    | c  | xa    |
+            | d    | a  | xa    |
+            | a    | d  | xa    |

-    @parking @mokob @2154
+    @parking
    Scenario: Bike - parking areas
        Given the node map
            | e |   |   | f |
@@ -65,20 +65,19 @@ Feature: Bike - Squares and other areas
            | abcda | (nil)   | parking |

        When I route I should get
-            | from | to | route          |
-            | x    | y  | xa,abcda,by,by |
-            | y    | x  | by,abcda,xa,xa |
-            | a    | b  | abcda,abcda    |
-            | a    | d  | abcda,abcda    |
-            | b    | c  | abcda,abcda    |
-            | c    | b  | abcda,abcda    |
-            | c    | d  | abcda,abcda    |
-            | d    | c  | abcda,abcda    |
-            | d    | a  | abcda,abcda    |
-            | a    | d  | abcda,abcda    |
+            | from | to | route       |
+            | x    | y  | xa,abcda,by |
+            | y    | x  | by,abcda,xa |
+            | a    | b  | abcda       |
+            | a    | d  | abcda       |
+            | b    | c  | abcda       |
+            | c    | b  | abcda       |
+            | c    | d  | abcda       |
+            | d    | c  | abcda       |
+            | d    | a  | abcda       |
+            | a    | d  | abcda       |

-
-    @train @platform @mokob @2154
+    @train @platform
    Scenario: Bike - railway platforms
        Given the node map
            | x | a | b | y |
@@ -91,14 +90,14 @@ Feature: Bike - Squares and other areas
            | abcda | (nil)   | platform |

        When I route I should get
-            | from | to | route          |
-            | x    | y  | xa,abcda,by,by |
-            | y    | x  | by,abcda,xa,xa |
-            | a    | b  | abcda,abcda    |
-            | a    | d  | abcda,abcda    |
-            | b    | c  | abcda,abcda    |
-            | c    | b  | abcda,abcda    |
-            | c    | d  | abcda,abcda    |
-            | d    | c  | abcda,abcda    |
-            | d    | a  | abcda,abcda    |
-            | a    | d  | abcda,abcda    |
+            | from | to | route       |
+            | x    | y  | xa,abcda,by |
+            | y    | x  | by,abcda,xa |
+            | a    | b  | abcda       |
+            | a    | d  | abcda       |
+            | b    | c  | abcda       |
+            | c    | b  | abcda       |
+            | c    | d  | abcda       |
+            | d    | c  | abcda       |
+            | d    | a  | abcda       |
+            | a    | d  | abcda       |
@@ -1,10 +1,10 @@
@routing @bicycle @bridge
-Feature: Bicycle - Handle cycling
+Feature: Bicycle - Handle movable bridge

    Background:
        Given the profile "bicycle"

-    Scenario: Bicycle - Use a ferry route
+    Scenario: Car - Use a ferry route
        Given the node map
            | a | b | c |   |   |
            |   |   | d |   |   |
@@ -17,17 +17,17 @@ Feature: Bicycle - Handle cycling
            | efg   | primary |         |         |

        When I route I should get
-            | from | to | route           | modes                                  |
-            | a    | g  | abc,cde,efg,efg | cycling,cycling,cycling,cycling |
-            | b    | f  | abc,cde,efg,efg | cycling,cycling,cycling,cycling |
-            | e    | c  | cde,cde         | cycling,cycling          |
-            | e    | b  | cde,abc,abc     | cycling,cycling,cycling         |
-            | e    | a  | cde,abc,abc     | cycling,cycling,cycling         |
-            | c    | e  | cde,cde         | cycling,cycling          |
-            | c    | f  | cde,efg,efg     | cycling,cycling,cycling         |
-            | c    | g  | cde,efg,efg     | cycling,cycling,cycling         |
+            | from | to | route       | modes |
+            | a    | g  | abc,cde,efg | 1,5,1 |
+            | b    | f  | abc,cde,efg | 1,5,1 |
+            | e    | c  | cde         | 5     |
+            | e    | b  | cde,abc     | 5,1   |
+            | e    | a  | cde,abc     | 5,1   |
+            | c    | e  | cde         | 5     |
+            | c    | f  | cde,efg     | 5,1   |
+            | c    | g  | cde,efg     | 5,1   |

-    Scenario: Bicycle - Properly handle durations
+    Scenario: Car - Properly handle durations
        Given the node map
            | a | b | c |   |   |
            |   |   | d |   |   |
@@ -40,8 +40,8 @@ Feature: Bicycle - Handle cycling
            | efg   | primary |         |          |

        When I route I should get
-            | from | to | route           | modes                                  | speed  |
-            | a    | g  | abc,cde,efg,efg | cycling,cycling,cycling,cycling | 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 |
+            | from | to | route       | modes | speed   |
+            | a    | g  | abc,cde,efg | 1,5,1 | 5 km/h |
+            | b    | f  | abc,cde,efg | 1,5,1 | 4 km/h |
+            | c    | e  | cde         | 5     | 2 km/h |
+            | e    | c  | cde         | 5     | 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,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  |
+            | 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   |

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

    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,de |
-            | e    | a  | de,cd,bc,ab,ab |
-            | b    | d  | bc,cd,cd       |
-            | d    | b  | cd,bc,bc       |
+            | from | to | route       |
+            | a    | e  | ab,bc,cd,de |
+            | e    | a  | de,cd,bc,ab |
+            | b    | d  | bc,cd       |
+            | d    | b  | cd,bc       |
@@ -17,15 +17,15 @@ Feature: Bike - Handle ferry routes
            | efg   | primary |       |         |

        When I route I should get
-            | from | to | route           |
-            | a    | g  | abc,cde,efg,efg |
-            | b    | f  | abc,cde,efg,efg |
-            | e    | c  | cde,cde         |
-            | e    | b  | cde,abc,abc     |
-            | e    | a  | cde,abc,abc     |
-            | c    | e  | cde,cde         |
-            | c    | f  | cde,efg,efg     |
-            | c    | g  | cde,efg,efg     |
+            | from | to | route       |
+            | a    | g  | abc,cde,efg |
+            | b    | f  | abc,cde,efg |
+            | e    | c  | cde         |
+            | e    | b  | cde,abc     |
+            | e    | a  | cde,abc     |
+            | c    | e  | cde         |
+            | c    | f  | cde,efg     |
+            | c    | g  | cde,efg     |

    Scenario: Bike - Ferry duration, single node
        Given the node map
@@ -59,5 +59,5 @@ Feature: Bike - Handle ferry routes

        When I route I should get
            | from | to | route | time       |
-            | a    | d  | abcd,abcd  | 3600s +-10 |
-            | d    | a  | abcd,abcd  | 3600s +-10 |
+            | a    | d  | abcd  | 3600s +-10 |
+            | d    | a  | abcd  | 3600s +-10 |
@@ -48,9 +48,9 @@ Feature: Bike - Max speed restrictions
            | bc    | residential | 80       |

        When I route I should get
-            | from | to | route    | speed   |
-            | a    | b  | ab,ab    | 15 km/h |
-            | b    | c  | bc,bc    | 15 km/h |
+            | from | to | route | speed   |
+            | a    | b  | ab    | 15 km/h |
+            | b    | c  | bc    | 15 km/h |

    Scenario: Bike - Forward/backward maxspeed
        Given the shortcuts
@@ -1,9 +1,15 @@
@routing @bicycle @mode
 Feature: Bike - Mode flag

+# bicycle modes:
+# 1 bike
+# 2 pushing
+# 3 ferry
+# 4 train
+
 	Background:
 		Given the profile "bicycle"
-
+    
    Scenario: Bike - Mode when using a ferry
    	Given the node map
    	 | a | b |   |
@@ -16,13 +22,13 @@ Feature: Bike - Mode flag
    	 | cd    | primary |       |          |

    	When I route I should get
-    	 | from | to | route       | modes                         |
-    	 | a    | d  | ab,bc,cd,cd | cycling,ferry,cycling,cycling |
-    	 | d    | a  | cd,bc,ab,ab | cycling,ferry,cycling,cycling |
-    	 | c    | a  | bc,ab,ab    | ferry,cycling,cycling         |
-    	 | d    | b  | cd,bc,bc    | cycling,ferry,ferry           |
-    	 | a    | c  | ab,bc,bc    | cycling,ferry,ferry           |
-    	 | b    | d  | bc,cd,cd    | ferry,cycling,cycling         |
+    	 | from | to | route    | turns                       | modes |
+    	 | a    | d  | ab,bc,cd | head,right,left,destination | 1,3,1 |
+    	 | d    | a  | cd,bc,ab | head,right,left,destination | 1,3,1 |
+    	 | c    | a  | bc,ab    | head,left,destination       | 3,1   |
+    	 | d    | b  | cd,bc    | head,right,destination      | 1,3   |
+    	 | a    | c  | ab,bc    | head,right,destination      | 1,3   |
+    	 | b    | d  | bc,cd    | head,left,destination       | 3,1   |

     Scenario: Bike - Mode when using a train
     	Given the node map
@@ -36,13 +42,13 @@ Feature: Bike - Mode flag
     	 | cd    | primary |         |         |

     	When I route I should get
-     	 | from | to | route       | modes                         |
-     	 | a    | d  | ab,bc,cd,cd | cycling,train,cycling,cycling |
-     	 | d    | a  | cd,bc,ab,ab | cycling,train,cycling,cycling |
-     	 | c    | a  | bc,ab,ab    | train,cycling,cycling         |
-     	 | d    | b  | cd,bc,bc    | cycling,train,train           |
-     	 | a    | c  | ab,bc,bc    | cycling,train,train           |
-     	 | b    | d  | bc,cd,cd    | train,cycling,cycling         |
+     	 | from | to | route    | turns                       | modes |
+     	 | a    | d  | ab,bc,cd | head,right,left,destination | 1,4,1 |
+     	 | d    | a  | cd,bc,ab | head,right,left,destination | 1,4,1 |
+     	 | c    | a  | bc,ab    | head,left,destination       | 4,1   |
+     	 | d    | b  | cd,bc    | head,right,destination      | 1,4   |
+     	 | a    | c  | ab,bc    | head,right,destination      | 1,4   |
+     	 | b    | d  | bc,cd    | head,left,destination       | 4,1   |

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

     	When I route I should get
-     	 | from | to | route       | modes                                |
-     	 | a    | d  | ab,bc,cd,cd | cycling,cycling,cycling,cycling      |
-     	 | d    | a  | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling |
-     	 | c    | a  | bc,ab,ab    | pushing bike,cycling,cycling         |
-     	 | d    | b  | cd,bc,bc    | cycling,pushing bike,pushing bike    |
-     	 | a    | c  | ab,bc,bc    | cycling,cycling,cycling              |
-     	 | b    | d  | bc,cd,cd    | cycling,cycling,cycling              |
+     	 | from | to | route    | turns                                      | modes |
+     	 | a    | d  | ab,bc,cd | head,straight,straight,destination         | 1,1,1 |
+     	 | d    | a  | cd,bc,ab | head,right,left,destination                | 1,2,1 |
+     	 | c    | a  | bc,ab    | head,left,destination                      | 2,1   |
+     	 | d    | b  | cd,bc    | head,right,destination                     | 1,2   |
+     	 | a    | c  | ab,bc    | head,straight,destination                  | 1,1   |
+     	 | b    | d  | bc,cd    | head,straight,destination                  | 1,1   |

     Scenario: Bike - Mode when pushing on pedestrain streets
     	Given the node map
@@ -76,13 +82,13 @@ Feature: Bike - Mode flag
     	 | cd    | primary    |

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

     Scenario: Bike - Mode when pushing on pedestrain areas
     	Given the node map
@@ -96,13 +102,13 @@ Feature: Bike - Mode flag
     	 | df    | primary    |      |

     	When I route I should get
-     	 | from | to | route        | modes                                |
-     	 | a    | f  | ab,bcd,df,df | cycling,pushing bike,cycling,cycling |
-     	 | f    | a  | df,bcd,ab,ab | cycling,pushing bike,cycling,cycling |
-     	 | d    | a  | bcd,ab,ab    | pushing bike,cycling,cycling         |
-     	 | f    | b  | df,bcd,bcd   | cycling,pushing bike,pushing bike    |
-     	 | a    | d  | ab,bcd,bcd   | cycling,pushing bike,pushing bike    |
-     	 | b    | f  | bcd,df,df    | pushing bike,cycling,cycling         |
+     	 | from | to | route     | modes |
+     	 | a    | f  | ab,bcd,df | 1,2,1 |
+     	 | f    | a  | df,bcd,ab | 1,2,1 |
+     	 | d    | a  | bcd,ab    | 2,1   |
+     	 | f    | b  | df,bcd    | 1,2   |
+     	 | a    | d  | ab,bcd    | 1,2   |
+     	 | b    | f  | bcd,df    | 2,1   |

     Scenario: Bike - Mode when pushing on steps
     	Given the node map
@@ -116,13 +122,13 @@ Feature: Bike - Mode flag
    	 | cd    | primary |

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

     Scenario: Bike - Mode when bicycle=dismount
     	Given the node map
@@ -136,13 +142,13 @@ Feature: Bike - Mode flag
    	 | cd    | primary |          |

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

    Scenario: Bicycle - Modes when starting on forward oneway
        Given the node map
@@ -153,9 +159,9 @@ Feature: Bike - Mode flag
         | ab    | yes    |

        When I route I should get
-         | from | to | route | modes                     |
-         | a    | b  | ab,ab | cycling,cycling           |
-         | b    | a  | ab,ab | pushing bike,pushing bike |
+         | from | to | route | modes |
+         | a    | b  | ab    | 1     |
+         | b    | a  | ab    | 2     |

    Scenario: Bicycle - Modes when starting on reverse oneway
        Given the node map
@@ -166,6 +172,6 @@ Feature: Bike - Mode flag
         | ab    | -1     |

        When I route I should get
-         | from | to | route | modes                     |
-         | a    | b  | ab,ab | pushing bike,pushing bike |
-         | b    | a  | ab,ab | cycling,cycling           |
+         | from | to | route | modes |
+         | a    | b  | ab    | 2     |
+         | b    | a  | ab    | 1     |
@@ -15,8 +15,8 @@ Feature: Bike - Street names in instructions
            | bc    | Your Way |

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

    @unnamed
    Scenario: Bike - Use way type to describe unnamed ways
@@ -29,5 +29,5 @@ Feature: Bike - Street names in instructions
            | bcd   | track    |      |

        When I route I should get
-            | from | to | route                                              |
-            | a    | d  | {highway:cycleway},{highway:track},{highway:track} |
+            | from | to | route                              |
+            | a    | d  | {highway:cycleway},{highway:track} |
@@ -29,9 +29,9 @@ Feature: Bike - Oneway streets
            | da    |        | no   |

        When I route I should get
-            | from | to | route       |
-            | a    | b  | ab,ab       |
-            | b    | a  | bc,cd,da,da |
+            | from | to | route    |
+            | a    | b  | ab       |
+            | b    | a  | bc,cd,da |

    Scenario: Bike - Handle various oneway tag values
        Then routability should be
@@ -124,5 +124,5 @@ Feature: Bike - Oneway streets


        When I route I should get
-            | from | to | route    |
-            | a    | c  | ab,bc,bc |
+            | from | to | route |
+            | a    | c  | ab,bc |
@@ -32,7 +32,7 @@ Feature: Bike - Accessability of different way types
            | primary    | -1     | foot | bike  |
            | pedestrian | -1     | foot | foot  |

-    @square
+    @square    
    Scenario: Bike - Push bikes on pedestrian areas
        Given the node map
            | x |   |
@@ -46,14 +46,14 @@ Feature: Bike - Accessability of different way types

        When I route I should get
            | from | to | route |
-            | a    | b  | abcda,abcda |
-            | a    | d  | abcda,abcda |
-            | b    | c  | abcda,abcda |
-            | c    | b  | abcda,abcda |
-            | c    | d  | abcda,abcda |
-            | d    | c  | abcda,abcda |
-            | d    | a  | abcda,abcda |
-            | a    | d  | abcda,abcda |
+            | a    | b  | abcda |
+            | a    | d  | abcda |
+            | b    | c  | abcda |
+            | c    | b  | abcda |
+            | c    | d  | abcda |
+            | d    | c  | abcda |
+            | d    | a  | abcda |
+            | a    | d  | abcda |

    Scenario: Bike - Pushing bikes on ways with foot=yes
        Then routability should be
@@ -62,7 +62,8 @@ Feature: Bike - Accessability of different way types
            | motorway | yes  | foot |       |
            | runway   |      |      |       |
            | runway   | yes  | foot | foot  |
-
+    
+    @todo
    Scenario: Bike - Pushing bikes on ways with foot=yes in one direction
        Then routability should be
            | highway  | foot:forward | foot:backward | forw | backw |
@@ -71,20 +72,20 @@ Feature: Bike - Accessability of different way types
            | motorway |              | yes           |      | foot  |

    @construction
-    Scenario: Bike - Don't allow routing on ways still under construction
+    Scenario: Bike - Don't allow routing on ways still under construction 
        Then routability should be
            | highway      | foot | bicycle | bothw |
            | primary      |      |         | x     |
            | construction |      |         |       |
            | construction | yes  |         |       |
            | construction |      | yes     |       |
-
+        
    @roundabout
    Scenario: Bike - Don't push bikes against oneway flow on roundabouts
        Then routability should be
            | junction   | forw | backw |
            | roundabout | x    |       |
-
+ 
    Scenario: Bike - Instructions when pushing bike on oneways
        Given the node map
            | a | b |   |
@@ -97,12 +98,13 @@ Feature: Bike - Accessability of different way types
            | cd    | primary |        |

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

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

        When I route I should get
-            | from | to | route       | modes                                |
-            | a    | d  | ab,bc,cd,cd | cycling,pushing bike,cycling,cycling |
-            | d    | a  | cd,bc,ab,ab | cycling,pushing bike,cycling,cycling |
-            | c    | a  | bc,ab,ab    | pushing bike,cycling,cycling         |
-            | d    | b  | cd,bc,bc    | cycling,pushing bike,pushing bike    |
+            | from | to | route    | turns                       |
+            | a    | d  | ab,bc,cd | head,right,left,destination |
+            | d    | a  | cd,bc,ab | head,right,left,destination |
+            | c    | a  | bc,ab    | head,left,destination       |
+            | d    | b  | cd,bc    | head,right,destination      |
@@ -13,8 +13,8 @@ Feature: Bike - Way ref
            | ab    | Utopia Drive | E7  |

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

    Scenario: Bike - Way with only ref
        Given the node map
@@ -26,7 +26,7 @@ Feature: Bike - Way ref

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

    Scenario: Bike - Way with only name
        Given the node map
@@ -37,5 +37,5 @@ Feature: Bike - Way ref
            | ab    | Utopia Drive |

        When I route I should get
-            | from | to | route                     |
-            | a    | b  | Utopia Drive,Utopia Drive |
+            | from | to | route        |
+            | a    | b  | Utopia Drive |
@@ -25,10 +25,10 @@ Feature: Bike - Turn restrictions
            | restriction | sj       | wj     | j        | no_left_turn |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @no_turning
    Scenario: Bike - No right turn
@@ -49,10 +49,10 @@ Feature: Bike - Turn restrictions
            | restriction | sj       | ej     | j        | no_right_turn |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @no_turning
    Scenario: Bike - No u-turn
@@ -73,10 +73,10 @@ Feature: Bike - Turn restrictions
            | restriction | sj       | wj     | j        | no_u_turn   |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @no_turning
    Scenario: Bike - Handle any no_* relation
@@ -97,10 +97,10 @@ Feature: Bike - Turn restrictions
            | restriction | sj       | wj     | j        | no_weird_zigzags |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @only_turning
    Scenario: Bike - Only left turn
@@ -121,10 +121,10 @@ Feature: Bike - Turn restrictions
            | restriction | sj       | wj     | j        | only_left_turn |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @only_turning
    Scenario: Bike - Only right turn
@@ -145,10 +145,10 @@ Feature: Bike - Turn restrictions
            | restriction | sj       | ej     | j        | only_right_turn |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @only_turning
    Scenario: Bike - Only straight on
@@ -169,10 +169,10 @@ Feature: Bike - Turn restrictions
            | restriction | sj       | nj     | j        | only_straight_on |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @no_turning
    Scenario: Bike - Handle any only_* restriction
@@ -193,10 +193,10 @@ Feature: Bike - Turn restrictions
            | restriction | sj       | nj     | j        | only_weird_zigzags |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @except
    Scenario: Bike - Except tag and on no_ restrictions
@@ -222,11 +222,11 @@ Feature: Bike - Turn restrictions
            | restriction | sj       | dj     | j        | no_right_turn | bicycle |

        When I route I should get
-            | from | to | route    |
-            | s    | a  | sj,aj,aj |
-            | s    | b  | sj,bj,bj |
-            | s    | c  | sj,cj,cj |
-            | s    | d  | sj,dj,dj |
+            | from | to | route |
+            | s    | a  | sj,aj |
+            | s    | b  | sj,bj |
+            | s    | c  | sj,cj |
+            | s    | d  | sj,dj |

    @except
    Scenario: Bike - Except tag and on only_ restrictions
@@ -246,9 +246,9 @@ Feature: Bike - Turn restrictions
            | restriction | sj       | aj     | j        | only_straight_on | bicycle |

        When I route I should get
-            | from | to | route    |
-            | s    | a  | sj,aj,aj |
-            | s    | b  | sj,bj,bj |
+            | from | to | route |
+            | s    | a  | sj,aj |
+            | s    | b  | sj,bj |

    @except
    Scenario: Bike - Multiple except tag values
@@ -280,10 +280,10 @@ Feature: Bike - Turn restrictions
            | restriction | sj       | jf     | j        | no_straight_on | bicycle, bus     |

        When I route I should get
-            | from | to | route    |
-            | s    | a  | sj,ja,ja |
-            | s    | b  | sj,jb,jb |
-            | s    | c  | sj,jc,jc |
-            | s    | d  | sj,jd,jd |
-            | s    | e  | sj,je,je |
-            | s    | f  | sj,jf,jf |
+            | from | to | route |
+            | s    | a  | sj,ja |
+            | s    | b  | sj,jb |
+            | s    | c  | sj,jc |
+            | s    | d  | sj,jd |
+            | s    | e  | sj,je |
+            | s    | f  | sj,jf |
@@ -0,0 +1,30 @@
+@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 | head,enter_roundabout-1,destination |
+            | s    | u  | sa,uc | head,enter_roundabout-2,destination |
+            | s    | v  | sa,vd | head,enter_roundabout-3,destination |
+            | u    | v  | uc,vd | head,enter_roundabout-1,destination |
+            | u    | s  | uc,sa | head,enter_roundabout-2,destination |
+            | u    | t  | uc,tb | head,enter_roundabout-3,destination |
@@ -31,7 +31,7 @@ Feature: Bike - Stop areas for public transport
            | public_transport | stop_area        | c         | st           |

        When I route I should get
-            | from | to | route              |
-            | a    | d  | abcd,abcd          |
-            | s    | t  | st,st              |
-            | s    | d  | /st,.+,abcd/,abcd/ |
+            | from | to | route        |
+            | a    | d  | abcd         |
+            | s    | t  | st           |
+            | s    | d  | /st,.+,abcd/ |
@@ -23,11 +23,11 @@ Feature: Turn Penalties
            | jg    |

        When I route I should get
-            | from | to | route    | time    | distance |
-            | s    | a  | sj,ja,ja | 39s +-1 | 242m +-1 |
-            | s    | b  | sj,jb,jb | 30s +-1 | 200m +-1 |
-            | s    | c  | sj,jc,jc | 29s +-1 | 242m +-1 |
-            | s    | d  | sj,jd,jd | 20s +-1 | 200m +-1 |
-            | s    | e  | sj,je,je | 29s +-1 | 242m +-1 |
-            | s    | f  | sj,jf,jf | 30s +-1 | 200m +-1 |
-            | s    | g  | sj,jg,jg | 39s +-1 | 242m +-1 |
+            | from | to | route | time    | distance |
+            | s    | a  | sj,ja | 39s +-1 | 242m +-1 |
+            | s    | b  | sj,jb | 30s +-1 | 200m +-1 |
+            | s    | c  | sj,jc | 29s +-1 | 242m +-1 |
+            | s    | d  | sj,jd | 20s +-1 | 200m +-1 |
+            | s    | e  | sj,je | 29s +-1 | 242m +-1 |
+            | s    | f  | sj,jf | 30s +-1 | 200m +-1 |
+            | s    | g  | sj,jg | 39s +-1 | 242m +-1 |
@@ -5,7 +5,7 @@ Feature: Car - Restricted access
    Background:
        Given the profile "car"

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


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

    Scenario: Car - Access tags on both node and way
@@ -17,8 +17,8 @@ OSRM will use 4/5 of the projected free-flow speed.

        When I route I should get
            | from | to | route | speed        |
-            | a    | b  | ab,ab | 47 km/h +- 1 |
-            | b    | c  | bc,bc | 47 km/h +- 1 |
+            | a    | b  | ab    | 47 km/h +- 1 |
+            | b    | c  | bc    | 47 km/h +- 1 |

    Scenario: Car - Advisory speed overwrites forward maxspeed
        Given the node map
@@ -31,10 +31,9 @@ OSRM will use 4/5 of the projected free-flow speed.

        When I route I should get
            | from | to | route | speed        |
-            | a    | b  | ab,ab | 47 km/h +- 1 |
-            | b    | c  | bc,bc | 47 km/h +- 1 |
+            | a    | b  | ab    | 47 km/h +- 1 |
+            | b    | c  | bc    | 47 km/h +- 1 |

-    @mokob @2162
    Scenario: Car - Advisory speed overwrites backwards maxspeed
        Given the node map
            | a | b | c |
@@ -46,26 +45,9 @@ OSRM will use 4/5 of the projected free-flow speed.

        When I route I should get
            | from | to | route | speed        |
-            | b    | a  | ab,ab | 47 km/h +- 1 |
-            | c    | b  | bc,bc | 47 km/h +- 1 |
+            | b    | a  | ab    | 47 km/h +- 1 |
+            | c    | b  | bc    | 47 km/h +- 1 |

-    @mokob @2162 @deleteme
-    Scenario: Car - Advisory speed overwrites backwards maxspeed
-        Given the node map
-            | a | b | c | d |
-
-        And the ways
-            | nodes | highway       | maxspeed:backward | maxspeed:advisory:backward |
-            | ab    | residential   |                   | 45                         |
-            | bc    | residential   | 90                | 45                         |
-            | cd    | residential   |                   | 45                         |
-
-        When I route I should get
-            | from | to | route | 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 |
@@ -77,9 +59,9 @@ OSRM will use 4/5 of the projected free-flow speed.

        When I route I should get
            | from | to | route | speed        |
-            | a    | b  | ab,ab | 47 km/h +- 1 |
-            | b    | a  | ab,ab | 59 km/h +- 1 |
-            | b    | c  | bc,bc | 59 km/h +- 1 |
-            | c    | b  | bc,bc | 47 km/h +- 1 |
+            | a    | b  | ab    | 47 km/h +- 1 |
+            | b    | a  | ab    | 59 km/h +- 1 |
+            | b    | c  | bc    | 59 km/h +- 1 |
+            | c    | b  | bc    | 47 km/h +- 1 |


@@ -1,5 +1,5 @@
@routing @car @bridge
-Feature: Car - Handle driving
+Feature: Car - Handle movable bridge

    Background:
        Given the profile "car"
@@ -17,15 +17,15 @@ Feature: Car - Handle driving
            | efg   | primary |         |         |

        When I route I should get
-            | from | to | route           | modes                                  |
-            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving |
-            | b    | f  | abc,cde,efg,efg | driving,driving,driving,driving |
-            | e    | c  | cde,cde         | driving,driving          |
-            | e    | b  | cde,abc,abc     | driving,driving,driving         |
-            | e    | a  | cde,abc,abc     | driving,driving,driving         |
-            | c    | e  | cde,cde         | driving,driving          |
-            | c    | f  | cde,efg,efg     | driving,driving,driving         |
-            | c    | g  | cde,efg,efg     | driving,driving,driving         |
+            | from | to | route       | modes |
+            | a    | g  | abc,cde,efg | 1,3,1 |
+            | b    | f  | abc,cde,efg | 1,3,1 |
+            | e    | c  | cde         | 3     |
+            | e    | b  | cde,abc     | 3,1   |
+            | e    | a  | cde,abc     | 3,1   |
+            | c    | e  | cde         | 3     |
+            | c    | f  | cde,efg     | 3,1   |
+            | c    | g  | cde,efg     | 3,1   |

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

        When I route I should get
-            | from | to | route           | modes                                  | speed  |
-            | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving | 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 |
+            | from | to | route       | modes | speed   |
+            | a    | g  | abc,cde,efg | 1,3,1 | 7 km/h |
+            | b    | f  | abc,cde,efg | 1,3,1 | 5 km/h |
+            | c    | e  | cde         | 3     | 2 km/h |
+            | e    | c  | cde         | 3     | 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,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  |
+            | 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   |

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

    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,de |
-            | e    | a  | de,cd,bc,ab,ab |
-            | b    | d  | bc,cd,cd       |
-            | d    | b  | cd,bc,bc       |
+            | from | to | route       |
+            | a    | e  | ab,bc,cd,de |
+            | e    | a  | de,cd,bc,ab |
+            | b    | d  | bc,cd       |
+            | d    | b  | cd,bc       |
@@ -17,15 +17,15 @@ Feature: Car - Handle ferry routes
            | efg   | primary |       |         |

        When I route I should get
-            | from | to | route           | modes                         |
-            | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving |
-            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving |
-            | e    | c  | cde,cde         | ferry,ferry                   |
-            | e    | b  | cde,abc,abc     | ferry,driving,driving         |
-            | e    | a  | cde,abc,abc     | ferry,driving,driving         |
-            | c    | e  | cde,cde         | ferry,ferry                   |
-            | c    | f  | cde,efg,efg     | ferry,driving,driving         |
-            | c    | g  | cde,efg,efg     | ferry,driving,driving         |
+            | from | to | route       | modes |
+            | a    | g  | abc,cde,efg | 1,2,1 |
+            | b    | f  | abc,cde,efg | 1,2,1 |
+            | e    | c  | cde         | 2     |
+            | e    | b  | cde,abc     | 2,1   |
+            | e    | a  | cde,abc     | 2,1   |
+            | c    | e  | cde         | 2     |
+            | c    | f  | cde,efg     | 2,1   |
+            | c    | g  | cde,efg     | 2,1   |

    Scenario: Car - Properly handle simple durations
        Given the node map
@@ -40,11 +40,11 @@ Feature: Car - Handle ferry routes
            | efg   | primary |       |          |

        When I route I should get
-            | from | to | route           | modes                         | speed   |
-            | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving | 25 km/h |
-            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 20 km/h |
-            | c    | e  | cde,cde         | ferry,ferry                   | 12 km/h |
-            | e    | c  | cde,cde         | ferry,ferry                   | 12 km/h |
+            | from | to | route       | modes | speed   |
+            | a    | g  | abc,cde,efg | 1,2,1 | 25 km/h |
+            | b    | f  | abc,cde,efg | 1,2,1 | 20 km/h |
+            | c    | e  | cde         | 2     | 12 km/h |
+            | e    | c  | cde         | 2     | 12 km/h |

    Scenario: Car - Properly handle ISO 8601 durations
        Given the node map
@@ -59,8 +59,8 @@ Feature: Car - Handle ferry routes
            | efg   | primary |       |          |

        When I route I should get
-            | from | to | route           | modes                         | speed   |
-            | a    | g  | abc,cde,efg,efg | driving,ferry,driving,driving | 25 km/h |
-            | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 20 km/h |
-            | c    | e  | cde,cde         | ferry,ferry                   | 12 km/h |
-            | e    | c  | cde,cde         | ferry,ferry                   | 12 km/h |
+            | from | to | route       | modes | speed   |
+            | a    | g  | abc,cde,efg | 1,2,1 | 25 km/h |
+            | b    | f  | abc,cde,efg | 1,2,1 | 20 km/h |
+            | c    | e  | cde         | 2     | 12 km/h |
+            | e    | c  | cde         | 2     | 12 km/h |
@@ -24,9 +24,9 @@ Feature: Car - Speed on links
            | dy    | unclassified  |

        When I route I should get
-            | from | to | route             |
-            | x    | y  | xa,ae,ef,fd,dy,dy |
-            | b    | c  | bc,bc             |
+            | from | to | route          |
+            | x    | y  | xa,ae,ef,fd,dy |
+            | b    | c  | bc             |

    Scenario: Car - Use trunk_link when reasonable
        Given the node map
@@ -44,9 +44,9 @@ Feature: Car - Speed on links
            | fd    | trunk        |
            | dy    | unclassified |
        When I route I should get
-            | from | to | route             |
-            | x    | y  | xa,ae,ef,fd,dy,dy |
-            | b    | c  | bc,bc             |
+            | from | to | route          |
+            | x    | y  | xa,ae,ef,fd,dy |
+            | b    | c  | bc             |

    Scenario: Car - Use primary_link when reasonable
        Given the node map
@@ -64,9 +64,9 @@ Feature: Car - Speed on links
            | fd    | primary        |
            | dy    | unclassified |
        When I route I should get
-            | from | to | route             |
-            | x    | y  | xa,ae,ef,fd,dy,dy |
-            | b    | c  | bc,bc             |
+            | from | to | route          |
+            | x    | y  | xa,ae,ef,fd,dy |
+            | b    | c  | bc             |

    Scenario: Car - Use secondary_link when reasonable
        Given the node map
@@ -85,9 +85,9 @@ Feature: Car - Speed on links
            | dy    | unclassified     |

        When I route I should get
-            | from | to | route             |
-            | x    | y  | xa,ae,ef,fd,dy,dy |
-            | b    | c  | bc,bc             |
+            | from | to | route          |
+            | x    | y  | xa,ae,ef,fd,dy |
+            | b    | c  | bc             |

    Scenario: Car - Use tertiary_link when reasonable
        Given the node map
@@ -106,6 +106,6 @@ Feature: Car - Speed on links
            | dy    | unclassified    |

        When I route I should get
-            | from | to | route             |
-            | x    | y  | xa,ae,ef,fd,dy,dy |
-            | b    | c  | bc,bc             |
+            | from | to | route          |
+            | x    | y  | xa,ae,ef,fd,dy |
+            | b    | c  | bc             |
@@ -21,12 +21,12 @@ OSRM will use 4/5 of the projected free-flow speed.

        When I route I should get
            | from | to | route | speed         |
-            | a    | b  | ab,ab |  79 km/h      |
-            | b    | c  | bc,bc |  59 km/h +- 1 |
-            | c    | d  | cd,cd |  51 km/h      |
-            | d    | e  | de,de |  75 km/h      |
-            | e    | f  | ef,ef |  91 km/h      |
-            | f    | g  | fg,fg | 107 km/h      |
+            | a    | b  | ab    |  78 km/h      |
+            | b    | c  | bc    |  59 km/h +- 1 |
+            | c    | d  | cd    |  51 km/h      |
+            | d    | e  | de    |  75 km/h      |
+            | e    | f  | ef    |  90 km/h      |
+            | f    | g  | fg    | 106 km/h      |

    Scenario: Car - Do not ignore maxspeed when higher than way speed
        Given the node map
@@ -40,9 +40,9 @@ OSRM will use 4/5 of the projected free-flow speed.

        When I route I should get
            | from | to | route | speed        |
-            | a    | b  | ab,ab | 31 km/h      |
-            | b    | c  | bc,bc | 83 km/h +- 1 |
-            | c    | d  | cd,cd | 51 km/h      |
+            | a    | b  | ab    | 31 km/h      |
+            | b    | c  | bc    | 83 km/h +- 1 |
+            | c    | d  | cd    | 51 km/h      |

    Scenario: Car - Forward/backward maxspeed
        Given a grid size of 100 meters
@@ -15,13 +15,13 @@ Feature: Car - Mode flag
            | cd    | primary |       |          |

        When I route I should get
-            | from | to | route       | modes                         |
-            | a    | d  | ab,bc,cd,cd | driving,ferry,driving,driving |
-            | d    | a  | cd,bc,ab,ab | driving,ferry,driving,driving |
-            | c    | a  | bc,ab,ab    | ferry,driving,driving         |
-            | d    | b  | cd,bc,bc    | driving,ferry,ferry           |
-            | a    | c  | ab,bc,bc    | driving,ferry,ferry           |
-            | b    | d  | bc,cd,cd    | ferry,driving,driving         |
+            | from | to | route    | turns                       | modes |
+            | a    | d  | ab,bc,cd | head,right,left,destination | 1,2,1 |
+            | d    | a  | cd,bc,ab | head,right,left,destination | 1,2,1 |
+            | c    | a  | bc,ab    | head,left,destination       | 2,1   |
+            | d    | b  | cd,bc    | head,right,destination      | 1,2   |
+            | a    | c  | ab,bc    | head,right,destination      | 1,2   |
+            | b    | d  | bc,cd    | head,left,destination       | 2,1   |

    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     | modes       | time  |
-            | c    | d  | bcde,bcde | ferry,ferry | 600s  |
+            | from | to | route | turns            | modes   | time  |
+            | c    | d  | bcde  | head,destination | 2       | 600s  |


@@ -15,8 +15,8 @@ Feature: Car - Street names in instructions
            | bc    | Your Way | A1  |

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

    @todo
    Scenario: Car - Use way type to describe unnamed ways
@@ -29,5 +29,5 @@ Feature: Car - Street names in instructions
            | bcd   | residential |      |

        When I route I should get
-            | from | to | route                            |
-            | a    | c  | tertiary,residential,residential |
+            | from | to | route                |
+            | a    | c  | tertiary,residential |
@@ -44,9 +44,9 @@ Feature: Car - Oneway streets
            | da    |        |

        When I route I should get
-            | from | to | route       |
-            | a    | b  | ab,ab       |
-            | b    | a  | bc,cd,da,da |
+            | from | to | route    |
+            | a    | b  | ab       |
+            | b    | a  | bc,cd,da |

    Scenario: Car - Cars should not be affected by bicycle tags
        Then routability should be
@@ -75,5 +75,5 @@ Feature: Car - Oneway streets


        When I route I should get
-            | from | to | route    |
-            | a    | c  | ab,bc,bc |
+            | from | to | route |
+            | a    | c  | ab,bc |
@@ -25,10 +25,10 @@ Feature: Car - Turn restrictions
            | restriction | sj       | wj     | j        | no_left_turn |

        When I route I should get
-            | from | to | route    |
-            | s    | w  |          |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  |       |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @no_turning
    Scenario: Car - No straight on
@@ -55,8 +55,8 @@ Feature: Car - Turn restrictions
            | restriction | bj       | jd     | j        | no_straight_on |

        When I route I should get
-            | from | to | route                |
-            | a    | e  | av,vw,wx,xy,yz,ze,ze |
+            | from | to | route             |
+            | a    | e  | av,vw,wx,xy,yz,ze |

    @no_turning
    Scenario: Car - No right turn
@@ -77,10 +77,10 @@ Feature: Car - Turn restrictions
            | restriction | sj       | ej     | j        | no_right_turn |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  |          |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  |       |

    @no_turning
    Scenario: Car - No u-turn
@@ -101,10 +101,10 @@ Feature: Car - Turn restrictions
            | restriction | sj       | wj     | j        | no_u_turn   |

        When I route I should get
-            | from | to | route    |
-            | s    | w  |          |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  |       |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @no_turning
    Scenario: Car - Handle any no_* relation
@@ -125,10 +125,10 @@ Feature: Car - Turn restrictions
            | restriction | sj       | wj     | j        | no_weird_zigzags |

        When I route I should get
-            | from | to | route    |
-            | s    | w  |          |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  |       |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @only_turning
    Scenario: Car - Only left turn
@@ -149,10 +149,10 @@ Feature: Car - Turn restrictions
            | restriction | sj       | wj     | j        | only_left_turn |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  |          |
-            | s    | e  |          |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  |       |
+            | s    | e  |       |

    @only_turning
    Scenario: Car - Only right turn
@@ -173,10 +173,10 @@ Feature: Car - Turn restrictions
            | restriction | sj       | ej     | j        | only_right_turn |

        When I route I should get
-            | from | to | route    |
-            | s    | w  |          |
-            | s    | n  |          |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  |       |
+            | s    | n  |       |
+            | s    | e  | sj,ej |

    @only_turning
    Scenario: Car - Only straight on
@@ -197,10 +197,10 @@ Feature: Car - Turn restrictions
            | restriction | sj       | nj     | j        | only_straight_on |

        When I route I should get
-            | from | to | route    |
-            | s    | w  |          |
-            | s    | n  | sj,nj,nj |
-            | s    | e  |          |
+            | from | to | route |
+            | s    | w  |       |
+            | s    | n  | sj,nj |
+            | s    | e  |       |

    @no_turning
    Scenario: Car - Handle any only_* restriction
@@ -221,10 +221,10 @@ Feature: Car - Turn restrictions
            | restriction | sj       | nj     | j        | only_weird_zigzags |

        When I route I should get
-            | from | to | route    |
-            | s    | w  |          |
-            | s    | n  | sj,nj,nj |
-            | s    | e  |          |
+            | from | to | route |
+            | s    | w  |       |
+            | s    | n  | sj,nj |
+            | s    | e  |       |

    @specific
    Scenario: Car - :hgv-qualified on a standard turn restriction
@@ -245,10 +245,10 @@ Feature: Car - Turn restrictions
            | restriction | sj       | nj     | j        | no_straight_on  |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @specific
    Scenario: Car - :motorcar-qualified on a standard turn restriction
@@ -269,10 +269,10 @@ Feature: Car - Turn restrictions
            | restriction | sj       | nj     | j        | no_straight_on       |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  |          |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  |       |
+            | s    | e  | sj,ej |

    @except
    Scenario: Car - Except tag and on no_ restrictions
@@ -298,11 +298,11 @@ Feature: Car - Turn restrictions
            | restriction | sj       | dj     | j        | no_right_turn | motorcar |

        When I route I should get
-            | from | to | route    |
-            | s    | a  | sj,aj,aj |
-            | s    | b  |          |
-            | s    | c  |          |
-            | s    | d  | sj,dj,dj |
+            | from | to | route |
+            | s    | a  | sj,aj |
+            | s    | b  |       |
+            | s    | c  |       |
+            | s    | d  | sj,dj |

    @except
    Scenario: Car - Except tag and on only_ restrictions
@@ -322,9 +322,9 @@ Feature: Car - Turn restrictions
            | restriction | sj       | aj     | j        | only_straight_on | motorcar |

        When I route I should get
-            | from | to | route    |
-            | s    | a  | sj,aj,aj |
-            | s    | b  | sj,bj,bj |
+            | from | to | route |
+            | s    | a  | sj,aj |
+            | s    | b  | sj,bj |

    @except
    Scenario: Car - Several only_ restrictions at the same segment
@@ -356,10 +356,10 @@ Feature: Car - Turn restrictions
            | restriction | da       | ae     | a        | only_right_turn  |

        When I route I should get
-            | from | to | route                               |
-            | e    | f  | ae,xa,bx,fb,fb                      |
-            | c    | f  | dc,da,ae,ge,hg,hg,ge,ae,xa,bx,fb,fb |
-            | d    | f  | da,ae,ge,hg,hg,ge,ae,xa,bx,fb,fb    |
+            | from | to | route                            |
+            | e    | f  | ae,xa,bx,fb                      |
+            | c    | f  | dc,da,ae,ge,hg,hg,ge,ae,xa,bx,fb |
+            | d    | f  | da,ae,ge,hg,hg,ge,ae,xa,bx,fb    |

    @except
    Scenario: Car - two only_ restrictions share same to-way
@@ -391,9 +391,9 @@ Feature: Car - Turn restrictions
            | restriction | by       | xy     | y        | only_straight_on |

        When I route I should get
-            | from | to | route       |
-            | a    | b  | ax,xy,yb,yb |
-            | b    | a  | yb,xy,ax,ax |
+            | from | to | route    |
+            | a    | b  | ax,xy,yb |
+            | b    | a  | yb,xy,ax |

    @except
    Scenario: Car - two only_ restrictions share same from-way
@@ -425,7 +425,7 @@ Feature: Car - Turn restrictions
            | restriction | xy       | yb     | y        | only_straight_on |

        When I route I should get
-            | from | to | route       |
-            | a    | b  | ax,xy,yb,yb |
-            | b    | a  | yb,xy,ax,ax |
+            | from | to | route    |
+            | a    | b  | ax,xy,yb |
+            | b    | a  | yb,xy,ax |

@@ -0,0 +1,30 @@
+@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 | head,enter_roundabout-1,destination |
+            | s    | u  | sa,uc | head,enter_roundabout-2,destination |
+            | s    | v  | sa,vd | head,enter_roundabout-3,destination |
+            | u    | v  | uc,vd | head,enter_roundabout-1,destination |
+            | u    | s  | uc,sa | head,enter_roundabout-2,destination |
+            | u    | t  | uc,tb | head,enter_roundabout-3,destination |
@@ -19,13 +19,13 @@ Feature: Car - Handle ferryshuttle train routes
            | gh    | primary |               | no      |

        When I route I should get
-            | from | to | route         |
-            | a    | f  | abc,cde,ef,ef |
-            | b    | f  | abc,cde,ef,ef |
-            | e    | c  | cde,cde       |
-            | e    | b  | cde,abc,abc   |
-            | e    | a  | cde,abc,abc   |
-            | c    | e  | cde,cde       |
-            | c    | f  | cde,ef,ef     |
-            | f    | g  |               |
-            | g    | h  | gh,gh         |
+            | from | to | route      |
+            | a    | f  | abc,cde,ef |
+            | b    | f  | abc,cde,ef |
+            | e    | c  | cde        |
+            | e    | b  | cde,abc    |
+            | e    | a  | cde,abc    |
+            | c    | e  | cde        |
+            | c    | f  | cde,ef     |
+            | f    | g  |            |
+            | g    | h  | gh         |
@@ -36,12 +36,12 @@ Feature: Traffic - speeds
        Given the extract extra arguments "--generate-edge-lookup"
        Given the contract extra arguments "--segment-speed-file speeds.csv"
        And I route I should get
-            | from | to | route    | speed   |
-            | a    | b  | ab,ab    | 27 km/h |
-            | a    | c  | ab,bc,bc | 27 km/h |
-            | b    | c  | bc,bc    | 27 km/h |
-            | a    | d  | ad,ad    | 27 km/h |
-            | d    | c  | dc,dc    | 36 km/h |
-            | g    | b  | ab,ab    | 27 km/h |
-            | a    | g  | ab,ab    | 27 km/h |
+            | from | to | route | speed   |
+            | a    | b  | ab    | 27 km/h |
+            | a    | c  | ab,bc | 27 km/h |
+            | b    | c  | bc    | 27 km/h |
+            | a    | d  | ad    | 27 km/h |
+            | d    | c  | dc    | 36 km/h |
+            | g    | b  | ab    | 27 km/h |
+            | a    | g  | ab    | 27 km/h |

@@ -5,7 +5,7 @@ Feature: Foot - Access tags on ways
    Background:
        Given the profile "foot"

-    Scenario: Foot - Access tag hierarchy on ways
+    Scenario: Foot - Access tag hierachy on ways
        Then routability should be
            | highway  | access | foot | bothw |
            | footway  |        |      | x     |
@@ -52,7 +52,6 @@ Feature: Foot - Access tags on ways
            | private      |              |       |
            | agricultural |              |       |
            | forestry     |              |       |
-            | delivery     |              |       |
            |              | yes          | x     |
            |              | permissive   | x     |
            |              | designated   | x     |
@@ -61,7 +60,6 @@ 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 hierarchy on nodes
+    Scenario: Foot - Access tag hierachy on nodes
        Then routability should be
            | node/access | node/foot | bothw |
            |             |           | x     |
@@ -40,7 +40,6 @@ Feature: Foot - Access tags on nodes
            | private      |              |       |
            | agricultural |              |       |
            | forestry     |              |       |
-            | delivery     |              |       |
            | no           | yes          | x     |
            | no           | permissive   | x     |
            | no           | designated   | x     |
@@ -49,4 +48,3 @@ Feature: Foot - Access tags on nodes
            | yes          | private      |       |
            | yes          | agricultural |       |
            | yes          | forestry     |       |
-            | yes          | delivery     |       |
@@ -17,15 +17,15 @@ Feature: Foot - Squares and other areas
            | abcda | yes  | residential |

        When I route I should get
-            | from | to | route       |
-            | a    | b  | abcda,abcda |
-            | a    | d  | abcda,abcda |
-            | b    | c  | abcda,abcda |
-            | c    | b  | abcda,abcda |
-            | c    | d  | abcda,abcda |
-            | d    | c  | abcda,abcda |
-            | d    | a  | abcda,abcda |
-            | a    | d  | abcda,abcda |
+            | from | to | route |
+            | a    | b  | abcda |
+            | a    | d  | abcda |
+            | b    | c  | abcda |
+            | c    | b  | abcda |
+            | c    | d  | abcda |
+            | d    | c  | abcda |
+            | d    | a  | abcda |
+            | a    | d  | abcda |

    @building
    Scenario: Foot - Don't route on buildings
@@ -41,14 +41,14 @@ Feature: Foot - Squares and other areas

        When I route I should get
            | from | to | route |
-            | a    | b  | xa,xa |
-            | a    | d  | xa,xa |
-            | b    | c  | xa,xa |
-            | c    | b  | xa,xa |
-            | c    | d  | xa,xa |
-            | d    | c  | xa,xa |
-            | d    | a  | xa,xa |
-            | a    | d  | xa,xa |
+            | a    | b  | xa    |
+            | a    | d  | xa    |
+            | b    | c  | xa    |
+            | c    | b  | xa    |
+            | c    | d  | xa    |
+            | d    | c  | xa    |
+            | d    | a  | xa    |
+            | a    | d  | xa    |

    @parking
    Scenario: Foot - parking areas
@@ -65,17 +65,17 @@ Feature: Foot - Squares and other areas
            | abcda | (nil)   | parking |

        When I route I should get
-            | from | to | route          |
-            | x    | y  | xa,abcda,by,by |
-            | y    | x  | by,abcda,xa,xa |
-            | a    | b  | abcda,abcda    |
-            | a    | d  | abcda,abcda    |
-            | b    | c  | abcda,abcda    |
-            | c    | b  | abcda,abcda    |
-            | c    | d  | abcda,abcda    |
-            | d    | c  | abcda,abcda    |
-            | d    | a  | abcda,abcda    |
-            | a    | d  | abcda,abcda    |
+            | from | to | route       |
+            | x    | y  | xa,abcda,by |
+            | y    | x  | by,abcda,xa |
+            | a    | b  | abcda       |
+            | a    | d  | abcda       |
+            | b    | c  | abcda       |
+            | c    | b  | abcda       |
+            | c    | d  | abcda       |
+            | d    | c  | abcda       |
+            | d    | a  | abcda       |
+            | a    | d  | abcda       |

    @train @platform
    Scenario: Foot - railway platforms
@@ -90,14 +90,14 @@ Feature: Foot - Squares and other areas
            | abcda | (nil)   | platform |

        When I route I should get
-            | from | to | route          |
-            | x    | y  | xa,abcda,by,by |
-            | y    | x  | by,abcda,xa,xa |
-            | a    | b  | abcda,abcda    |
-            | a    | d  | abcda,abcda    |
-            | b    | c  | abcda,abcda    |
-            | c    | b  | abcda,abcda    |
-            | c    | d  | abcda,abcda    |
-            | d    | c  | abcda,abcda    |
-            | d    | a  | abcda,abcda    |
-            | a    | d  | abcda,abcda    |
+            | from | to | route       |
+            | x    | y  | xa,abcda,by |
+            | y    | x  | by,abcda,xa |
+            | a    | b  | abcda       |
+            | a    | d  | abcda       |
+            | b    | c  | abcda       |
+            | c    | b  | abcda       |
+            | c    | d  | abcda       |
+            | d    | c  | abcda       |
+            | d    | a  | abcda       |
+            | a    | d  | abcda       |
@@ -17,15 +17,15 @@ Feature: Foot - Handle ferry routes
            | efg   | primary |       |      |

        When I route I should get
-            | from | to | route           | modes                         |
-            | a    | g  | abc,cde,efg,efg | walking,ferry,walking,walking |
-            | b    | f  | abc,cde,efg,efg | walking,ferry,walking,walking |
-            | e    | c  | cde,cde         | ferry,ferry                   |
-            | e    | b  | cde,abc,abc     | ferry,walking,walking         |
-            | e    | a  | cde,abc,abc     | ferry,walking,walking         |
-            | c    | e  | cde,cde         | ferry,ferry                   |
-            | c    | f  | cde,efg,efg     | ferry,walking,walking         |
-            | c    | g  | cde,efg,efg     | ferry,walking,walking         |
+            | from | to | route       | modes |
+            | a    | g  | abc,cde,efg | 1,2,1 |
+            | b    | f  | abc,cde,efg | 1,2,1 |
+            | e    | c  | cde         | 2     |
+            | e    | b  | cde,abc     | 2,1   |
+            | e    | a  | cde,abc     | 2,1   |
+            | c    | e  | cde         | 2     |
+            | c    | f  | cde,efg     | 2,1   |
+            | c    | g  | cde,efg     | 2,1   |

    Scenario: Foot - Ferry duration, single node
        Given the node map
@@ -58,6 +58,6 @@ Feature: Foot - Handle ferry routes
            | abcd  |         | ferry | yes  | 1:00     |

        When I route I should get
-            | from | to | route     | time       |
-            | a    | d  | abcd,abcd | 3600s +-10 |
-            | d    | a  | abcd,abcd | 3600s +-10 |
+            | from | to | route | time       |
+            | a    | d  | abcd  | 3600s +-10 |
+            | d    | a  | abcd  | 3600s +-10 |
@@ -15,8 +15,8 @@ Feature: Foot - Street names in instructions
            | bc    | Your Way |

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

    @unnamed
    Scenario: Foot - Use way type to describe unnamed ways
@@ -29,5 +29,5 @@ Feature: Foot - Street names in instructions
            | bcd   | track   |      |

        When I route I should get
-            | from | to | route                                             |
-            | a    | d  | {highway:footway},{highway:track},{highway:track} |
+            | from | to | route                             |
+            | a    | d  | {highway:footway},{highway:track} |
@@ -13,8 +13,8 @@ Feature: Foot - Way ref
            | ab    | Utopia Drive | E7  |

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

    Scenario: Foot - Way with only ref
        Given the node map
@@ -26,7 +26,7 @@ Feature: Foot - Way ref

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

    Scenario: Foot - Way with only name
        Given the node map
@@ -37,5 +37,5 @@ Feature: Foot - Way ref
            | ab    | Utopia Drive |

        When I route I should get
-            | from | to | route                     |
-            | a    | b  | Utopia Drive,Utopia Drive |
+            | from | to | route        |
+            | a    | b  | Utopia Drive |
@@ -24,10 +24,10 @@ Feature: Foot - Turn restrictions
            | restriction | sj       | wj     | j        | no_left_turn |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @no_turning
    Scenario: Foot - No right turn
@@ -48,10 +48,10 @@ Feature: Foot - Turn restrictions
            | restriction | sj       | ej     | j        | no_right_turn |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @no_turning
    Scenario: Foot - No u-turn
@@ -72,10 +72,10 @@ Feature: Foot - Turn restrictions
            | restriction | sj       | wj     | j        | no_u_turn   |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @no_turning
    Scenario: Foot - Handle any no_* relation
@@ -96,10 +96,10 @@ Feature: Foot - Turn restrictions
            | restriction | sj       | wj     | j        | no_weird_zigzags |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @only_turning
    Scenario: Foot - Only left turn
@@ -120,10 +120,10 @@ Feature: Foot - Turn restrictions
            | restriction | sj       | wj     | j        | only_left_turn |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @only_turning
    Scenario: Foot - Only right turn
@@ -144,10 +144,10 @@ Feature: Foot - Turn restrictions
            | restriction | sj       | ej     | j        | only_right_turn |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @only_turning
    Scenario: Foot - Only straight on
@@ -168,10 +168,10 @@ Feature: Foot - Turn restrictions
            | restriction | sj       | nj     | j        | only_straight_on |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @no_turning
    Scenario: Foot - Handle any only_* restriction
@@ -192,10 +192,10 @@ Feature: Foot - Turn restrictions
            | restriction | sj       | nj     | j        | only_weird_zigzags |

        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
+            | from | to | route |
+            | s    | w  | sj,wj |
+            | s    | n  | sj,nj |
+            | s    | e  | sj,ej |

    @except
    Scenario: Foot - Except tag and on no_ restrictions
@@ -221,11 +221,11 @@ Feature: Foot - Turn restrictions
            | restriction | sj       | dj     | j        | no_right_turn | foot   |

        When I route I should get
-            | from | to | route    |
-            | s    | a  | sj,aj,aj |
-            | s    | b  | sj,bj,bj |
-            | s    | c  | sj,cj,cj |
-            | s    | d  | sj,dj,dj |
+            | from | to | route |
+            | s    | a  | sj,aj |
+            | s    | b  | sj,bj |
+            | s    | c  | sj,cj |
+            | s    | d  | sj,dj |

    @except
    Scenario: Foot - Except tag and on only_ restrictions
@@ -245,9 +245,9 @@ Feature: Foot - Turn restrictions
            | restriction | sj       | aj     | j        | only_straight_on | foot   |

        When I route I should get
-            | from | to | route    |
-            | s    | a  | sj,aj,aj |
-            | s    | b  | sj,bj,bj |
+            | from | to | route |
+            | s    | a  | sj,aj |
+            | s    | b  | sj,bj |

    @except
    Scenario: Foot - Multiple except tag values
@@ -279,10 +279,10 @@ Feature: Foot - Turn restrictions
            | restriction | sj       | jf     | j        | no_straight_on | foot, bus     |

        When I route I should get
-            | from | to | route    |
-            | s    | a  | sj,ja,ja |
-            | s    | b  | sj,jb,jb |
-            | s    | c  | sj,jc,jc |
-            | s    | d  | sj,jd,jd |
-            | s    | e  | sj,je,je |
-            | s    | f  | sj,jf,jf |
+            | from | to | route |
+            | s    | a  | sj,ja |
+            | s    | b  | sj,jb |
+            | s    | c  | sj,jc |
+            | s    | d  | sj,jd |
+            | s    | e  | sj,je |
+            | s    | f  | sj,jf |
@@ -3,12 +3,12 @@ Feature: Roundabout Instructions

    Background:
        Given the profile "foot"
-
+    
    @todo
    Scenario: Foot - Roundabout instructions
    # You can walk in both directions on a roundabout, bu the normal roundabout instructions don't
    # make sense when you're going the opposite way around the roundabout.
-
+    
        Given the node map
            |   |   | v |   |   |
            |   |   | d |   |   |
@@ -25,10 +25,10 @@ Feature: Roundabout Instructions
            | abcda | roundabout |

        When I route I should get
-            | from | to | route | turns                            |
-            | s    | t  | sa,tb | depart,roundabout-exit-1,arrive |
-            | s    | u  | sa,uc | depart,roundabout-exit-2,arrive |
-            | s    | v  | sa,vd | depart,roundabout-exit-3,arrive |
-            | u    | v  | uc,vd | depart,roundabout-exit-1,arrive |
-            | u    | s  | uc,sa | depart,roundabout-exit-2,arrive |
-            | u    | t  | uc,tb | depart,roundabout-exit-3,arrive |
+            | from | to | route | turns                               |
+            | s    | t  | sa,tb | head,enter_roundabout-1,destination |
+            | s    | u  | sa,uc | head,enter_roundabout-2,destination |
+            | s    | v  | sa,vd | head,enter_roundabout-3,destination |
+            | u    | v  | uc,vd | head,enter_roundabout-1,destination |
+            | u    | s  | uc,sa | head,enter_roundabout-2,destination |
+            | u    | t  | uc,tb | head,enter_roundabout-3,destination |
@@ -1,90 +0,0 @@
-@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  |
@@ -1,123 +0,0 @@
-@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,ramp left,arrive  |
-            | a,d       | ab,bd,bd | depart,ramp right,arrive |
-
@@ -1,284 +0,0 @@
-@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                  |
-
-    @pr2275 @bug
-    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 |
@@ -1,52 +0,0 @@
-@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: Motorway Guidance
+Feature: Basic Roundabout

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

    Scenario: Ramp Exit Right
@@ -16,9 +16,9 @@ Feature: Motorway Guidance
            | 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, ramp-slight-right, arrive |

    Scenario: Ramp Exit Right Curved Right
        Given the node map
@@ -32,9 +32,9 @@ Feature: Motorway Guidance
            | 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 right,arrive |
+            | waypoints | route           | turns                             |
+            | a,e       | abcde, abcde    | depart, arrive                    |
+            | a,g       | abcde, bfg, bfg | depart, ramp-slight-right, arrive |

    Scenario: Ramp Exit Right Curved Left
        Given the node map
@@ -49,9 +49,9 @@ Feature: Motorway Guidance
            | 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, ramp-slight-right, arrive |


    Scenario: Ramp Exit Left
@@ -65,9 +65,9 @@ Feature: Motorway Guidance
            | 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, ramp-slight-left, arrive |

    Scenario: Ramp Exit Left Curved Left
        Given the node map
@@ -81,9 +81,9 @@ Feature: Motorway Guidance
            | 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 left,arrive |
+            | waypoints | route           | turns                            |
+            | a,e       | abcde, abcde    | depart, arrive                   |
+            | a,g       | abcde, bfg, bfg | depart, ramp-slight-left, arrive |

    Scenario: Ramp Exit Left Curved Right
        Given the node map
@@ -97,9 +97,9 @@ Feature: Motorway Guidance
            | 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, ramp-slight-left, arrive |

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

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

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

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

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

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

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

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

     Scenario: On And Off Ramp Right
       Given the node map
@@ -176,11 +176,11 @@ Feature: Motorway Guidance
            | 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,ramp right,arrive        |
+            | waypoints | route             | turns                             |
+            | a,e       | abcde, abcde      | depart, arrive                    |
+            | f,e       | fgc, abcde, abcde | depart, merge-slight-left, arrive |
+            | a,i       | abcde, chi, chi   | depart, ramp-slight-right, arrive |
+            | f,i       | fgc, chi, chi     | depart, turn-slight-right, arrive |

    Scenario: On And Off Ramp Left
       Given the node map
@@ -194,25 +194,9 @@ Feature: Motorway Guidance
            | 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,ramp left,arrive          |
+            | waypoints | route             | turns                              |
+            | a,e       | abcde, abcde      | depart, arrive                     |
+            | f,e       | fgc, abcde, abcde | depart, merge-slight-right, arrive |
+            | a,i       | abcde, chi, chi   | depart, ramp-slight-left, arrive   |
+            | f,i       | fgc, chi, chi     | depart, turn-slight-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 |
@@ -1,135 +0,0 @@
-@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 |
@@ -1,229 +0,0 @@
-@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,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,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,ramp right,arrive |
-            | a,e       | abc,be,be | depart,ramp left,arrive  |
-
-    Scenario: Ramp On Three Way Intersection Right
-        Given the node map
-            | a | b | c |
-            |   | d |   |
-
-        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,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,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,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,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,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,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,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,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,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 |
@@ -1,167 +0,0 @@
-@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  |
@@ -1,262 +0,0 @@
-@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   |
-            | 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 |   |   |
-            | c |   |   |
-            | d | b | f |
-            | e |   |   |
-
-        And the ways
-            | nodes | junction   |
-            | ab    |            |
-            | bcdb  | roundabout |
-            | ce    |            |
-            | df    |            |
-
-        When I route I should get
-            | waypoints | route    | turns                     |
-            | a,e       | ab,ce,ce | depart,bcdb-exit-1,arrive |
-            | a,f       | ab,df,df | depart,bcdb-exit-2,arrive |
-
-       Scenario: Collinear in X,Y
-        Given the node map
-            | f |   |   |
-            | d | c | e |
-            |   | b |   |
-            |   | a |   |
-
-        And the ways
-            | nodes | junction   |
-            | ab    |            |
-            | bcdb  | roundabout |
-            | ce    |            |
-            | df    |            |
-
-        When I route I should get
-            | waypoints | route    | turns                     |
-            | a,e       | ab,ce,ce | depart,bcdb-exit-1,arrive |
-            | a,f       | ab,df,df | depart,bcdb-exit-2,arrive |
-
-       Scenario: Collinear in X,Y
-        Given the node map
-            | f |   |   |
-            | d | c | e |
-            | b |   |   |
-            | a |   |   |
-
-        And the ways
-            | nodes | junction   |
-            | 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 |
@@ -1,166 +0,0 @@
-@routing  @guidance
-Feature: Basic Roundabout
-
-    Background:
-        Given the profile "bicycle"
-        Given a grid size of 10 meters
-
-    Scenario: Enter and Exit
-        Given the node map
-            |   |   | a |   |   |
-            |   |   | b |   |   |
-            | h | g |   | c | d |
-            |   |   | e |   |   |
-            |   |   | f |   |   |
-
-       And the ways
-            | nodes  | junction   |
-            | ab     |            |
-            | cd     |            |
-            | ef     |            |
-            | gh     |            |
-            | bgecb  | roundabout |
-
-       When I route I should get
-           | waypoints | route    | turns                           |
-           | a,d       | ab,cd,cd | depart,roundabout-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 |
@@ -2,7 +2,7 @@
 Feature: Basic Roundabout

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

    Scenario: Enter and Exit
@@ -14,248 +14,160 @@ Feature: Basic Roundabout
            |   |   | f |   |   |

       And the ways
-            | nodes  | junction   |
-            | ab     |            |
-            | cd     |            |
-            | ef     |            |
-            | gh     |            |
-            | bgecb  | roundabout |
+            | nodes  | roundabout |
+            | ab     | no         |
+            | cd     | no         |
+            | ef     | no         |
+            | gh     | no         |
+            | bcegb  | yes        |

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

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

       And the ways
-            | nodes  | junction   |
-            | ab     |            |
-            | cd     |            |
-            | ef     |            |
-            | gh     |            |
-            | bcegb  | roundabout |
+            | nodes  | roundabout |
+            | ab     | no         |
+            | cd     | no         |
+            | ef     | no         |
+            | gh     | no         |
+            | bcegb  | yes        |

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

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

       And the ways
-            | nodes  | junction   |
-            | ab     |            |
-            | cd     |            |
-            | ef     |            |
-            | gh     |            |
-            | bcegb  | roundabout |
+            | nodes  | roundabout |
+            | ab     | no         |
+            | cd     | no         |
+            | ef     | no         |
+            | gh     | no         |
+            | bcegb  | yes        |

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

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

       And the ways
-            | nodes  | junction   |
-            | ab     |            |
-            | cd     |            |
-            | ef     |            |
-            | gh     |            |
-            | bcegb  | roundabout |
+            | nodes  | roundabout |
+            | ab     | no         |
+            | cd     | no         |
+            | ef     | no         |
+            | gh     | no         |
+            | bcegb  | yes        |

       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 |
+           | 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 |
+           |   | a |   | c |   |
+           | l |   | b |   | d |
           |   | k |   | e |   |
-           | l |   | h |   | d |
-           |   | g |   | i |   |
+           | j |   | h |   | f |
+           |   | i |   | g |   |

        And the ways
-           | nodes | junction   | oneway |
-           | abc   |            | yes    |
-           | def   |            | yes    |
-           | ghi   |            | yes    |
-           | jkl   |            | yes    |
-           | bkheb | roundabout | yes    |
+           | nodes | roundabout | oneway |
+           | abc   | no         | yes    |
+           | def   | no         | yes    |
+           | ghi   | no         | yes    |
+           | jkl   | no         | yes    |
+           | behkb | yes        | 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: 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 |   |
-            | c | e |
-            | 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   |
-            | 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 |   |   |
-            | c |   |   |
-            | d | b | f |
-            | e |   |   |
-
-        And the ways
-            | nodes | junction   |
-            | ab    |            |
-            | bcdb  | roundabout |
-            | ce    |            |
-            | df    |            |
-
-        When I route I should get
-            | waypoints | route    | turns                           |
-            | a,e       | ab,ce,ce | depart,roundabout-exit-1,arrive |
-            | a,f       | ab,df,df | depart,roundabout-exit-2,arrive |
-
+           | waypoints | route       | turns                             |
+           | a,c       | abc,abc,abc | depart, roundabout-exit-1, arrive |
+           | a,f       | abc,def,def | 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 |
+           | d,f       | def,def,def | depart, roundabout-exit-1, arrive |
+           | d,i       | def,ghi,ghi | 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 |
+           | g,i       | ghi,ghi,ghi | depart, roundabout-exit-1, arrive |
+           | g,l       | ghi,jkl,jkl | 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 |
+           | j,l       | jkl,jkl,jkl | depart, roundabout-exit-1, arrive |
+           | j,c       | jkl,abc,abc | 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 |
@@ -1,66 +0,0 @@
-@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 |
@@ -1,813 +0,0 @@
-@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 |
-
-    @bug @pr2275
-    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 |
-
-    @bug @pr2275
-    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 |
-
-    @bug @pr2275
-    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 |
-
-     @bug @pr2275
-     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  |
-
-    @bug @pr2275
-    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 |
-
@@ -13,6 +13,13 @@ Feature: osrm-routed command line options: help
        And stdout should contain "--help"
        And stdout should contain "--trial"
        And stdout should contain "Configuration:"
+        And stdout should contain "--hsgrdata arg"
+        And stdout should contain "--nodesdata arg"
+        And stdout should contain "--edgesdata arg"
+        And stdout should contain "--ramindex arg"
+        And stdout should contain "--fileindex arg"
+        And stdout should contain "--namesdata arg"
+        And stdout should contain "--timestamp arg"
        And stdout should contain "--ip"
        And stdout should contain "--port"
        And stdout should contain "--threads"
@@ -32,6 +39,13 @@ Feature: osrm-routed command line options: help
        And stdout should contain "--help"
        And stdout should contain "--trial"
        And stdout should contain "Configuration:"
+        And stdout should contain "--hsgrdata arg"
+        And stdout should contain "--nodesdata arg"
+        And stdout should contain "--edgesdata arg"
+        And stdout should contain "--ramindex arg"
+        And stdout should contain "--fileindex arg"
+        And stdout should contain "--namesdata arg"
+        And stdout should contain "--timestamp arg"
        And stdout should contain "--ip"
        And stdout should contain "--port"
        And stdout should contain "--threads"
@@ -51,6 +65,13 @@ Feature: osrm-routed command line options: help
        And stdout should contain "--help"
        And stdout should contain "--trial"
        And stdout should contain "Configuration:"
+        And stdout should contain "--hsgrdata arg"
+        And stdout should contain "--nodesdata arg"
+        And stdout should contain "--edgesdata arg"
+        And stdout should contain "--ramindex arg"
+        And stdout should contain "--fileindex arg"
+        And stdout should contain "--namesdata arg"
+        And stdout should contain "--timestamp arg"
        And stdout should contain "--ip"
        And stdout should contain "--port"
        And stdout should contain "--threads"
@@ -13,6 +13,7 @@ Feature: osrm-routed command line options: invalid options

    Scenario: osrm-routed - Missing file
        When I run "osrm-routed over-the-rainbow.osrm"
-        Then stderr should contain "over-the-rainbow.osrm"
+        Then stdout should contain "over-the-rainbow.osrm"
+        And stderr should contain "exception"
        And stderr should contain "not found"
        And it should exit with code 1
@@ -28,19 +28,18 @@ Feature: Raster - weights
            0  0  0   250
            0  0  0   0
            """
-        And the data has been saved to disk

    Scenario: Weighting not based on raster sources
        Given the profile "testbot"
        When I run "osrm-extract {osm_base}.osm -p {profile}"
        And I run "osrm-contract {osm_base}.osm"
        And I route I should get
-            | from | to | route    | speed   |
-            | a    | b  | ab,ab    | 36 km/h |
-            | a    | c  | ab,bc,bc | 36 km/h |
-            | b    | c  | bc,bc    | 36 km/h |
-            | a    | d  | ad,ad    | 36 km/h |
-            | d    | c  | dc,dc    | 36 km/h |
+            | from | to | route | speed   |
+            | a    | b  | ab    | 36 km/h |
+            | a    | c  | ab,bc | 36 km/h |
+            | b    | c  | bc    | 36 km/h |
+            | a    | d  | ad    | 36 km/h |
+            | d    | c  | dc    | 36 km/h |

    Scenario: Weighting based on raster sources
        Given the profile "rasterbot"
@@ -48,32 +47,32 @@ Feature: Raster - weights
        Then stdout should contain "evaluating segment"
        And I run "osrm-contract {osm_base}.osm"
        And I route I should get
-            | from | to | route    | speed   |
-            | a    | b  | ab,ab    | 8 km/h  |
-            | a    | c  | ad,dc,dc | 15 km/h |
-            | b    | c  | bc,bc    | 8 km/h  |
-            | a    | d  | ad,ad    | 15 km/h |
-            | d    | c  | dc,dc    | 15 km/h |
-            | d    | e  | de,de    | 10 km/h |
-            | e    | b  | eb,eb    | 10 km/h |
-            | d    | f  | df,df    | 15 km/h |
-            | f    | b  | fb,fb    | 7 km/h  |
-            | d    | b  | de,eb,eb | 10 km/h |
+            | from | to | route | speed   |
+            | a    | b  | ab    | 8 km/h  |
+            | a    | c  | ad,dc | 15 km/h |
+            | b    | c  | bc    | 8 km/h  |
+            | a    | d  | ad    | 15 km/h |
+            | d    | c  | dc    | 15 km/h |
+            | d    | e  | de    | 10 km/h |
+            | e    | b  | eb    | 10 km/h |
+            | d    | f  | df    | 15 km/h |
+            | f    | b  | fb    | 7 km/h  |
+            | d    | b  | de,eb | 10 km/h |

    Scenario: Weighting based on raster sources
-        Given the profile "rasterbotinterp"
+        Given the profile "rasterbot-interp"
        When I run "osrm-extract {osm_base}.osm -p {profile}"
        Then stdout should contain "evaluating segment"
        And I run "osrm-contract {osm_base}.osm"
        And I route I should get
-            | from | to | route    | speed   |
-            | a    | b  | ab,ab    | 8 km/h  |
-            | a    | c  | ad,dc,dc | 15 km/h |
-            | b    | c  | bc,bc    | 8 km/h  |
-            | a    | d  | ad,ad    | 15 km/h |
-            | d    | c  | dc,dc    | 15 km/h |
-            | d    | e  | de,de    | 10 km/h |
-            | e    | b  | eb,eb    | 10 km/h |
-            | d    | f  | df,df    | 15 km/h |
-            | f    | b  | fb,fb    | 7 km/h  |
-            | d    | b  | de,eb,eb | 10 km/h |
+            | from | to | route | speed   |
+            | a    | b  | ab    | 8 km/h  |
+            | a    | c  | ad,dc | 15 km/h |
+            | b    | c  | bc    | 8 km/h  |
+            | a    | d  | ad    | 15 km/h |
+            | d    | c  | dc    | 15 km/h |
+            | d    | e  | de    | 10 km/h |
+            | e    | b  | eb    | 10 km/h |
+            | d    | f  | df    | 15 km/h |
+            | f    | b  | fb    | 7 km/h  |
+            | d    | b  | de,eb | 10 km/h |
@@ -1,273 +0,0 @@
-var util = require('util');
-var path = require('path');
-var fs = require('fs');
-var d3 = require('d3-queue');
-var OSM = require('../support/build_osm');
-
-module.exports = function () {
-    this.Given(/^the profile "([^"]*)"$/, (profile, callback) => {
-        this.setProfile(profile, callback);
-    });
-
-    this.Given(/^the extract extra arguments "(.*?)"$/, (args, callback) => {
-        this.setExtractArgs(args);
-        callback();
-    });
-
-    this.Given(/^the contract extra arguments "(.*?)"$/, (args, callback) => {
-        this.setContractArgs(args);
-        callback();
-    });
-
-    this.Given(/^a grid size of (\d+) meters$/, (meters, callback) => {
-        this.setGridSize(meters);
-        callback();
-    });
-
-    this.Given(/^the origin ([-+]?[0-9]*\.?[0-9]+),([-+]?[0-9]*\.?[0-9]+)$/, (lat, lon, callback) => {
-        this.setOrigin([parseFloat(lon), parseFloat(lat)]);
-        callback();
-    });
-
-    this.Given(/^the shortcuts$/, (table, callback) => {
-        var q = d3.queue();
-
-        var addShortcut = (row, cb) => {
-            this.shortcutsHash[row.key] = row.value;
-            cb();
-        };
-
-        table.hashes().forEach((row) => {
-            q.defer(addShortcut, row);
-        });
-
-        q.awaitAll(callback);
-    });
-
-    this.Given(/^the node map$/, (table, callback) => {
-        var q = d3.queue();
-
-        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));
-                    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();
-            }
-            else cb();
-        };
-
-        table.raw().forEach((row, ri) => {
-            row.forEach((name, ci) => {
-                q.defer(addNode, name, ri, ci);
-            });
-        });
-
-        q.awaitAll(callback);
-    });
-
-    this.Given(/^the node locations$/, (table, callback) => {
-        var q = d3.queue();
-
-        var addNodeLocations = (row, cb) => {
-            var name = row.node;
-            if (this.findNodeByName(name)) throw new Error(util.format('*** duplicate node %s'), name);
-
-            if (name.match(/[a-z]/)) {
-                var id = row.id && parseInt(row.id);
-                this.addOSMNode(name, row.lon, row.lat, id);
-            } else {
-                this.addLocation(name, row.lon, row.lat);
-            }
-
-            cb();
-        };
-
-        table.hashes().forEach((row) => q.defer(addNodeLocations, row));
-
-        q.awaitAll(callback);
-    });
-
-    this.Given(/^the nodes$/, (table, callback) => {
-        var q = d3.queue();
-
-        var addNode = (row, cb) => {
-            var name = row.node,
-                node = this.findNodeByName(name);
-            delete row.node;
-            if (!node) throw new Error(util.format('*** unknown node %s'), name);
-            for (var key in row) {
-                node.addTag(key, row[key]);
-            }
-            cb();
-        };
-
-        table.hashes().forEach((row) => q.defer(addNode, row));
-
-        q.awaitAll(callback);
-    });
-
-    this.Given(/^the ways$/, (table, callback) => {
-        if (this.osm_str) throw new Error('*** Map data already defined - did you pass an input file in this scenario?');
-
-        var q = d3.queue();
-
-        var addWay = (row, cb) => {
-            var way = new OSM.Way(this.makeOSMId(), this.OSM_USER, this.OSM_TIMESTAMP, this.OSM_UID);
-
-            var nodes = row.nodes;
-            if (this.nameWayHash.nodes) throw new Error(util.format('*** duplicate way %s', nodes));
-
-            for (var i=0; i<nodes.length; i++) {
-                var c = nodes[i];
-                if (!c.match(/[a-z]/)) throw new Error(util.format('*** ways can only use names a-z (%s)', c));
-                var node = this.findNodeByName(c);
-                if (!node) throw new Error(util.format('*** unknown node %s', c));
-                way.addNode(node);
-            }
-
-            var tags = {
-                highway: 'primary'
-            };
-
-            for (var key in row) {
-                tags[key] = row[key];
-            }
-
-            delete tags.nodes;
-
-            if (row.highway === '(nil)') delete tags.highway;
-
-            if (row.name === undefined)
-                tags.name = nodes;
-            else if (row.name === '""' || row.name === "''") // eslint-disable-line quotes
-                tags.name = '';
-            else if (row.name === '' || row.name === '(nil)')
-                delete tags.name;
-            else
-                tags.name = row.name;
-
-            way.setTags(tags);
-            this.OSMDB.addWay(way);
-            this.nameWayHash[nodes] = way;
-            cb();
-        };
-
-        table.hashes().forEach((row) => q.defer(addWay, row));
-
-        q.awaitAll(callback);
-    });
-
-    this.Given(/^the relations$/, (table, callback) => {
-        if (this.osm_str) throw new Error('*** Map data already defined - did you pass an input file in this scenario?');
-
-        var q = d3.queue();
-
-        var addRelation = (row, cb) => {
-            var relation = new OSM.Relation(this.makeOSMId(), this.OSM_USER, this.OSM_TIMESTAMP, this.OSM_UID);
-
-            for (var key in row) {
-                var isNode = key.match(/^node:(.*)/),
-                    isWay = key.match(/^way:(.*)/),
-                    isColonSeparated = key.match(/^(.*):(.*)/);
-                if (isNode) {
-                    row[key].split(',').map(function(v) { return v.trim(); }).forEach((nodeName) => {
-                        if (nodeName.length !== 1) throw new Error(util.format('*** invalid relation node member "%s"'), nodeName);
-                        var node = this.findNodeByName(nodeName);
-                        if (!node) throw new Error(util.format('*** unknown relation node member "%s"'), nodeName);
-                        relation.addMember('node', node.id, isNode[1]);
-                    });
-                } else if (isWay) {
-                    row[key].split(',').map(function(v) { return v.trim(); }).forEach((wayName) => {
-                        var way = this.findWayByName(wayName);
-                        if (!way) throw new Error(util.format('*** unknown relation way member "%s"'), wayName);
-                        relation.addMember('way', way.id, isWay[1]);
-                    });
-                } else if (isColonSeparated && isColonSeparated[1] !== 'restriction') {
-                    throw new Error(util.format('*** unknown relation member type "%s:%s", must be either "node" or "way"'), isColonSeparated[1], isColonSeparated[2]);
-                } else {
-                    relation.addTag(key, row[key]);
-                }
-            }
-            relation.uid = this.OSM_UID;
-
-            this.OSMDB.addRelation(relation);
-
-            cb();
-        };
-
-        table.hashes().forEach((row) => q.defer(addRelation, row));
-
-        q.awaitAll(callback);
-    });
-
-    this.Given(/^the input file ([^"]*)$/, (file, callback) => {
-        if (path.extname(file) !== '.osm') throw new Error('*** Input file must be in .osm format');
-        fs.readFile(file, 'utf8', (err, data) => {
-            if (!err) this.osm_str = data.toString();
-            callback(err);
-        });
-    });
-
-    this.Given(/^the raster source$/, (data, callback) => {
-        fs.writeFile(path.resolve(this.TEST_FOLDER, 'rastersource.asc'), data, callback);
-    });
-
-    this.Given(/^the speed file$/, (data, callback) => {
-        fs.writeFile(path.resolve(this.TEST_FOLDER, 'speeds.csv'), data, callback);
-    });
-
-    this.Given(/^the data has been saved to disk$/, (callback) => {
-        try {
-            this.reprocess(callback);
-        } catch(e) {
-            this.processError = e;
-            callback(e);
-        }
-    });
-
-    this.Given(/^the data has been extracted$/, (callback) => {
-        this.writeAndExtract((err) => {
-            if (err) this.processError = err;
-            callback();
-        });
-    });
-
-    this.Given(/^the data has been contracted$/, (callback) => {
-        this.reprocess((err) => {
-            if (err) this.processError = err;
-            callback();
-        });
-    });
-
-    this.Given(/^osrm\-routed is stopped$/, (callback) => {
-        this.OSRMLoader.shutdown((err) => {
-            if (err) this.processError = err;
-            callback();
-        });
-    });
-
-    this.Given(/^data is loaded directly/, () => {
-        this.loadMethod = 'directly';
-    });
-
-    this.Given(/^data is loaded with datastore$/, () => {
-        this.loadMethod = 'datastore';
-    });
-
-    this.Given(/^the HTTP method "([^"]*)"$/, (method, callback) => {
-        this.httpMethod = method;
-        callback();
-    });
-};
@@ -0,0 +1,202 @@
+Given /^the profile "([^"]*)"$/ do |profile|
+  set_profile profile
+end
+
+Given(/^the import format "(.*?)"$/) do |format|
+  set_input_format format
+end
+
+Given /^the extract extra arguments "(.*?)"$/ do |args|
+    set_extract_args args
+end
+
+Given /^the contract extra arguments "(.*?)"$/ do |args|
+    set_contract_args args
+end
+
+Given /^a grid size of (\d+) meters$/ do |meters|
+  set_grid_size meters
+end
+
+Given /^the origin ([-+]?[0-9]*\.?[0-9]+),([-+]?[0-9]*\.?[0-9]+)$/ do |lat,lon|
+  set_origin [lon.to_f,lat.to_f]
+end
+
+Given /^the shortcuts$/ do |table|
+  table.hashes.each do |row|
+    shortcuts_hash[ row['key'] ] = row['value']
+  end
+end
+
+Given /^the node map$/ do |table|
+  table.raw.each_with_index do |row,ri|
+    row.each_with_index do |name,ci|
+      unless name.empty?
+        raise "*** node invalid name '#{name}', must be single characters" unless name.size == 1
+        raise "*** invalid node name '#{name}', must me alphanumeric" unless name.match /[a-z0-9]/
+        if name.match /[a-z]/
+          raise "*** duplicate node '#{name}'" if name_node_hash[name]
+          add_osm_node name, *table_coord_to_lonlat(ci,ri), nil
+        else
+          raise "*** duplicate node '#{name}'" if location_hash[name]
+          add_location name, *table_coord_to_lonlat(ci,ri)
+        end
+      end
+    end
+  end
+end
+
+Given /^the node locations$/ do |table|
+  table.hashes.each do |row|
+    name = row['node']
+    raise "*** duplicate node '#{name}'" if find_node_by_name name
+    if name.match /[a-z]/
+      id = row['id']
+      id = id.to_i if id
+      add_osm_node name, row['lon'].to_f, row['lat'].to_f, id
+    else
+      add_location name, row['lon'].to_f, row['lat'].to_f
+    end
+  end
+end
+
+Given /^the nodes$/ do |table|
+  table.hashes.each do |row|
+    name = row.delete 'node'
+    node = find_node_by_name(name)
+    raise "*** unknown node '#{c}'" unless node
+    node << row
+  end
+end
+
+Given /^the ways$/ do |table|
+  raise "*** Map data already defined - did you pass an input file in this scenaria?" if @osm_str
+  table.hashes.each do |row|
+    way = OSM::Way.new make_osm_id, OSM_USER, OSM_TIMESTAMP
+    way.uid = OSM_UID
+
+    nodes = row.delete 'nodes'
+    raise "*** duplicate way '#{nodes}'" if name_way_hash[nodes]
+    nodes.each_char do |c|
+      raise "*** ways can only use names a-z, '#{name}'" unless c.match /[a-z]/
+      node = find_node_by_name(c)
+      raise "*** unknown node '#{c}'" unless node
+      way << node
+    end
+
+    defaults = { 'highway' => 'primary' }
+    tags = defaults.merge(row)
+
+    if row['highway'] == '(nil)'
+      tags.delete 'highway'
+    end
+
+    if row['name'] == nil
+      tags['name'] = nodes
+    elsif (row['name'] == '""') || (row['name'] == "''")
+      tags['name'] = ''
+    elsif row['name'] == '' || row['name'] == '(nil)'
+      tags.delete 'name'
+    else
+      tags['name'] = row['name']
+    end
+
+    way << tags
+    osm_db << way
+    name_way_hash[nodes] = way
+  end
+end
+
+Given /^the relations$/ do |table|
+  raise "*** Map data already defined - did you pass an input file in this scenaria?" if @osm_str
+  table.hashes.each do |row|
+    relation = OSM::Relation.new make_osm_id, OSM_USER, OSM_TIMESTAMP
+    row.each_pair do |key,value|
+      if key =~ /^node:(.*)/
+        value.split(',').map { |v| v.strip }.each do |node_name|
+          raise "***invalid relation node member '#{node_name}', must be single character" unless node_name.size == 1
+          node = find_node_by_name(node_name)
+          raise "*** unknown relation node member '#{node_name}'" unless node
+          relation << OSM::Member.new( 'node', node.id, $1 )
+        end
+      elsif key =~ /^way:(.*)/
+        value.split(',').map { |v| v.strip }.each do |way_name|
+          way = find_way_by_name(way_name)
+          raise "*** unknown relation way member '#{way_name}'" unless way
+          relation << OSM::Member.new( 'way', way.id, $1 )
+        end
+      elsif key =~ /^(.*):(.*)/ && "#{$1}" != 'restriction'
+        raise "*** unknown relation member type '#{$1}:#{$2}', must be either 'node' or 'way'"
+      else
+        relation << { key => value }
+      end
+    end
+    relation.uid = OSM_UID
+    osm_db << relation
+  end
+end
+
+Given /^the defaults$/ do
+end
+
+Given /^the input file ([^"]*)$/ do |file|
+  raise "*** Input file must in .osm format" unless File.extname(file)=='.osm'
+  @osm_str = File.read file
+end
+
+Given /^the raster source$/ do |data|
+  Dir.chdir TEST_FOLDER do
+    File.open("rastersource.asc", "w") {|f| f.write(data)}
+  end
+end
+
+Given /^the speed file$/ do |data|
+  Dir.chdir TEST_FOLDER do
+    File.open("speeds.csv", "w") {|f| f.write(data)}
+  end
+end
+
+Given /^the data has been saved to disk$/ do
+  begin
+    write_input_data
+  rescue OSRMError => e
+    @process_error = e
+  end
+end
+
+Given /^the data has been extracted$/ do
+  begin
+    write_input_data
+    extract_data unless extracted?
+  rescue OSRMError => e
+    @process_error = e
+  end
+end
+
+Given /^the data has been contracted$/ do
+  begin
+    reprocess
+  rescue OSRMError => e
+    @process_error = e
+  end
+end
+
+Given /^osrm\-routed is stopped$/ do
+  begin
+    OSRMLoader.shutdown
+  rescue OSRMError => e
+    @process_error = e
+  end
+end
+
+Given /^data is loaded directly/ do
+  @load_method = 'directly'
+end
+
+Given /^data is loaded with datastore$/ do
+  @load_method = 'datastore'
+end
+
+Given /^the HTTP method "([^"]*)"$/ do |method|
+  @http_method = method
+end
@@ -1,81 +0,0 @@
-var util = require('util');
-
-module.exports = function () {
-    this.When(/^I request a travel time matrix I should get$/, (table, callback) => {
-        var NO_ROUTE = 2147483647;    // MAX_INT
-
-        var tableRows = table.raw();
-
-        if (tableRows[0][0] !== '') throw new Error('*** Top-left cell of matrix table must be empty');
-
-        var waypoints = [],
-            columnHeaders = tableRows[0].slice(1),
-            rowHeaders = tableRows.map((h) => h[0]).slice(1),
-            symmetric = columnHeaders.every((ele, i) => ele === rowHeaders[i]);
-
-        if (symmetric) {
-            columnHeaders.forEach((nodeName) => {
-                var node = this.findNodeByName(nodeName);
-                if (!node) throw new Error(util.format('*** unknown node "%s"'), nodeName);
-                waypoints.push({ coord: node, type: 'loc' });
-            });
-        } else {
-            columnHeaders.forEach((nodeName) => {
-                var node = this.findNodeByName(nodeName);
-                if (!node) throw new Error(util.format('*** unknown node "%s"'), nodeName);
-                waypoints.push({ coord: node, type: 'dst' });
-            });
-            rowHeaders.forEach((nodeName) => {
-                var node = this.findNodeByName(nodeName);
-                if (!node) throw new Error(util.format('*** unknown node "%s"'), nodeName);
-                waypoints.push({ coord: node, type: 'src' });
-            });
-        }
-
-        var actual = [];
-        actual.push(table.headers);
-
-        this.reprocessAndLoadData(() => {
-            // compute matrix
-            var params = this.queryParams;
-
-            this.requestTable(waypoints, params, (err, response) => {
-                if (err) return callback(err);
-                if (!response.body.length) return callback(new Error('Invalid response body'));
-
-                var json = JSON.parse(response.body);
-
-                var result = json['durations'].map(row => {
-                    var hashes = {};
-                    row.forEach((v, i) => { hashes[tableRows[0][i+1]] = isNaN(parseInt(v)) ? '' : v; });
-                    return hashes;
-                });
-
-                var testRow = (row, ri, cb) => {
-                    var ok = true;
-
-                    for (var k in result[ri]) {
-                        if (this.FuzzyMatch.match(result[ri][k], row[k])) {
-                            result[ri][k] = row[k];
-                        } else if (row[k] === '' && result[ri][k] === NO_ROUTE) {
-                            result[ri][k] = '';
-                        } else {
-                            result[ri][k] = result[ri][k].toString();
-                            ok = false;
-                        }
-                    }
-
-                    if (!ok) {
-                        var failed = { attempt: 'distance_matrix', query: this.query, response: response };
-                        this.logFail(row, result[ri], [failed]);
-                    }
-
-                    result[ri][''] = row[''];
-                    cb(null, result[ri]);
-                };
-
-                this.processRowsAndDiff(table, testRow, callback);
-            });
-        });
-    });
-};
@@ -0,0 +1,66 @@
+When /^I request a travel time matrix I should get$/ do |table|
+  no_route = 2147483647   # MAX_INT
+  
+  raise "*** Top-left cell of matrix table must be empty" unless table.headers[0]==""
+  
+  waypoints = []
+  column_headers = table.headers[1..-1]
+  row_headers = table.rows.map { |h| h.first }
+  symmetric = Set.new(column_headers) == Set.new(row_headers)
+  if symmetric then
+    column_headers.each do |node_name|
+      node = find_node_by_name(node_name)
+      raise "*** unknown node '#{node_name}" unless node
+      waypoints << {:coord => node, :type => "loc"}
+    end
+  else
+    column_headers.each do |node_name|
+      node = find_node_by_name(node_name)
+      raise "*** unknown node '#{node_name}" unless node
+      waypoints << {:coord => node, :type => "dst"}
+    end
+    row_headers.each do |node_name|
+      node = find_node_by_name(node_name)
+      raise "*** unknown node '#{node_name}" unless node
+      waypoints << {:coord => node, :type => "src"}
+    end
+  end
+  
+  reprocess
+  actual = []
+  actual << table.headers
+  OSRMLoader.load(self,"#{contracted_file}.osrm") do
+    
+    # compute matrix
+    params = @query_params
+    response = request_table waypoints, params
+    if response.body.empty? == false
+      json_result = JSON.parse response.body
+      result = json_result["distance_table"]
+    end
+
+    
+    # compare actual and expected result, one row at a time
+    table.rows.each_with_index do |row,ri|
+      # fuzzy match
+      ok = true
+      0.upto(result[ri].size-1) do |i|
+        if FuzzyMatch.match result[ri][i], row[i+1]
+          result[ri][i] = row[i+1]
+        elsif row[i+1]=="" and result[ri][i]==no_route
+          result[ri][i] = ""
+        else
+          result[ri][i] = result[ri][i].to_s
+          ok = false
+        end
+      end
+      
+      # add row header
+      r = [row[0],result[ri]].flatten
+      
+      # store row for comparison
+      actual << r
+    end
+  end
+  table.diff! actual
+end
@@ -1,30 +0,0 @@
-var util = require('util');
-
-module.exports = function () {
-    this.Before((scenario, callback) => {
-        this.scenarioTitle = scenario.getName();
-
-        this.loadMethod = this.DEFAULT_LOAD_METHOD;
-        this.queryParams = {};
-        var d = new Date();
-        this.scenarioTime = util.format('%d-%d-%dT%s:%s:%sZ', d.getFullYear(), d.getMonth()+1, d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds());
-        this.resetData();
-        this.hasLoggedPreprocessInfo = false;
-        this.hasLoggedScenarioInfo = false;
-        this.setGridSize(this.DEFAULT_GRID_SIZE);
-        this.setOrigin(this.DEFAULT_ORIGIN);
-        callback();
-    });
-
-    this.Before('@ignore-platform-windows', () => {
-        this.skipThisScenario();
-    });
-
-    this.Before('@ignore-platform-unix', () => {
-        this.skipThisScenario();
-    });
-
-    this.Before('@ignore-platform-mac', () => {
-        this.skipThisScenario();
-    });
-};
@@ -0,0 +1,11 @@
+Before '@ignore-platform-windows' do
+  skip_this_scenario
+end
+
+Before '@ignore-platform-unix' do
+  skip_this_scenario
+end
+
+Before '@ignore-platform-mac' do
+  skip_this_scenario
+end
@@ -1,174 +0,0 @@
-var util = require('util');
-var d3 = require('d3-queue');
-
-module.exports = function () {
-    this.When(/^I match I should get$/, (table, callback) => {
-        var got;
-
-        this.reprocessAndLoadData(() => {
-            var testRow = (row, ri, cb) => {
-                var afterRequest = (err, res) => {
-                    if (err) return cb(err);
-                    var json;
-
-                    var headers = new Set(table.raw()[0]);
-
-                    if (res.body.length) {
-                        json = JSON.parse(res.body);
-                    }
-
-                    if (headers.has('status')) {
-                        got.status = json.status.toString();
-                    }
-
-                    if (headers.has('message')) {
-                        got.message = json.status_message;
-                    }
-
-                    if (headers.has('#')) {
-                        // comment column
-                        got['#'] = row['#'];
-                    }
-
-                    var subMatchings = [],
-                        turns = '',
-                        route = '',
-                        duration = '';
-
-                    if (res.statusCode === 200) {
-                        if (headers.has('matchings')) {
-                            subMatchings = json.matchings.filter(m => !!m).map(sub => sub.matched_points);
-                        }
-
-                        if (headers.has('turns')) {
-                            if (json.matchings.length != 1) throw new Error('*** Checking turns only supported for matchings with one subtrace');
-                            turns = this.turnList(json.matchings[0].instructions);
-                        }
-
-                        if (headers.has('route')) {
-                            if (json.matchings.length != 1) throw new Error('*** Checking route only supported for matchings with one subtrace');
-                            route = this.wayList(json.matchings[0]);
-                        }
-
-                        if (headers.has('duration')) {
-                            if (json.matchings.length != 1) throw new Error('*** Checking duration only supported for matchings with one subtrace');
-                            duration = json.matchings[0].duration;
-                        }
-                    }
-
-                    if (headers.has('turns')) {
-                        got.turns = turns;
-                    }
-
-                    if (headers.has('route')) {
-                        got.route = route;
-                    }
-
-                    if (headers.has('duration')) {
-                        got.duration = duration.toString();
-                    }
-
-                    var ok = true;
-                    var encodedResult = '',
-                        extendedTarget = '';
-
-                    var q = d3.queue();
-
-                    var testSubMatching = (sub, si, scb) => {
-                        if (si >= subMatchings.length) {
-                            ok = false;
-                            q.abort();
-                            scb();
-                        } else {
-                            var sq = d3.queue();
-
-                            var testSubNode = (ni, ncb) => {
-                                var node = this.findNodeByName(sub[ni]),
-                                    outNode = subMatchings[si][ni];
-
-                                if (this.FuzzyMatch.matchLocation(outNode, node)) {
-                                    encodedResult += sub[ni];
-                                    extendedTarget += sub[ni];
-                                } else {
-                                    encodedResult += util.format('? [%s,%s]', outNode[0], outNode[1]);
-                                    extendedTarget += util.format('%s [%d,%d]', node.lat, node.lon);
-                                    ok = false;
-                                }
-                                ncb();
-                            };
-
-                            for (var i=0; i<sub.length; i++) {
-                                sq.defer(testSubNode, i);
-                            }
-
-                            sq.awaitAll(scb);
-                        }
-                    };
-
-                    row.matchings.split(',').forEach((sub, si) => {
-                        q.defer(testSubMatching, sub, si);
-                    });
-
-                    q.awaitAll(() => {
-                        if (ok) {
-                            if (headers.has('matchings')) {
-                                got.matchings = row.matchings;
-                            }
-
-                            if (headers.has('timestamps')) {
-                                got.timestamps = row.timestamps;
-                            }
-                        } else {
-                            got.matchings = encodedResult;
-                            row.matchings = extendedTarget;
-                            this.logFail(row, got, { matching: { query: this.query, response: res } });
-                        }
-
-                        cb(null, got);
-                    });
-                };
-
-                if (row.request) {
-                    got = {};
-                    got.request = row.request;
-                    this.requestUrl(row.request, afterRequest);
-                } else {
-                    var params = this.queryParams;
-                    got = {};
-                    for (var k in row) {
-                        var match = k.match(/param:(.*)/);
-                        if (match) {
-                            if (row[k] === '(nil)') {
-                                params[match[1]] = null;
-                            } else if (row[k]) {
-                                params[match[1]] = [row[k]];
-                            }
-                            got[k] = row[k];
-                        }
-                    }
-
-                    var trace = [],
-                        timestamps = [];
-
-                    if (row.trace) {
-                        for (var i=0; i<row.trace.length; i++) {
-                            var n = row.trace[i],
-                                node = this.findNodeByName(n);
-                            if (!node) throw new Error(util.format('*** unknown waypoint node "%s"'), n);
-                            trace.push(node);
-                        }
-                        if (row.timestamps) {
-                            timestamps = row.timestamps.split(' ').filter(s => !!s).map(t => parseInt(t, 10));
-                        }
-                        got.trace = row.trace;
-                        this.requestMatching(trace, timestamps, params, afterRequest);
-                    } else {
-                        throw new Error('*** no trace');
-                    }
-                }
-            };
-
-            this.processRowsAndDiff(table, testRow, callback);
-        });
-    });
-};
@@ -0,0 +1,124 @@
+When /^I match I should get$/ do |table|
+  reprocess
+  actual = []
+  OSRMLoader.load(self,"#{contracted_file}.osrm") do
+    table.hashes.each_with_index do |row,ri|
+      if row['request']
+        got = {'request' => row['request'] }
+        response = request_url row['request']
+      else
+        params = @query_params
+        got = {}
+        row.each_pair do |k,v|
+          if k =~ /param:(.*)/
+            if v=='(nil)'
+              params[$1]=nil
+            elsif v!=nil
+              params[$1]=[v]
+            end
+            got[k]=v
+          end
+        end
+        trace = []
+        timestamps = []
+        if row['trace']
+          row['trace'].each_char do |n|
+            node = find_node_by_name(n.strip)
+            raise "*** unknown waypoint node '#{n.strip}" unless node
+            trace << node
+          end
+          if row['timestamps']
+              timestamps = row['timestamps'].split(" ").compact.map { |t| t.to_i}
+          end
+          got = got.merge({'trace' => row['trace'] })
+          response = request_matching trace, timestamps, params
+        else
+          raise "*** no trace"
+        end
+      end
+
+      if response.body.empty? == false
+        json = JSON.parse response.body
+      end
+
+      if table.headers.include? 'status'
+        got['status'] = json['status'].to_s
+      end
+      if table.headers.include? 'message'
+        got['message'] = json['status_message']
+      end
+      if table.headers.include? '#'   # comment column
+        got['#'] = row['#']           # copy value so it always match
+      end
+
+      sub_matchings = []
+      turns = ''
+      route = ''
+      duration = ''
+      if response.code == "200"
+        if table.headers.include? 'matchings'
+          sub_matchings = json['matchings'].compact.map { |sub| sub['matched_points']}
+        end
+        if table.headers.include? 'turns'
+          raise "*** Checking turns only support for matchings with one subtrace" unless json['matchings'].size == 1
+          turns = turn_list json['matchings'][0]['instructions']
+        end
+        if table.headers.include? 'route'
+          raise "*** Checking route only support for matchings with one subtrace" unless json['matchings'].size == 1
+          route = way_list json['matchings'][0]['instructions']
+        if table.headers.include? 'duration'
+          raise "*** Checking duration only support for matchings with one subtrace" unless json['matchings'].size == 1
+          duration = json['matchings'][0]['route_summary']['total_time']
+        end
+        end
+      end
+
+      if table.headers.include? 'turns'
+        got['turns'] = turns
+      end
+      if table.headers.include? 'route'
+        got['route'] = route
+      end
+      if table.headers.include? 'duration'
+        got['duration'] = duration.to_s
+      end
+
+      ok = true
+      encoded_result = ""
+      extended_target = ""
+      row['matchings'].split(',').each_with_index do |sub, sub_idx|
+        if sub_idx >= sub_matchings.length
+          ok = false
+          break
+        end
+        sub.length.times do |node_idx|
+          node = find_node_by_name(sub[node_idx])
+          out_node = sub_matchings[sub_idx][node_idx]
+          if FuzzyMatch.match_location out_node, node
+            encoded_result += sub[node_idx]
+            extended_target += sub[node_idx]
+          else
+            encoded_result += "? [#{out_node[0]},#{out_node[1]}]"
+            extended_target += "#{sub[node_idx]} [#{node.lat},#{node.lon}]"
+            ok = false
+          end
+        end
+      end
+      if ok
+        if table.headers.include? 'matchings'
+          got['matchings'] = row['matchings']
+        end
+        if table.headers.include? 'timestamps'
+          got['timestamps'] = row['timestamps']
+        end
+      else
+        got['matchings'] = encoded_result
+        row['matchings'] = extended_target
+        log_fail row,got, { 'matching' => {:query => @query, :response => response} }
+      end
+
+      actual << got
+    end
+  end
+  table.diff! actual
+end
@@ -1,53 +0,0 @@
-var util = require('util');
-
-module.exports = function () {
-    this.When(/^I request nearest I should get$/, (table, callback) => {
-        this.reprocessAndLoadData(() => {
-            var testRow = (row, ri, cb) => {
-                var inNode = this.findNodeByName(row.in);
-                if (!inNode) throw new Error(util.format('*** unknown in-node "%s"'), row.in);
-
-                var outNode = this.findNodeByName(row.out);
-                if (!outNode) throw new Error(util.format('*** unknown out-node "%s"'), row.out);
-
-                this.requestNearest(inNode, this.queryParams, (err, response) => {
-                    if (err) return cb(err);
-                    var coord;
-
-                    if (response.statusCode === 200 && response.body.length) {
-                        var json = JSON.parse(response.body);
-
-                        coord = json.waypoints[0].location;
-
-                        var got = { in: row.in, out: row.out };
-
-                        var ok = true;
-
-                        Object.keys(row).forEach((key) => {
-                            if (key === 'out') {
-                                if (this.FuzzyMatch.matchLocation(coord, outNode)) {
-                                    got[key] = row[key];
-                                } else {
-                                    row[key] = util.format('%s [%d,%d]', row[key], outNode.lat, outNode.lon);
-                                    ok = false;
-                                }
-                            }
-                        });
-
-                        if (!ok) {
-                            var failed = { attempt: 'nearest', query: this.query, response: response };
-                            this.logFail(row, got, [failed]);
-                        }
-
-                        cb(null, got);
-                    }
-                    else {
-                        cb();
-                    }
-                });
-            };
-
-            this.processRowsAndDiff(table, testRow, callback);
-        });
-    });
-};
@@ -0,0 +1,51 @@
+When /^I request nearest I should get$/ do |table|
+  reprocess
+  actual = []
+  OSRMLoader.load(self,"#{contracted_file}.osrm") do
+    table.hashes.each_with_index do |row,ri|
+      in_node = find_node_by_name row['in']
+      raise "*** unknown in-node '#{row['in']}" unless in_node
+
+      out_node = find_node_by_name row['out']
+      raise "*** unknown out-node '#{row['out']}" unless out_node
+
+      response = request_nearest in_node, @query_params
+      if response.code == "200" && response.body.empty? == false
+        json = JSON.parse response.body
+        if json['status'] == 200
+          coord =  json['mapped_coordinate']
+        end
+      end
+
+      got = {'in' => row['in'], 'out' => coord }
+
+      ok = true
+      row.keys.each do |key|
+        if key=='out'
+          if FuzzyMatch.match_location coord, out_node
+            got[key] = row[key]
+          else
+            row[key] = "#{row[key]} [#{out_node.lat},#{out_node.lon}]"
+            ok = false
+          end
+        end
+      end
+
+      unless ok
+        failed = { :attempt => 'nearest', :query => @query, :response => response }
+        log_fail row,got,[failed]
+      end
+
+      actual << got
+    end
+  end
+  table.diff! actual
+end
+
+When /^I request nearest (\d+) times I should get$/ do |n,table|
+  ok = true
+  n.to_i.times do
+    ok = false unless step "I request nearest I should get", table
+  end
+  ok
+end
@@ -1,69 +0,0 @@
-var assert = require('assert');
-
-module.exports = function () {
-    this.When(/^I run "osrm\-routed\s?(.*?)"$/, { timeout: this.SHUTDOWN_TIMEOUT }, (options, callback) => {
-        this.runBin('osrm-routed', options, () => {
-            callback();
-        });
-    });
-
-    this.When(/^I run "osrm\-extract\s?(.*?)"$/, (options, callback) => {
-        this.runBin('osrm-extract', options, () => {
-            callback();
-        });
-    });
-
-    this.When(/^I run "osrm\-contract\s?(.*?)"$/, (options, callback) => {
-        this.runBin('osrm-contract', options, () => {
-            callback();
-        });
-    });
-
-    this.When(/^I run "osrm\-datastore\s?(.*?)"$/, (options, callback) => {
-        this.runBin('osrm-datastore', options, () => {
-            callback();
-        });
-    });
-
-    this.Then(/^it should exit with code (\d+)$/, (code) => {
-        assert.equal(this.exitCode, parseInt(code));
-    });
-
-    this.Then(/^stdout should contain "(.*?)"$/, (str) => {
-        assert.ok(this.stdout.indexOf(str) > -1);
-    });
-
-    this.Then(/^stderr should contain "(.*?)"$/, (str) => {
-        assert.ok(this.stderr.indexOf(str) > -1);
-    });
-
-    this.Then(/^stdout should contain \/(.*)\/$/, (regexStr) => {
-        var re = new RegExp(regexStr);
-        assert.ok(this.stdout.match(re));
-    });
-
-    this.Then(/^stderr should contain \/(.*)\/$/, (regexStr) => {
-        var re = new RegExp(regexStr);
-        assert.ok(this.stdout.match(re));
-    });
-
-    this.Then(/^stdout should be empty$/, () => {
-        assert.equal(this.stdout.trim(), '');
-    });
-
-    this.Then(/^stderr should be empty$/, () => {
-        assert.equal(this.stderr.trim(), '');
-    });
-
-    this.Then(/^stdout should contain (\d+) lines?$/, (lines) => {
-        assert.equal(this.stdout.split('\n').length - 1, parseInt(lines));
-    });
-
-    this.Given(/^the query options$/, (table, callback) => {
-        table.raw().forEach(tuple => {
-            this.queryParams[tuple[0]] = tuple[1];
-        });
-
-        callback();
-    });
-};
@@ -0,0 +1,57 @@
+When(/^I run "osrm\-routed\s?(.*?)"$/) do |options|
+  begin
+    Timeout.timeout(SHUTDOWN_TIMEOUT) { run_bin 'osrm-routed', options }
+  rescue Timeout::Error
+    raise "*** osrm-routed didn't quit. Maybe the --trial option wasn't used?"
+  end
+end
+
+When(/^I run "osrm\-extract\s?(.*?)"$/) do |options|
+  run_bin 'osrm-extract', options
+end
+
+When(/^I run "osrm\-contract\s?(.*?)"$/) do |options|
+  run_bin 'osrm-contract', options
+end
+
+When(/^I run "osrm\-datastore\s?(.*?)"$/) do |options|
+  run_bin 'osrm-datastore', options
+end
+
+Then /^it should exit with code (\d+)$/ do |code|
+  expect(@exit_code).to eq( code.to_i )
+end
+
+Then /^stdout should contain "(.*?)"$/ do |str|
+  expect(@stdout).to include(str)
+end
+
+Then /^stderr should contain "(.*?)"$/ do |str|
+  expect(@stderr).to include(str)
+end
+
+Then(/^stdout should contain \/(.*)\/$/) do |regex_str|
+  regex = Regexp.new regex_str
+  expect(@stdout).to match( regex )
+end
+
+Then(/^stderr should contain \/(.*)\/$/) do |regex_str|
+  regex = Regexp.new regex_str
+  expect(@stderr).to match( regex )
+end
+
+Then /^stdout should be empty$/ do
+  expect(@stdout).to eq("")
+end
+
+Then /^stderr should be empty$/ do
+  expect(@stderr).to eq("")
+end
+
+Then /^stdout should contain (\d+) lines?$/ do |lines|
+  expect(@stdout.lines.count).to eq( lines.to_i )
+end
+
+Given (/^the query options$/) do |table|
+  table.rows_hash.each { |k,v| @query_params << [k, v] }
+end
@@ -1,57 +0,0 @@
-var assert = require('assert');
-
-module.exports = function () {
-    this.When(/^I request \/(.*)$/, (path, callback) => {
-        this.reprocessAndLoadData(() => {
-            this.requestPath(path, {}, (err, res, body) => {
-                this.response = res;
-                callback(err, res, body);
-            });
-        });
-    });
-
-    this.Then(/^I should get a response/, () => {
-        this.ShouldGetAResponse();
-    });
-
-    this.Then(/^response should be valid JSON$/, (callback) => {
-        this.ShouldBeValidJSON(callback);
-    });
-
-    this.Then(/^response should be well-formed$/, () => {
-        this.ShouldBeWellFormed();
-    });
-
-    this.Then(/^status code should be (\d+)$/, (code, callback) => {
-        try {
-            this.json = JSON.parse(this.response.body);
-        } catch(e) {
-            return callback(e);
-        }
-        assert.equal(this.json.status, parseInt(code));
-        callback();
-    });
-
-    this.Then(/^status message should be "(.*?)"$/, (message, callback) => {
-        try {
-            this.json = JSON.parse(this.response.body);
-        } catch(e) {
-            return callback(e);
-        }
-        assert(this.json.status_message, message);
-        callback();
-    });
-
-    this.Then(/^response should be a well-formed route$/, () => {
-        this.ShouldBeWellFormed();
-        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) => {
-        assert.ok(this.processError instanceof this.OSRMError);
-        assert.equal(this.processError.process, binary);
-        assert.equal(parseInt(this.processError.code), parseInt(code));
-    });
-};
@@ -0,0 +1,46 @@
+When /^I request \/(.*)$/ do |path|
+  reprocess
+  OSRMLoader.load(self,"#{contracted_file}.osrm") do
+    @response = request_path path, []
+  end
+end
+
+Then /^I should get a response/ do
+  expect(@response.code).to eq("200")
+  expect(@response.body).not_to eq(nil)
+  expect(@response.body).not_to eq('')
+end
+
+Then /^response should be valid JSON$/ do
+  @json = JSON.parse @response.body
+end
+
+Then /^response should be well-formed$/ do
+  expect(@json['status'].class).to eq(Fixnum)
+end
+
+Then /^status code should be (\d+)$/ do |code|
+  @json = JSON.parse @response.body
+  expect(@json['status']).to eq(code.to_i)
+end
+
+Then /^status message should be "(.*?)"$/ do |message|
+  @json = JSON.parse @response.body
+  expect(@json['status_message']).to eq(message)
+end
+
+Then /^response should be a well-formed route$/ do
+  step "response should be well-formed"
+  expect(@json['status_message'].class).to eq(String)
+  expect(@json['route_summary'].class).to eq(Hash)
+  expect(@json['route_geometry'].class).to eq(String)
+  expect(@json['route_instructions'].class).to eq(Array)
+  expect(@json['via_points'].class).to eq(Array)
+  expect(@json['via_indices'].class).to eq(Array)
+end
+
+Then /^"([^"]*)" should return code (\d+)$/ do |binary, code|
+  expect(@process_error.is_a?(OSRMError)).to eq(true)
+  expect(@process_error.process).to eq(binary)
+  expect(@process_error.code.to_i).to eq(code.to_i)
+end
@@ -1,120 +0,0 @@
-var util = require('util');
-var d3 = require('d3-queue');
-var classes = require('../support/data_classes');
-
-module.exports = function () {
-    this.Then(/^routability should be$/, (table, callback) => {
-        this.buildWaysFromTable(table, () => {
-            var directions = ['forw','backw','bothw'],
-                headers = new Set(Object.keys(table.hashes()[0]));
-
-            if (!directions.some(k => !!headers.has(k))) {
-                throw new Error('*** routability table must contain either "forw", "backw" or "bothw" column');
-            }
-
-            this.reprocessAndLoadData(() => {
-                var testRow = (row, i, cb) => {
-                    var outputRow = row;
-
-                    testRoutabilityRow(i, (err, result) => {
-                        if (err) return cb(err);
-                        directions.filter(d => headers.has(d)).forEach((direction) => {
-                            var want = this.shortcutsHash[row[direction]] || row[direction];
-
-                            switch (true) {
-                            case '' === want:
-                            case 'x' === want:
-                                outputRow[direction] = result[direction].status ?
-                                    result[direction].status.toString() : '';
-                                break;
-                            case /^\d+s/.test(want):
-                                break;
-                            case /^\d+ km\/h/.test(want):
-                                break;
-                            default:
-                                throw new Error(util.format('*** Unknown expectation format: %s', want));
-                            }
-
-                            if (this.FuzzyMatch.match(outputRow[direction], want)) {
-                                outputRow[direction] = row[direction];
-                            }
-                        });
-
-                        if (outputRow != row) {
-                            this.logFail(row, outputRow, result);
-                        }
-
-                        cb(null, outputRow);
-                    });
-                };
-
-                this.processRowsAndDiff(table, testRow, callback);
-            });
-        });
-    });
-
-    var testRoutabilityRow = (i, cb) => {
-        var result = {};
-
-        var testDirection = (dir, callback) => {
-            var a = new classes.Location(this.origin[0] + (1+this.WAY_SPACING*i) * this.zoom, this.origin[1]),
-                b = new classes.Location(this.origin[0] + (3+this.WAY_SPACING*i) * this.zoom, this.origin[1]),
-                r = {};
-
-            r.which = dir;
-
-            this.requestRoute((dir === 'forw' ? [a, b] : [b, a]), [], this.queryParams, (err, res, body) => {
-                if (err) return callback(err);
-
-                r.query = this.query;
-                r.json = JSON.parse(body);
-                r.status = res.statusCode === 200 ? 'x' : null;
-                if (r.status) {
-                    r.route = this.wayList(r.json.routes[0]);
-
-                    if (r.route.split(',')[0] === util.format('w%d', i)) {
-                        r.time = r.json.routes[0].duration;
-                        r.distance = r.json.routes[0].distance;
-                        r.speed = r.time > 0 ? parseInt(3.6 * r.distance / r.time) : null;
-                    } else {
-                        r.status = null;
-                    }
-                }
-
-                callback(null, r);
-            });
-        };
-
-        d3.queue(1)
-            .defer(testDirection, 'forw')
-            .defer(testDirection, 'backw')
-            .awaitAll((err, res) => {
-                if (err) return cb(err);
-                // check if forw and backw returned the same values
-                res.forEach((dirRes) => {
-                    var which = dirRes.which;
-                    delete dirRes.which;
-                    result[which] = dirRes;
-                });
-
-                result.bothw = {};
-
-                var sq = d3.queue();
-
-                var parseRes = (key, scb) => {
-                    if (result.forw[key] === result.backw[key]) {
-                        result.bothw[key] = result.forw[key];
-                    } else {
-                        result.bothw[key] = 'diff';
-                    }
-                    scb();
-                };
-
-                ['status', 'time', 'distance', 'speed'].forEach((key) => {
-                    sq.defer(parseRes, key);
-                });
-
-                sq.awaitAll(() => { cb(null, result); });
-            });
-    };
-};
@@ -0,0 +1,78 @@
+def test_routability_row i
+  result = {}
+  ['forw','backw'].each do |direction|
+    a = Location.new @origin[0]+(1+WAY_SPACING*i)*@zoom, @origin[1]
+    b = Location.new @origin[0]+(3+WAY_SPACING*i)*@zoom, @origin[1]
+    r = {}
+    r[:response] = request_route (direction=='forw' ? [a,b] : [b,a]), [], @query_params
+    r[:query] = @query
+    r[:json] = JSON.parse(r[:response].body)
+
+    r[:status] = (route_status r[:response]) == 200 ? 'x' : nil
+    if r[:status] then
+      r[:route] = way_list r[:json]['route_instructions']
+
+      if r[:route]=="w#{i}"
+        r[:time] = r[:json]['route_summary']['total_time']
+        r[:distance] = r[:json]['route_summary']['total_distance']
+        r[:speed] = r[:time]>0 ? (3.6*r[:distance]/r[:time]).to_i : nil
+      else
+        # if we hit the wrong way segment, we assume it's
+        # because the one we tested was not unroutable
+        r[:status] = nil
+      end
+    end
+    result[direction] = r
+  end
+
+  # check if forw and backw returned the same values
+  result['bothw'] = {}
+  [:status,:time,:distance,:speed].each do |key|
+    if result['forw'][key] == result['backw'][key]
+      result['bothw'][key] = result['forw'][key]
+    else
+      result['bothw'][key] = 'diff'
+    end
+  end
+  result
+end
+
+Then /^routability should be$/ do |table|
+  build_ways_from_table table
+  reprocess
+  actual = []
+  if table.headers&["forw","backw","bothw"] == []
+    raise "*** routability tabel must contain either 'forw', 'backw' or 'bothw' column"
+  end
+  OSRMLoader.load(self,"#{contracted_file}.osrm") do
+    table.hashes.each_with_index do |row,i|
+      output_row = row.dup
+      attempts = []
+      result = test_routability_row i
+      directions = ['forw','backw','bothw']
+      (directions & table.headers).each do |direction|
+        want = shortcuts_hash[row[direction]] || row[direction]     #expand shortcuts
+        case want
+        when '', 'x'
+          output_row[direction] = result[direction][:status] ? result[direction][:status].to_s : ''
+        when /^\d+s/
+          output_row[direction] = result[direction][:time] ? "#{result[direction][:time]}s" : ''
+        when /^\d+ km\/h/
+          output_row[direction] = result[direction][:speed] ? "#{result[direction][:speed]} km/h" : ''
+        else
+          raise "*** Unknown expectation format: #{want}"
+        end
+
+        if FuzzyMatch.match output_row[direction], want
+          output_row[direction] = row[direction]
+        end
+      end
+
+      if output_row != row
+        log_fail row,output_row,result
+      end
+      actual << output_row
+    end
+  end
+  table.diff! actual
+end
@@ -1,16 +0,0 @@
-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) => {
-        var q = d3.queue(1);
-
-        for (var i=0; i<n; i++) {
-            q.defer(this.WhenIRouteIShouldGet, table);
-        }
-
-        q.awaitAll(callback);
-    });
-};
@@ -0,0 +1,165 @@
+When /^I route I should get$/ do |table|
+  reprocess
+  actual = []
+  OSRMLoader.load(self,"#{contracted_file}.osrm") do
+    table.hashes.each_with_index do |row,ri|
+      if row['request']
+        got = {'request' => row['request'] }
+        response = request_url row['request']
+      else
+        default_params = @query_params
+        user_params = []
+        got = {}
+        row.each_pair do |k,v|
+          if k =~ /param:(.*)/
+            if v=='(nil)'
+              user_params << [$1, nil]
+            elsif v!=nil
+              user_params << [$1, v]
+            end
+            got[k]=v
+          end
+        end
+        params = overwrite_params default_params, user_params
+        waypoints = []
+        bearings = []
+        if row['bearings']
+          got['bearings'] = row['bearings']
+          bearings = row['bearings'].split(' ').compact
+        end
+        if row['from'] and row['to']
+          node = find_node_by_name(row['from'])
+          raise "*** unknown from-node '#{row['from']}" unless node
+          waypoints << node
+
+          node = find_node_by_name(row['to'])
+          raise "*** unknown to-node '#{row['to']}" unless node
+          waypoints << node
+
+          got = got.merge({'from' => row['from'], 'to' => row['to'] })
+          response = request_route waypoints, bearings, params
+        elsif row['waypoints']
+          row['waypoints'].split(',').each do |n|
+            node = find_node_by_name(n.strip)
+            raise "*** unknown waypoint node '#{n.strip}" unless node
+            waypoints << node
+          end
+          got = got.merge({'waypoints' => row['waypoints'] })
+          response = request_route waypoints, bearings, params
+        else
+          raise "*** no waypoints"
+        end
+      end
+
+      if response.body.empty? == false
+        json = JSON.parse response.body
+      end
+
+      if response.body.empty? == false
+        if json['status'] == 200
+          instructions = way_list json['route_instructions']
+          bearings = bearing_list json['route_instructions']
+          compasses = compass_list json['route_instructions']
+          turns = turn_list json['route_instructions']
+          modes = mode_list json['route_instructions']
+          times = time_list json['route_instructions']
+          distances = distance_list json['route_instructions']
+        end
+      end
+
+      if table.headers.include? 'status'
+        got['status'] = json['status'].to_s
+      end
+      if table.headers.include? 'message'
+        got['message'] = json['status_message']
+      end
+      if table.headers.include? '#'   # comment column
+        got['#'] = row['#']           # copy value so it always match
+      end
+
+      if table.headers.include? 'start'
+        got['start'] = instructions ? json['route_summary']['start_point'] : nil
+      end
+      if table.headers.include? 'end'
+        got['end'] = instructions ? json['route_summary']['end_point'] : nil
+      end
+      if table.headers.include? 'geometry'
+          got['geometry'] = json['route_geometry']
+      end
+      if table.headers.include? 'route'
+        got['route'] = (instructions || '').strip
+        if table.headers.include?('alternative')
+          got['alternative'] =
+            if json['found_alternative']
+              way_list json['alternative_instructions'].first
+            else
+              ""
+            end
+        end
+        if table.headers.include?('distance')
+          if row['distance']!=''
+            raise "*** Distance must be specied in meters. (ex: 250m)" unless row['distance'] =~ /\d+m/
+          end
+          got['distance'] = instructions ? "#{json['route_summary']['total_distance'].to_s}m" : ''
+        end
+        if table.headers.include?('time')
+          raise "*** Time must be specied in seconds. (ex: 60s)" unless row['time'] =~ /\d+s/
+          got['time'] = instructions ? "#{json['route_summary']['total_time'].to_s}s" : ''
+        end
+        if table.headers.include?('speed')
+          if row['speed'] != '' && instructions
+            raise "*** Speed must be specied in km/h. (ex: 50 km/h)" unless row['speed'] =~ /\d+ km\/h/
+              time = json['route_summary']['total_time']
+              distance = json['route_summary']['total_distance']
+              speed = time>0 ? (3.6*distance/time).round : nil
+              got['speed'] =  "#{speed} km/h"
+          else
+            got['speed'] = ''
+          end
+        end
+        if table.headers.include? 'bearing'
+          got['bearing'] = instructions ? bearings : ''
+        end
+        if table.headers.include? 'compass'
+          got['compass'] = instructions ? compasses : ''
+        end
+        if table.headers.include? 'turns'
+          got['turns'] = instructions ? turns : ''
+        end
+        if table.headers.include? 'modes'
+          got['modes'] = instructions ? modes : ''
+        end
+        if table.headers.include? 'times'
+          got['times'] = instructions ? times : ''
+        end
+        if table.headers.include? 'distances'
+          got['distances'] = instructions ? distances : ''
+        end
+      end
+
+      ok = true
+      row.keys.each do |key|
+        if FuzzyMatch.match got[key], row[key]
+          got[key] = row[key]
+        else
+          ok = false
+        end
+      end
+
+      unless ok
+        log_fail row,got, { 'route' => {:query => @query, :response => response} }
+      end
+
+      actual << got
+    end
+  end
+  table.diff! actual
+end
+
+When /^I route (\d+) times I should get$/ do |n,table|
+  ok = true
+  n.to_i.times do
+    ok = false unless step "I route I should get", table
+  end
+  ok
+end
@@ -1,13 +0,0 @@
-var assert = require('assert');
-
-module.exports = function () {
-    this.Then(/^I should get a valid timestamp/, (callback) => {
-        this.ShouldGetAResponse();
-        this.ShouldBeValidJSON((err) => {
-            this.ShouldBeWellFormed();
-            assert.equal(typeof this.json.timestamp, 'string');
-            assert.equal(this.json.timestamp, '2000-01-01T00:00:00Z');
-            callback(err);
-        });
-    });
-};
@@ -0,0 +1,7 @@
+Then /^I should get a valid timestamp/ do
+  step "I should get a response"
+  step "response should be valid JSON"
+  step "response should be well-formed"
+  expect(@json['timestamp'].class).to eq(String)
+  expect(@json['timestamp']).to eq("2000-01-01T00:00:00Z")
+end
@@ -1,142 +0,0 @@
-var util = require('util');
-
-module.exports = function () {
-    this.When(/^I plan a trip I should get$/, (table, callback) => {
-        var got;
-
-        this.reprocessAndLoadData(() => {
-            var testRow = (row, ri, cb) => {
-                var afterRequest = (err, res) => {
-                    if (err) return cb(err);
-                    var headers = new Set(table.raw()[0]);
-
-                    for (var k in row) {
-                        var match = k.match(/param:(.*)/);
-                        if (match) {
-                            if (row[k] === '(nil)') {
-                                params[match[1]] = null;
-                            } else if (row[k]) {
-                                params[match[1]] = [row[k]];
-                            }
-
-                            got[k] = row[k];
-                        }
-                    }
-
-                    var json;
-                    if (res.body.length) {
-                        json = JSON.parse(res.body);
-                    }
-
-                    if (headers.has('status')) {
-                        got.status = json.status.toString();
-                    }
-
-                    if (headers.has('message')) {
-                        got.message = json.status_message;
-                    }
-
-                    if (headers.has('#')) {
-                        // comment column
-                        got['#'] = row['#'];
-                    }
-
-                    var subTrips;
-                    if (res.statusCode === 200) {
-                        if (headers.has('trips')) {
-                            subTrips = json.trips.filter(t => !!t).map(t => t.legs).map(tl => Array.prototype.concat.apply([], tl.map((sl, i) => {
-                                var toAdd = [];
-                                if (i === 0) toAdd.push(sl.steps[0].maneuver.location);
-                                toAdd.push(sl.steps[sl.steps.length-1].maneuver.location);
-                                return toAdd;
-                            })));
-                        }
-                    }
-
-                    var ok = true,
-                        encodedResult = '',
-                        extendedTarget = '';
-
-                    row.trips.split(',').forEach((sub, si) => {
-                        if (si >= subTrips.length) {
-                            ok = false;
-                        } else {
-                            ok = false;
-                            // TODO: Check all rotations of the round trip
-                            for (var ni=0; ni<sub.length; ni++) {
-                                var node = this.findNodeByName(sub[ni]),
-                                    outNode = subTrips[si][ni];
-                                if (this.FuzzyMatch.matchLocation(outNode, node)) {
-                                    encodedResult += sub[ni];
-                                    extendedTarget += sub[ni];
-                                    ok = true;
-                                } else {
-                                    encodedResult += util.format('? [%s,%s]', outNode[0], outNode[1]);
-                                    extendedTarget += util.format('%s [%d,%d]', sub[ni], node.lat, node.lon);
-                                }
-                            }
-                        }
-                    });
-
-                    if (ok) {
-                        got.trips = row.trips;
-                        got.via_points = row.via_points;
-                    } else {
-                        got.trips = encodedResult;
-                        got.trips = extendedTarget;
-                        this.logFail(row, got, { trip: { query: this.query, response: res }});
-                    }
-
-                    ok = true;
-
-                    for (var key in row) {
-                        if (this.FuzzyMatch.match(got[key], row[key])) {
-                            got[key] = row[key];
-                        } else {
-                            ok = false;
-                        }
-                    }
-
-                    if (!ok) {
-                        this.logFail(row, got, { trip: { query: this.query, response: res }});
-                    }
-
-                    cb(null, got);
-                };
-
-                if (row.request) {
-                    got.request = row.request;
-                    this.requestUrl(row.request, afterRequest);
-                } 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));
-                        waypoints.push(fromNode);
-
-                        var toNode = this.findNodeByName(row.to);
-                        if (!toNode) throw new Error(util.format('*** unknown to-node "%s"', row.to));
-                        waypoints.push(toNode);
-
-                        got = { from: row.from, to: row.to };
-                        this.requestTrip(waypoints, params, afterRequest);
-                    } else if (row.waypoints) {
-                        row.waypoints.split(',').forEach((n) => {
-                            var node = this.findNodeByName(n);
-                            if (!node) throw new Error(util.format('*** unknown waypoint node "%s"', n.trim()));
-                            waypoints.push(node);
-                        });
-                        got = { waypoints: row.waypoints };
-                        this.requestTrip(waypoints, params, afterRequest);
-                    } else {
-                        throw new Error('*** no waypoints');
-                    }
-                }
-            };
-
-            this.processRowsAndDiff(table, testRow, callback);
-        });
-    });
-};
@@ -0,0 +1,121 @@
+When /^I plan a trip I should get$/ do |table|
+  reprocess
+  actual = []
+  OSRMLoader.load(self,"#{contracted_file}.osrm") do
+    table.hashes.each_with_index do |row,ri|
+      if row['request']
+        got = {'request' => row['request'] }
+        response = request_url row['request']
+      else
+        params = @query_params
+        waypoints = []
+        if row['from'] and row['to']
+          node = find_node_by_name(row['from'])
+          raise "*** unknown from-node '#{row['from']}" unless node
+          waypoints << node
+
+          node = find_node_by_name(row['to'])
+          raise "*** unknown to-node '#{row['to']}" unless node
+          waypoints << node
+
+          got = {'from' => row['from'], 'to' => row['to'] }
+          response = request_trip waypoints, params
+        elsif row['waypoints']
+          row['waypoints'].split(',').each do |n|
+            node = find_node_by_name(n.strip)
+            raise "*** unknown waypoint node '#{n.strip}" unless node
+            waypoints << node
+          end
+          got = {'waypoints' => row['waypoints'] }
+          response = request_trip waypoints, params
+        else
+          raise "*** no waypoints"
+        end
+      end
+
+      row.each_pair do |k,v|
+        if k =~ /param:(.*)/
+          if v=='(nil)'
+            params[$1]=nil
+          elsif v!=nil
+            params[$1]=[v]
+          end
+          got[k]=v
+        end
+      end
+
+      if response.body.empty? == false
+        json = JSON.parse response.body
+      end
+
+      if table.headers.include? 'status'
+        got['status'] = json['status'].to_s
+      end
+      if table.headers.include? 'message'
+        got['message'] = json['status_message']
+      end
+      if table.headers.include? '#'   # comment column
+        got['#'] = row['#']           # copy value so it always match
+      end
+
+      if response.code == "200"
+        if table.headers.include? 'trips'
+          sub_trips = json['trips'].compact.map { |sub| sub['via_points']}
+        end
+      end
+
+      ######################
+      ok = true
+      encoded_result = ""
+      extended_target = ""
+      row['trips'].split(',').each_with_index do |sub, sub_idx|
+        if sub_idx >= sub_trips.length
+          ok = false
+          break
+        end
+
+        ok = false;
+        #TODO: Check all rotations of the round trip
+        sub.length.times do |node_idx|
+          node = find_node_by_name(sub[node_idx])
+          out_node = sub_trips[sub_idx][node_idx]
+          if FuzzyMatch.match_location out_node, node
+            encoded_result += sub[node_idx]
+            extended_target += sub[node_idx]
+            ok = true
+          else
+            encoded_result += "? [#{out_node[0]},#{out_node[1]}]"
+            extended_target += "#{sub[node_idx]} [#{node.lat},#{node.lon}]"
+          end
+        end
+      end
+
+      if ok
+        got['trips'] = row['trips']
+        got['via_points'] = row['via_points']
+      else
+        got['trips'] = encoded_result
+        row['trips'] = extended_target
+        log_fail row,got, { 'trip' => {:query => @query, :response => response} }
+      end
+
+
+      ok = true
+      row.keys.each do |key|
+        if FuzzyMatch.match got[key], row[key]
+          got[key] = row[key]
+        else
+          ok = false
+        end
+      end
+
+      unless ok
+        log_fail row,got, { 'trip' => {:query => @query, :response => response} }
+      end
+
+      actual << got
+    end
+  end
+  table.diff! actual
+end
+
@@ -1,165 +0,0 @@
-'use strict';
-
-var builder = require('xmlbuilder');
-
-var ensureDecimal = (i) => {
-    if (parseInt(i) === i) return i.toFixed(1);
-    else return i;
-};
-
-class DB {
-    constructor () {
-        this.nodes = new Array();
-        this.ways = new Array();
-        this.relations = new Array();
-    }
-
-    addNode (node) {
-        this.nodes.push(node);
-    }
-
-    addWay (way) {
-        this.ways.push(way);
-    }
-
-    addRelation (relation) {
-        this.relations.push(relation);
-    }
-
-    clear () {
-        this.nodes = [];
-        this.ways = [];
-        this.relations = [];
-    }
-
-    toXML (callback) {
-        var xml = builder.create('osm', {'encoding':'UTF-8'});
-        xml.att('generator', 'osrm-test')
-            .att('version', '0.6');
-
-        this.nodes.forEach((n) => {
-            var node = xml.ele('node', {
-                id: n.id,
-                version: 1,
-                uid: n.OSM_UID,
-                user: n.OSM_USER,
-                timestamp: n.OSM_TIMESTAMP,
-                lon: ensureDecimal(n.lon),
-                lat: ensureDecimal(n.lat)
-            });
-
-            for (var k in n.tags) {
-                node.ele('tag')
-                    .att('k', k)
-                    .att('v', n.tags[k]);
-            }
-        });
-
-        this.ways.forEach((w) => {
-            var way = xml.ele('way', {
-                id: w.id,
-                version: 1,
-                uid: w.OSM_UID,
-                user: w.OSM_USER,
-                timestamp: w.OSM_TIMESTAMP
-            });
-
-            w.nodes.forEach((k) => {
-                way.ele('nd')
-                    .att('ref', k.id);
-            });
-
-            for (var k in w.tags) {
-                way.ele('tag')
-                    .att('k', k)
-                    .att('v', w.tags[k]);
-            }
-        });
-
-        this.relations.forEach((r) => {
-            var relation = xml.ele('relation', {
-                id: r.id,
-                user: r.OSM_USER,
-                timestamp: r.OSM_TIMESTAMP,
-                uid: r.OSM_UID
-            });
-
-            r.members.forEach((m) => {
-                relation.ele('member', {
-                    type: m.type,
-                    ref: m.id,
-                    role: m.role
-                });
-            });
-
-            for (var k in r.tags) {
-                relation.ele('tag')
-                    .att('k', k)
-                    .att('v', r.tags[k]);
-            }
-        });
-
-        callback(xml.end({ pretty: true, indent: '  ' }));
-    }
-}
-
-class Node {
-    constructor (id, OSM_USER, OSM_TIMESTAMP, OSM_UID, lon, lat, tags) {
-        this.id = id;
-        this.OSM_USER = OSM_USER;
-        this.OSM_TIMESTAMP = OSM_TIMESTAMP;
-        this.OSM_UID = OSM_UID;
-        this.lon = lon;
-        this.lat = lat;
-        this.tags = tags;
-    }
-
-    addTag (k, v) {
-        this.tags[k] = v;
-    }
-}
-
-class Way {
-    constructor (id, OSM_USER, OSM_TIMESTAMP, OSM_UID) {
-        this.id = id;
-        this.OSM_USER = OSM_USER;
-        this.OSM_TIMESTAMP = OSM_TIMESTAMP;
-        this.OSM_UID = OSM_UID;
-        this.tags = {};
-        this.nodes = [];
-    }
-
-    addNode (node) {
-        this.nodes.push(node);
-    }
-
-    setTags (tags) {
-        this.tags = tags;
-    }
-}
-
-class Relation {
-    constructor (id, OSM_USER, OSM_TIMESTAMP, OSM_UID) {
-        this.id = id;
-        this.OSM_USER = OSM_USER;
-        this.OSM_TIMESTAMP = OSM_TIMESTAMP;
-        this.OSM_UID = OSM_UID;
-        this.members = [];
-        this.tags = {};
-    }
-
-    addMember (memberType, id, role) {
-        this.members.push({type: memberType, id: id, role: role});
-    }
-
-    addTag (k, v) {
-        this.tags[k] = v;
-    }
-}
-
-module.exports = {
-    DB: DB,
-    Node: Node,
-    Way: Way,
-    Relation: Relation
-};
@@ -1,115 +0,0 @@
-var fs = require('fs');
-var path = require('path');
-var util = require('util');
-var d3 = require('d3-queue');
-var OSM = require('./build_osm');
-var classes = require('./data_classes');
-
-module.exports = function () {
-    this.initializeOptions = (callback) => {
-        this.profile = this.profile || this.DEFAULT_SPEEDPROFILE;
-
-        this.OSMDB = this.OSMDB || new OSM.DB();
-
-        this.nameNodeHash = this.nameNodeHash || {};
-
-        this.locationHash = this.locationHash || {};
-
-        this.nameWayHash = this.nameWayHash || {};
-
-        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');
-
-        this.LOG_FILE = path.resolve(this.TEST_FOLDER, 'fail.log');
-
-        this.HOST = 'http://127.0.0.1:' + this.OSRM_PORT;
-
-        this.DESTINATION_REACHED = 15;  // OSRM instruction code
-
-        this.shortcutsHash = this.shortcutsHash || {};
-
-        var hashLuaLib = (cb) => {
-            fs.readdir(path.normalize(this.PROFILES_PATH + '/lib/'), (err, files) => {
-                if (err) cb(err);
-                var luaFiles = files.filter(f => !!f.match(/\.lua$/)).map(f => path.normalize(this.PROFILES_PATH + '/lib/' + f));
-                this.hashOfFiles(luaFiles, hash => {
-                    this.luaLibHash = hash;
-                    cb();
-                });
-            });
-        };
-
-        var hashProfile = (cb) => {
-            this.hashProfile((hash) => {
-                this.profileHash = hash;
-                cb();
-            });
-        };
-
-        var hashExtract = (cb) => {
-            this.hashOfFiles(util.format('%s/osrm-extract%s', this.BIN_PATH, this.EXE), (hash) => {
-                this.binExtractHash = hash;
-                cb();
-            });
-        };
-
-        var hashContract = (cb) => {
-            this.hashOfFiles(util.format('%s/osrm-contract%s', this.BIN_PATH, this.EXE), (hash) => {
-                this.binContractHash = hash;
-                this.fingerprintContract = this.hashString(this.binContractHash);
-                cb();
-            });
-        };
-
-        var hashRouted = (cb) => {
-            this.hashOfFiles(util.format('%s/osrm-routed%s', this.BIN_PATH, this.EXE), (hash) => {
-                this.binRoutedHash = hash;
-                this.fingerprintRoute = this.hashString(this.binRoutedHash);
-                cb();
-            });
-        };
-
-        d3.queue()
-            .defer(hashLuaLib)
-            .defer(hashProfile)
-            .defer(hashExtract)
-            .defer(hashContract)
-            .defer(hashRouted)
-            .awaitAll(() => {
-                this.fingerprintExtract = this.hashString([this.profileHash, this.luaLibHash, this.binExtractHash].join('-'));
-                this.AfterConfiguration(() => {
-                    callback();
-                });
-            });
-    };
-
-    this.setProfileBasedHashes = () => {
-        this.fingerprintExtract = this.hashString([this.profileHash, this.luaLibHash, this.binExtractHash].join('-'));
-        this.fingerprintContract = this.hashString(this.binContractHash);
-    };
-
-    this.setProfile = (profile, cb) => {
-        var lastProfile = this.profile;
-        if (profile !== lastProfile) {
-            this.profile = profile;
-            this.hashProfile((hash) => {
-                this.profileHash = hash;
-                this.setProfileBasedHashes();
-                cb();
-            });
-        } else cb();
-    };
-
-    this.setExtractArgs = (args) => {
-        this.extractArgs = args;
-    };
-
-    this.setContractArgs = (args) => {
-        this.contractArgs = args;
-    };
-};
@@ -0,0 +1,20 @@
+def profile
+  @profile ||= reset_profile
+end
+
+def reset_profile
+  @profile = nil
+  set_profile DEFAULT_SPEEDPROFILE
+end
+
+def set_profile profile
+  @profile = profile
+end
+
+def set_extract_args args
+    @extract_args = args
+end
+
+def set_contract_args args
+    @contract_args = args
+end
@@ -1,340 +0,0 @@
-var fs = require('fs');
-var path = require('path');
-var util = require('util');
-var exec = require('child_process').exec;
-var d3 = require('d3-queue');
-
-var OSM = require('./build_osm');
-var classes = require('./data_classes');
-
-module.exports = function () {
-    this.setGridSize = (meters) => {
-        // the constant is calculated (with BigDecimal as: 1.0/(DEG_TO_RAD*EARTH_RADIUS_IN_METERS
-        // see ApproximateDistance() in ExtractorStructs.h
-        // it's only accurate when measuring along the equator, or going exactly north-south
-        this.zoom = parseFloat(meters) * 0.8990679362704610899694577444566908445396483347536032203503E-5;
-    };
-
-    this.setOrigin = (origin) => {
-        this.origin = origin;
-    };
-
-    this.buildWaysFromTable = (table, callback) => {
-        // add one unconnected way for each row
-        var buildRow = (row, ri, cb) => {
-            // comments ported directly from ruby suite:
-            // NOTE: currently osrm crashes when processing an isolated oneway with just 2 nodes, so we use 4 edges
-            // this is related to the fact that a oneway dead-end street doesn't make a lot of sense
-
-            // if we stack ways on different x coordinates, routability tests get messed up, because osrm might pick a neighboring way if the one test can't be used.
-            // instead we place all lines as a string on the same y coordinate. this prevents using neighboring ways.
-
-            // add some nodes
-
-            var makeFakeNode = (namePrefix, offset) => {
-                return new OSM.Node(this.makeOSMId(), this.OSM_USER, this.OSM_TIMESTAMP,
-                    this.OSM_UID, this.origin[0]+(offset + this.WAY_SPACING * ri) * this.zoom,
-                    this.origin[1], {name: util.format('%s%d', namePrefix, ri)});
-            };
-
-            var nodes = ['a','b','c','d','e'].map((l, i) => makeFakeNode(l, i));
-
-            nodes.forEach(node => { this.OSMDB.addNode(node); });
-
-            // ...with a way between them
-            var way = new OSM.Way(this.makeOSMId(), this.OSM_USER, this.OSM_TIMESTAMP, this.OSM_UID);
-
-            nodes.forEach(node => { way.addNode(node); });
-
-            // remove tags that describe expected test result, reject empty tags
-            var tags = {};
-            for (var rkey in row) {
-                if (!rkey.match(/^forw\b/) &&
-                    !rkey.match(/^backw\b/) &&
-                    !rkey.match(/^bothw\b/) &&
-                    row[rkey].length)
-                    tags[rkey] = row[rkey];
-            }
-
-            var wayTags = { highway: 'primary' },
-                nodeTags = {};
-
-            for (var key in tags) {
-                var nodeMatch = key.match(/node\/(.*)/);
-                if (nodeMatch) {
-                    if (tags[key] === '(nil)') {
-                        delete nodeTags[key];
-                    } else {
-                        nodeTags[nodeMatch[1]] = tags[key];
-                    }
-                } else {
-                    if (tags[key] === '(nil)') {
-                        delete wayTags[key];
-                    } else {
-                        wayTags[key] = tags[key];
-                    }
-                }
-            }
-
-            wayTags.name = util.format('w%d', ri);
-            way.setTags(wayTags);
-            this.OSMDB.addWay(way);
-
-            for (var k in nodeTags) {
-                nodes[2].addTag(k, nodeTags[k]);
-            }
-            cb();
-        };
-
-        var q = d3.queue();
-        table.hashes().forEach((row, ri) => {
-            q.defer(buildRow, row, ri);
-        });
-
-        q.awaitAll(callback);
-    };
-
-    this.ensureDecimal = (i) => {
-        if (parseInt(i) === i) return i.toFixed(1);
-        else return i;
-    };
-
-    this.tableCoordToLonLat = (ci, ri) => {
-        return [this.origin[0] + ci * this.zoom, this.origin[1] - ri * this.zoom].map(this.ensureDecimal);
-    };
-
-    this.addOSMNode = (name, lon, lat, id) => {
-        id = id || this.makeOSMId();
-        var node = new OSM.Node(id, this.OSM_USER, this.OSM_TIMESTAMP, this.OSM_UID, lon, lat, {name: name});
-        this.OSMDB.addNode(node);
-        this.nameNodeHash[name] = node;
-    };
-
-    this.addLocation = (name, lon, lat) => {
-        this.locationHash[name] = new classes.Location(lon, lat);
-    };
-
-    this.findNodeByName = (s) => {
-        if (s.length !== 1) throw new Error(util.format('*** invalid node name "%s", must be single characters', s));
-        if (!s.match(/[a-z0-9]/)) throw new Error(util.format('*** invalid node name "%s", must be alphanumeric', s));
-
-        var fromNode;
-        if (s.match(/[a-z]/)) {
-            fromNode = this.nameNodeHash[s.toString()];
-        } else {
-            fromNode = this.locationHash[s.toString()];
-        }
-
-        return fromNode;
-    };
-
-    this.findWayByName = (s) => {
-        return this.nameWayHash[s.toString()] || this.nameWayHash[s.toString().split('').reverse().join('')];
-    };
-
-    this.resetData = () => {
-        this.resetOSM();
-    };
-
-    this.makeOSMId = () => {
-        this.osmID = this.osmID + 1;
-        return this.osmID;
-    };
-
-    this.resetOSM = () => {
-        this.OSMDB.clear();
-        this.osmData.reset();
-        this.nameNodeHash = {};
-        this.locationHash = {};
-        this.nameWayHash = {};
-        this.osmID = 0;
-    };
-
-    this.writeOSM = (callback) => {
-        fs.exists(this.DATA_FOLDER, (exists) => {
-            var mkDirFn = exists ? (cb) => { cb(); } : fs.mkdir.bind(fs.mkdir, this.DATA_FOLDER);
-            mkDirFn((err) => {
-                if (err) return callback(err);
-                var osmPath = path.resolve(this.DATA_FOLDER, util.format('%s.osm', this.osmData.osmFile));
-                fs.exists(osmPath, (exists) => {
-                    if (!exists) fs.writeFile(osmPath, this.osmData.str, callback);
-                    else callback();
-                });
-            });
-        });
-    };
-
-    this.isExtracted = (callback) => {
-        fs.exists(util.format('%s.osrm', this.osmData.extractedFile), (core) => {
-            if (!core) return callback(false);
-            fs.exists(util.format('%s.osrm.names', this.osmData.extractedFile), (names) => {
-                if (!names) return callback(false);
-                fs.exists(util.format('%s.osrm.restrictions', this.osmData.extractedFile), (restrictions) => {
-                    return callback(restrictions);
-                });
-            });
-        });
-    };
-
-    this.isContracted = (callback) => {
-        fs.exists(util.format('%s.osrm.hsgr', this.osmData.contractedFile), callback);
-    };
-
-    this.writeTimestamp = (callback) => {
-        fs.writeFile(util.format('%s.osrm.timestamp', this.osmData.contractedFile), this.OSM_TIMESTAMP, callback);
-    };
-
-    this.writeInputData = (callback) => {
-        this.writeOSM((err) => {
-            if (err) return callback(err);
-            this.writeTimestamp(callback);
-        });
-    };
-
-    this.extractData = (callback) => {
-        this.logPreprocessInfo();
-        this.log(util.format('== Extracting %s.osm...', this.osmData.osmFile), 'preprocess');
-        var cmd = util.format('%s%s/osrm-extract %s.osm %s --profile %s/%s.lua >>%s 2>&1',
-            this.LOAD_LIBRARIES, this.BIN_PATH, this.osmData.osmFile, this.extractArgs || '', this.PROFILES_PATH, this.profile, this.PREPROCESS_LOG_FILE);
-        this.log(cmd);
-        process.chdir(this.TEST_FOLDER);
-        exec(cmd, (err) => {
-            if (err) {
-                this.log(util.format('*** Exited with code %d', err.code), 'preprocess');
-                process.chdir('../');
-                return callback(this.ExtractError(err.code, util.format('osrm-extract exited with code %d', err.code)));
-            }
-
-            var q = d3.queue();
-
-            var rename = (file, cb) => {
-                this.log(util.format('Renaming %s.%s to %s.%s', this.osmData.osmFile, file, this.osmData.extractedFile, file), 'preprocess');
-                fs.rename([this.osmData.osmFile, file].join('.'), [this.osmData.extractedFile, file].join('.'), (err) => {
-                    if (err) return cb(this.FileError(null, 'failed to rename data file after extracting'));
-                    cb();
-                });
-            };
-
-            var renameIfExists = (file, cb) => {
-                fs.stat([this.osmData.osmFile, file].join('.'), (doesNotExistErr, exists) => {
-                    if (exists) rename(file, cb);
-                    else cb();
-                });
-            };
-
-            ['osrm','osrm.names','osrm.restrictions','osrm.ebg','osrm.enw','osrm.edges','osrm.fileIndex','osrm.geometry','osrm.nodes','osrm.ramIndex','osrm.properties'].forEach(file => {
-                q.defer(rename, file);
-            });
-
-            ['osrm.edge_segment_lookup','osrm.edge_penalties'].forEach(file => {
-                q.defer(renameIfExists, file);
-            });
-
-            q.awaitAll((err) => {
-                this.log('Finished extracting ' + this.osmData.extractedFile, 'preprocess');
-                process.chdir('../');
-                callback(err);
-            });
-        });
-    };
-
-    this.contractData = (callback) => {
-        this.logPreprocessInfo();
-        this.log(util.format('== Contracting %s.osm...', this.osmData.extractedFile), 'preprocess');
-        var cmd = util.format('%s%s/osrm-contract %s %s.osrm >>%s 2>&1',
-            this.LOAD_LIBRARIES, this.BIN_PATH, this.contractArgs || '', this.osmData.extractedFile, this.PREPROCESS_LOG_FILE);
-        this.log(cmd);
-        process.chdir(this.TEST_FOLDER);
-        exec(cmd, (err) => {
-            if (err) {
-                this.log(util.format('*** Exited with code %d', err.code), 'preprocess');
-                process.chdir('../');
-                return callback(this.ContractError(err.code, util.format('osrm-contract exited with code %d', err.code)));
-            }
-
-            var rename = (file, cb) => {
-                this.log(util.format('Renaming %s.%s to %s.%s', this.osmData.extractedFile, file, this.osmData.contractedFile, file), 'preprocess');
-                fs.rename([this.osmData.extractedFile, file].join('.'), [this.osmData.contractedFile, file].join('.'), (err) => {
-                    if (err) return cb(this.FileError(null, 'failed to rename data file after contracting.'));
-                    cb();
-                });
-            };
-
-            var copy = (file, cb) => {
-                this.log(util.format('Copying %s.%s to %s.%s', this.osmData.extractedFile, file, this.osmData.contractedFile, file), 'preprocess');
-                fs.createReadStream([this.osmData.extractedFile, file].join('.'))
-                    .pipe(fs.createWriteStream([this.osmData.contractedFile, file].join('.'))
-                            .on('finish', cb)
-                        )
-                    .on('error', () => {
-                        return cb(this.FileError(null, 'failed to copy data after contracting.'));
-                    });
-            };
-
-            var q = d3.queue();
-
-            ['osrm.hsgr','osrm.fileIndex','osrm.geometry','osrm.nodes','osrm.ramIndex','osrm.core','osrm.edges','osrm.datasource_indexes','osrm.datasource_names','osrm.level'].forEach((file) => {
-                q.defer(rename, file);
-            });
-
-            ['osrm.names','osrm.restrictions','osrm.properties','osrm'].forEach((file) => {
-                q.defer(copy, file);
-            });
-
-            q.awaitAll((err) => {
-                this.log('Finished contracting ' + this.osmData.contractedFile, 'preprocess');
-                process.chdir('../');
-                callback(err);
-            });
-        });
-    };
-
-    var noop = (cb) => cb();
-
-    this.reprocess = (callback) => {
-        this.writeAndExtract((e) => {
-            if (e) return callback(e);
-            this.isContracted((isContracted) => {
-                var contractFn = isContracted ? noop : this.contractData;
-                if (isContracted) this.log('Already contracted ' + this.osmData.contractedFile, 'preprocess');
-                contractFn((e) => {
-                    if (e) return callback(e);
-                    this.logPreprocessDone();
-                    callback();
-                });
-            });
-        });
-    };
-
-    this.writeAndExtract = (callback) => {
-        this.osmData.populate(() => {
-            this.writeInputData((e) => {
-                if (e) return callback(e);
-                this.isExtracted((isExtracted) => {
-                    var extractFn = isExtracted ? noop : this.extractData;
-                    if (isExtracted) this.log('Already extracted ' + this.osmData.extractedFile, 'preprocess');
-                    extractFn((e) => {
-                        callback(e);
-                    });
-                });
-            });
-        });
-    };
-
-    this.reprocessAndLoadData = (callback) => {
-        this.reprocess(() => {
-            this.OSRMLoader.load(util.format('%s.osrm', this.osmData.contractedFile), callback);
-        });
-    };
-
-    this.processRowsAndDiff = (table, fn, callback) => {
-        var q = d3.queue(1);
-
-        table.hashes().forEach((row, i) => { q.defer(fn, row, i); });
-
-        q.awaitAll((err, actual) => {
-            if (err) return callback(err);
-            this.diffTables(table, actual, {}, callback);
-        });
-    };
-};
@@ -0,0 +1,321 @@
+require 'OSM/objects'       #osmlib gem
+require 'OSM/Database'
+require 'builder'
+require 'fileutils'
+
+class Location
+  attr_accessor :lon,:lat
+
+  def initialize lon,lat
+    @lat = lat
+    @lon = lon
+  end
+end
+
+
+def set_input_format format
+  raise '*** Input format must be eiter "osm" or "pbf"' unless ['pbf','osm'].include? format.to_s
+  @input_format = format.to_s
+end
+
+def input_format
+  @input_format || DEFAULT_INPUT_FORMAT
+end
+
+def sanitized_scenario_title
+  @sanitized_scenario_title ||= @scenario_title.to_s.gsub /[^0-9A-Za-z.\-]/, '_'
+end
+
+def set_grid_size meters
+  #the constant is calculated (with BigDecimal as: 1.0/(DEG_TO_RAD*EARTH_RADIUS_IN_METERS
+  #see ApproximateDistance() in ExtractorStructs.h
+  #it's only accurate when measuring along the equator, or going exactly north-south
+  @zoom = meters.to_f*0.8990679362704610899694577444566908445396483347536032203503E-5
+end
+
+def set_origin origin
+  @origin = origin
+end
+
+def build_ways_from_table table
+  #add one unconnected way for each row
+  table.hashes.each_with_index do |row,ri|
+    #NOTE:
+    #currently osrm crashes when processing an isolated oneway with just 2 nodes, so we use 4 edges
+    #this is relatated to the fact that a oneway dead-end street doesn't make a lot of sense
+
+    #if we stack ways on different x coordinates, routability tests get messed up, because osrm might pick a neighboring way if the one test can't be used.
+    #instead we place all lines as a string on the same y coordinate. this prevents using neightboring ways.
+
+    #a few nodes...
+    node1 = OSM::Node.new make_osm_id, OSM_USER, OSM_TIMESTAMP, @origin[0]+(0+WAY_SPACING*ri)*@zoom, @origin[1]
+    node2 = OSM::Node.new make_osm_id, OSM_USER, OSM_TIMESTAMP, @origin[0]+(1+WAY_SPACING*ri)*@zoom, @origin[1]
+    node3 = OSM::Node.new make_osm_id, OSM_USER, OSM_TIMESTAMP, @origin[0]+(2+WAY_SPACING*ri)*@zoom, @origin[1]
+    node4 = OSM::Node.new make_osm_id, OSM_USER, OSM_TIMESTAMP, @origin[0]+(3+WAY_SPACING*ri)*@zoom, @origin[1]
+    node5 = OSM::Node.new make_osm_id, OSM_USER, OSM_TIMESTAMP, @origin[0]+(4+WAY_SPACING*ri)*@zoom, @origin[1]
+    node1.uid = OSM_UID
+    node2.uid = OSM_UID
+    node3.uid = OSM_UID
+    node4.uid = OSM_UID
+    node5.uid = OSM_UID
+    node1 << { :name => "a#{ri}" }
+    node2 << { :name => "b#{ri}" }
+    node3 << { :name => "c#{ri}" }
+    node4 << { :name => "d#{ri}" }
+    node5 << { :name => "e#{ri}" }
+
+    osm_db << node1
+    osm_db << node2
+    osm_db << node3
+    osm_db << node4
+    osm_db << node5
+
+    #...with a way between them
+    way = OSM::Way.new make_osm_id, OSM_USER, OSM_TIMESTAMP
+    way.uid = OSM_UID
+    way << node1
+    way << node2
+    way << node3
+    way << node4
+    way << node5
+
+    tags = row.dup
+
+    # remove tags that describe expected test result
+    tags.reject! do |k,v|
+      k =~ /^forw\b/ ||
+      k =~ /^backw\b/ ||
+      k =~ /^bothw\b/
+    end
+
+    ##remove empty tags
+    tags.reject! { |k,v| v=='' }
+
+    # sort tag keys in the form of 'node/....'
+    way_tags = { 'highway' => 'primary' }
+
+    node_tags = {}
+    tags.each_pair do |k,v|
+      if k =~ /node\/(.*)/
+        if v=='(nil)'
+          node_tags.delete k
+        else
+          node_tags[$1] = v
+        end
+      else
+        if v=='(nil)'
+          way_tags.delete k
+        else
+          way_tags[k] = v
+        end
+      end
+    end
+
+    way_tags['name'] = "w#{ri}"
+    way << way_tags
+    node3 << node_tags
+
+    osm_db << way
+  end
+end
+
+def table_coord_to_lonlat ci,ri
+  [@origin[0]+ci*@zoom, @origin[1]-ri*@zoom]
+end
+
+def add_osm_node name,lon,lat,id
+  id = make_osm_id if id == nil
+  node = OSM::Node.new id, OSM_USER, OSM_TIMESTAMP, lon, lat
+  node << { :name => name }
+  node.uid = OSM_UID
+  osm_db << node
+  name_node_hash[name] = node
+end
+
+def add_location name,lon,lat
+  location_hash[name] = Location.new(lon,lat)
+end
+
+def find_node_by_name s
+  raise "***invalid node name '#{s}', must be single characters" unless s.size == 1
+  raise "*** invalid node name '#{s}', must be alphanumeric" unless s.match /[a-z0-9]/
+  if s.match /[a-z]/
+    from_node = name_node_hash[ s.to_s ]
+  else
+    from_node = location_hash[ s.to_s ]
+  end
+end
+
+def find_way_by_name s
+  name_way_hash[s.to_s] || name_way_hash[s.to_s.reverse]
+end
+
+def reset_data
+  Dir.chdir TEST_FOLDER do
+    #clear_log
+    #clear_data_files
+  end
+  reset_profile
+  reset_osm
+  @fingerprint_osm = nil
+  @fingerprint_extract = nil
+  @fingerprint_prepare = nil
+  @fingerprint_route = nil
+end
+
+def make_osm_id
+  @osm_id = @osm_id+1
+end
+
+def reset_osm
+  osm_db.clear
+  name_node_hash.clear
+  location_hash.clear
+  name_way_hash.clear
+  @osm_str = nil
+  @osm_hash = nil
+  @osm_id = 0
+end
+
+def clear_data_files
+  File.delete *Dir.glob("#{DATA_FOLDER}/test.*")
+end
+
+def clear_log
+  File.delete *Dir.glob("*.log")
+end
+
+def osm_db
+  @osm_db ||= OSM::Database.new
+end
+
+def name_node_hash
+  @name_node_hash ||= {}
+end
+
+def location_hash
+  @location_hash ||= {}
+end
+
+def name_way_hash
+  @name_way_hash ||= {}
+end
+
+def osm_str
+  return @osm_str if @osm_str
+  @osm_str = ''
+  doc = Builder::XmlMarkup.new :indent => 2, :target => @osm_str
+  doc.instruct!
+  osm_db.to_xml doc, OSM_GENERATOR
+  @osm_str
+end
+
+def osm_file
+  @osm_file ||= "#{DATA_FOLDER}/#{fingerprint_osm}"
+end
+
+def extracted_file
+  @extracted_file ||= "#{osm_file}_#{fingerprint_extract}"
+end
+
+def contracted_file
+  @contracted_file ||= "#{osm_file}_#{fingerprint_extract}_#{fingerprint_prepare}"
+end
+
+def write_osm
+  Dir.mkdir DATA_FOLDER unless File.exist? DATA_FOLDER
+  unless File.exist?("#{osm_file}.osm")
+    File.open( "#{osm_file}.osm", 'w') {|f| f.write(osm_str) }
+  end
+end
+
+def extracted?
+  Dir.chdir TEST_FOLDER do
+    File.exist?("#{extracted_file}.osrm") &&
+    File.exist?("#{extracted_file}.osrm.names") &&
+    File.exist?("#{extracted_file}.osrm.restrictions")
+  end
+end
+
+def contracted?
+  Dir.chdir TEST_FOLDER do
+    File.exist?("#{contracted_file}.osrm.hsgr")
+  end
+end
+
+def write_timestamp
+  File.open( "#{contracted_file}.osrm.timestamp", 'w') {|f| f.write(OSM_TIMESTAMP) }
+end
+
+def write_input_data
+  Dir.chdir TEST_FOLDER do
+    write_osm
+    write_timestamp
+  end
+end
+
+def extract_data
+  Dir.chdir TEST_FOLDER do
+    log_preprocess_info
+    log "== Extracting #{osm_file}.osm...", :preprocess
+    log "#{LOAD_LIBRARIES}#{BIN_PATH}/osrm-extract #{osm_file}.osm #{@extract_args} --profile #{PROFILES_PATH}/#{@profile}.lua >>#{PREPROCESS_LOG_FILE} 2>&1"
+    unless system "#{LOAD_LIBRARIES}#{BIN_PATH}/osrm-extract #{osm_file}.osm #{@extract_args} --profile #{PROFILES_PATH}/#{@profile}.lua >>#{PREPROCESS_LOG_FILE} 2>&1"
+      log "*** Exited with code #{$?.exitstatus}.", :preprocess
+      raise ExtractError.new $?.exitstatus, "osrm-extract exited with code #{$?.exitstatus}."
+    end
+    begin
+      ["osrm","osrm.names","osrm.restrictions","osrm.ebg","osrm.enw","osrm.edges","osrm.fileIndex","osrm.geometry","osrm.nodes","osrm.ramIndex"].each do |file|
+        log "Renaming #{osm_file}.#{file} to #{extracted_file}.#{file}", :preprocess
+        File.rename "#{osm_file}.#{file}", "#{extracted_file}.#{file}"
+      end
+    rescue Exception => e
+      raise FileError.new nil, "failed to rename data file after extracting."
+    end
+    begin
+      ["osrm.edge_segment_lookup","osrm.edge_penalties"].each do |file|
+        if File.exists?("#{osm_file}.#{file}")
+          log "Renaming #{osm_file}.#{file} to #{extracted_file}.#{file}", :preprocess
+          File.rename "#{osm_file}.#{file}", "#{extracted_file}.#{file}"
+        end
+      end
+    rescue Exception => e
+      raise FileError.new nil, "failed to rename data file after extracting."
+    end
+  end
+end
+
+def prepare_data
+  Dir.chdir TEST_FOLDER do
+    log_preprocess_info
+    log "== Preparing #{extracted_file}.osm...", :preprocess
+    log "#{LOAD_LIBRARIES}#{BIN_PATH}/osrm-contract #{@contract_args} #{extracted_file}.osrm >>#{PREPROCESS_LOG_FILE} 2>&1"
+    unless system "#{LOAD_LIBRARIES}#{BIN_PATH}/osrm-contract #{@contract_args} #{extracted_file}.osrm >>#{PREPROCESS_LOG_FILE} 2>&1"
+      log "*** Exited with code #{$?.exitstatus}.", :preprocess
+      raise PrepareError.new $?.exitstatus, "osrm-contract exited with code #{$?.exitstatus}."
+    end
+    begin
+      ["osrm.hsgr","osrm.fileIndex","osrm.geometry","osrm.nodes","osrm.ramIndex","osrm.core","osrm.edges"].each do |file|
+        log "Renaming #{extracted_file}.#{file} to #{contracted_file}.#{file}", :preprocess
+        File.rename "#{extracted_file}.#{file}", "#{contracted_file}.#{file}"
+      end
+    rescue Exception => e
+      raise FileError.new nil, "failed to rename data file after preparing."
+    end
+    begin
+      ["osrm.names","osrm.restrictions","osrm"].each do |file|
+        log "Copying #{extracted_file}.#{file} to #{contracted_file}.#{file}", :preprocess
+        FileUtils.cp "#{extracted_file}.#{file}", "#{contracted_file}.#{file}"
+      end
+    rescue Exception => e
+      raise FileError.new nil, "failed to copy data file after preparing."
+    end
+    log '', :preprocess
+  end
+end
+
+def reprocess
+  write_input_data
+  extract_data unless extracted?
+  prepare_data unless contracted?
+  log_preprocess_done
+end
@@ -1,85 +0,0 @@
-'use strict';
-
-var util = require('util');
-var path = require('path');
-
-module.exports = {
-    Location: class {
-        constructor (lon, lat) {
-            this.lon = lon;
-            this.lat = lat;
-        }
-    },
-
-    osmData: class {
-        constructor (scope) {
-            this.scope          = scope;
-            this.str            = null;
-            this.hash           = null;
-            this.fingerprintOSM = null;
-            this.osmFile        = null;
-            this.extractedFile  = null;
-            this.contractedFile   = null;
-        }
-
-        populate (callback) {
-            this.scope.OSMDB.toXML((str) => {
-                this.str = str;
-
-                this.hash = this.scope.hashString(str);
-                this.fingerprintOSM = this.scope.hashString(this.hash);
-
-                this.osmFile        = path.resolve(this.scope.DATA_FOLDER, this.fingerprintOSM);
-
-                this.extractedFile  = path.resolve([this.osmFile, this.scope.fingerprintExtract].join('_'));
-                this.contractedFile   = path.resolve([this.osmFile, this.scope.fingerprintExtract, this.scope.fingerprintContract].join('_'));
-
-                callback();
-            });
-        }
-
-        reset () {
-            this.str            = null;
-            this.hash           = null;
-            this.fingerprintOSM = null;
-            this.osmFile        = null;
-            this.extractedFile  = null;
-            this.contractedFile   = null;
-        }
-    },
-
-    FuzzyMatch: class {
-        match (got, want) {
-            var matchPercent = want.match(/(.*)\s+~(.+)%$/),
-                matchAbs = want.match(/(.*)\s+\+\-(.+)$/),
-                matchRe = want.match(/^\/(.*)\/$/);
-
-            if (got === want) {
-                return true;
-            } else if (matchPercent) {         // percentage range: 100 ~ 5%
-                var target = parseFloat(matchPercent[1]),
-                    percentage = parseFloat(matchPercent[2]);
-                if (target === 0) {
-                    return true;
-                } else {
-                    var ratio = Math.abs(1 - parseFloat(got) / target);
-                    return 100 * ratio < percentage;
-                }
-            } else if (matchAbs) {             // absolute range: 100 +-5
-                var margin = parseFloat(matchAbs[2]),
-                    fromR = parseFloat(matchAbs[1]) - margin,
-                    toR = parseFloat(matchAbs[1]) + margin;
-                return parseFloat(got) >= fromR && parseFloat(got) <= toR;
-            } else if (matchRe) {               // regex: /a,b,.*/
-                return got.match(matchRe[1]);
-            } else {
-                return false;
-            }
-        }
-
-        matchLocation (got, want) {
-            return this.match(got[0], util.format('%d ~0.0025%', want.lon)) &&
-                this.match(got[1], util.format('%d ~0.0025%', want.lat));
-        }
-    }
-};
@@ -1,126 +0,0 @@
-var path = require('path');
-var util = require('util');
-var fs = require('fs');
-var exec = require('child_process').exec;
-var d3 = require('d3-queue');
-
-module.exports = function () {
-    this.initializeEnv = (callback) => {
-        this.DEFAULT_PORT = 5000;
-	// OSX builds on Travis hit a timeout of ~2000 from time to time
-        this.DEFAULT_TIMEOUT = 5000;
-        this.setDefaultTimeout(this.DEFAULT_TIMEOUT);
-        this.ROOT_FOLDER = process.cwd();
-        this.OSM_USER = 'osrm';
-        this.OSM_GENERATOR = 'osrm-test';
-        this.OSM_UID = 1;
-        this.TEST_FOLDER = path.resolve(this.ROOT_FOLDER, 'test');
-        this.DATA_FOLDER = path.resolve(this.TEST_FOLDER, 'cache');
-        this.OSM_TIMESTAMP = '2000-01-01T00:00:00Z';
-        this.DEFAULT_SPEEDPROFILE = 'bicycle';
-        this.WAY_SPACING = 100;
-        this.DEFAULT_GRID_SIZE = 100;    // meters
-        this.PROFILES_PATH = path.resolve(this.ROOT_FOLDER, 'profiles');
-        this.FIXTURES_PATH = path.resolve(this.ROOT_FOLDER, 'unit_tests/fixtures');
-        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');
-
-        // OS X shim to ensure shared libraries from custom locations can be loaded
-        // This is needed in OS X >= 10.11 because DYLD_LIBRARY_PATH is blocked
-        // https://forums.developer.apple.com/thread/9233
-        this.LOAD_LIBRARIES = process.env.OSRM_SHARED_LIBRARY_PATH ? util.format('DYLD_LIBRARY_PATH=%s ', process.env.OSRM_SHARED_LIBRARY_PATH) : '';
-
-        // TODO make sure this works on win
-        if (process.platform.match(/indows.*/)) {
-            this.TERMSIGNAL = 9;
-            this.EXE = '.exe';
-            this.QQ = '"';
-        } else {
-            this.TERMSIGNAL = 'SIGTERM';
-            this.EXE = '';
-            this.QQ = '';
-        }
-
-        // eslint-disable-next-line no-console
-        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();
-        });
-    };
-
-    this.verifyOSRMIsNotRunning = () => {
-        if (this.OSRMLoader.up()) {
-            throw new Error('*** osrm-routed is already running.');
-        }
-    };
-
-    this.verifyExistenceOfBinaries = (callback) => {
-        var verify = (bin, cb) => {
-            var binPath = path.resolve(util.format('%s/%s%s', this.BIN_PATH, bin, this.EXE));
-            fs.exists(binPath, (exists) => {
-                if (!exists) throw new Error(util.format('%s is missing. Build failed?', binPath));
-                var helpPath = util.format('%s%s --help > /dev/null 2>&1', this.LOAD_LIBRARIES, binPath);
-                exec(helpPath, (err) => {
-                    if (err) {
-                        this.log(util.format('*** Exited with code %d', err.code), 'preprocess');
-                        throw new Error(util.format('*** %s exited with code %d', helpPath, err.code));
-                    }
-                    cb();
-                });
-            });
-        };
-
-        var q = d3.queue();
-        ['osrm-extract', 'osrm-contract', 'osrm-routed'].forEach(bin => { q.defer(verify, bin); });
-        q.awaitAll(() => {
-            callback();
-        });
-    };
-
-    this.AfterConfiguration = (callback) => {
-        this.clearLogFiles(() => {
-            this.verifyOSRMIsNotRunning();
-            this.verifyExistenceOfBinaries(() => {
-                callback();
-            });
-        });
-    };
-
-    process.on('exit', () => {
-        if (this.OSRMLoader.loader) this.OSRMLoader.shutdown(() => {});
-    });
-
-    process.on('SIGINT', () => {
-        process.exit(2);
-        // TODO need to handle for windows??
-    });
-};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Patrick Niklaus	db0db58bf8	Make gcc 4.8 happy and disable protected because of lambdas	2016-03-19 00:01:43 +01:00
Daniel Patterson	1751fedfd0	Include edge duration information.	2016-03-18 23:34:28 +01:00
Patrick Niklaus	b3599ea249	Implement viewport code to fix simplification This fixes #2083	2016-03-18 23:25:54 +01:00
Patrick Niklaus	2927d149db	Add tests for coordinate transformation	2016-03-18 23:25:44 +01:00
Patrick Niklaus	0d628da3ba	Consolidate math functions	2016-03-18 23:25:44 +01:00
Patrick Niklaus	497e4154a7	get_name_for_id -> GetNameForID	2016-03-18 19:29:09 +01:00
Patrick Niklaus	88db0ba90c	Simplfy name change announcement	2016-03-18 18:16:20 +01:00
Moritz Kobitzsch	44e1e57790	fix division by zero	2016-03-18 17:41:55 +01:00
Moritz Kobitzsch	1a4f6cba7a	restructured to only return valid turns to the outside + cleanup	2016-03-18 17:41:55 +01:00
Moritz Kobitzsch	ee5020baf3	less new names, forks consider road classes, api clean-up	2016-03-18 17:41:55 +01:00
Moritz Kobitzsch	7b755eea54	implement basic turn handling	2016-03-18 17:41:55 +01:00
Moritz Kobitzsch	fbdafca4f2	implements relative position feature based on coordinates	2016-03-18 17:33:05 +01:00
Patrick Niklaus	873950ee86	Don't sum up durations of merged steps since we do that in a different place now	2016-03-18 17:33:05 +01:00
Patrick Niklaus	50fcc65431	Fix foward/backwad swap	2016-03-18 17:33:05 +01:00
Patrick Niklaus	343011c3da	Limit zoomlevel to 18	2016-03-18 17:33:05 +01:00
Patrick Niklaus	4c66fcafaa	Fix shared memory	2016-03-18 17:33:05 +01:00
Patrick Niklaus	513fd09780	Fixup for last commit	2016-03-18 17:33:05 +01:00
Daniel Patterson	f6de8f3444	Enables the use of multiple segment-speed-files on the osrm-contract command line, and exposes the file name used for each edge in the debug tiles.	2016-03-18 17:33:05 +01:00
Patrick Niklaus	082eac68f7	Fix ingestion fixed duration values from UnpackPath	2016-03-18 17:33:05 +01:00
Patrick Niklaus	7091331b55	Fix durations in UnpackPath	2016-03-18 17:33:05 +01:00
Moritz Kobitzsch	7149e25636	fixes a broken assertion	2016-03-18 17:33:05 +01:00
Moritz Kobitzsch	f76fc7fd83	fix merging of turn instructions	2016-03-18 17:33:05 +01:00
Patrick Niklaus	6a0db71e34	Include reverse edges again	2016-03-18 17:33:05 +01:00
Patrick Niklaus	d6776b3e81	Formating and logging changes for turn classification	2016-03-18 17:33:05 +01:00
Patrick Niklaus	f9eb22093b	Handle case of dead-end edges by inserting an invalid turn	2016-03-18 17:33:05 +01:00
Moritz Kobitzsch	9fb86bcac5	report depart/arrive in addition to waypoint	2016-03-18 17:33:05 +01:00
Patrick Niklaus	17d775588d	Only install necessary headers	2016-03-18 17:33:05 +01:00
Daniel J. Hofmann	810c0f3b3e	Adds the license preamble for all publicly installed eaders, closes #2036	2016-03-18 17:33:05 +01:00
Patrick Niklaus	fe3005f630	Remove the encoder/decoder dependecy from Hint	2016-03-18 17:33:04 +01:00
Patrick Niklaus	ab7ded02c1	Rename alternative -> alternatives	2016-03-18 17:33:04 +01:00
Patrick Niklaus	bad4d4d6c7	Remove obsolete debug information	2016-03-18 17:33:04 +01:00
Patrick Niklaus	8485a99349	Just return NoSegment in map matching if all candidates are empty	2016-03-18 17:33:04 +01:00
Patrick Niklaus	af6b84a432	Add failing test for map matching of outlier	2016-03-18 17:33:04 +01:00
Patrick Niklaus	1dc26585d2	Fix missing capitalization of error codes	2016-03-18 17:33:04 +01:00
Moritz Kobitzsch	a95f4a8816	encapsulated into class	2016-03-18 17:33:04 +01:00
Moritz Kobitzsch	94a2072533	improving fork handling on three-way turns	2016-03-18 17:33:04 +01:00
Moritz Kobitzsch	a5568f8be4	fix comparison for ramps on three-way turns	2016-03-18 17:33:04 +01:00
Patrick Niklaus	dafd724923	Minor auto iterator cleanup	2016-03-18 17:33:04 +01:00
Patrick Niklaus	807f5c0014	Don't pass down unsnapped coordinates. All information is already there	2016-03-18 17:33:04 +01:00
Patrick Niklaus	956b264ece	Fix camMergeTrivially	2016-03-18 17:33:04 +01:00
Moritz Kobitzsch	8967cebd10	fixes roundabout counting	2016-03-18 17:33:04 +01:00
Moritz Kobitzsch	431a8cb5c1	fixes assignment for basic turn types / invalid ramp assignment	2016-03-18 17:33:04 +01:00
Patrick Niklaus	1675ff1748	Add edge id assertions	2016-03-18 17:33:04 +01:00
Patrick Niklaus	c8cd89355c	Don't pass shared_ptr down to functions "Don’t pass a smart pointer as a function parameter unless you want to use or manipulate the smart pointer itself, such as to share or transfer ownership." Source: http://herbsutter.com/2013/06/05/gotw-91-solution-smart-pointer-parameters/	2016-03-18 17:33:04 +01:00
Patrick Niklaus	e50bf1062f	Move bearing to public namespace	2016-03-18 17:33:04 +01:00
Daniel J. Hofmann	50cf0cf84f	Properly includes needed headers in turn analysis interface	2016-03-18 17:33:04 +01:00
Daniel J. Hofmann	da298f0f28	Const-correctnes for compressed geometry iterator	2016-03-18 17:33:04 +01:00
Daniel J. Hofmann	d5a3d817aa	Use stdint and using type-alias for discrete angle	2016-03-18 17:33:03 +01:00
Daniel J. Hofmann	5f4424482e	Hide functional road classification based on tags in implementation file	2016-03-18 17:33:03 +01:00
Daniel J. Hofmann	9d0da926e5	Inline initialize functional road classification hash table	2016-03-18 17:33:03 +01:00
Daniel J. Hofmann	512dd9a5e2	256 functional road classes should be enough	2016-03-18 17:33:03 +01:00
Daniel J. Hofmann	bba7e49d15	Moves route assembly into implementation file	2016-03-18 17:33:03 +01:00
Daniel J. Hofmann	70066c3ed0	Fixes remaining engine/guidance includes	2016-03-18 17:33:03 +01:00
Daniel J. Hofmann	5661628f2c	Fixes accumulate living in <numeric> and not <algorithm>	2016-03-18 17:33:03 +01:00
Daniel J. Hofmann	2ff9386368	Puts step maneuver handling into implementation file	2016-03-18 17:33:03 +01:00
Daniel J. Hofmann	37e93cf96a	Removes penalizing move	2016-03-18 17:33:03 +01:00
Daniel J. Hofmann	a7b99b1549	Uses static_casts for underlying type in post processing	2016-03-18 17:33:03 +01:00
Daniel J. Hofmann	3443baa311	Fix asymmetry in min/max from using -max	2016-03-18 17:33:03 +01:00
Daniel J. Hofmann	d88ce65385	Adapts MakeResponse to not pass vector by pointer	2016-03-18 17:33:03 +01:00
Daniel J. Hofmann	7865bd8815	Fixes multi-line comment	2016-03-18 17:33:03 +01:00
Daniel J. Hofmann	6856f00074	Runs scripts/format.sh	2016-03-18 17:33:03 +01:00
Patrick Niklaus	bc67488f25	Fix coodinate include and unused warnings	2016-03-18 17:33:03 +01:00
Moritz Kobitzsch	6c5822fb45	start of four way turns	2016-03-18 17:33:03 +01:00
Moritz Kobitzsch	779ddeeb69	improved fork handling	2016-03-18 17:33:03 +01:00
Patrick Niklaus	01c4b3f7a3	Fix crash on extracting Berlin in guidance	2016-03-18 17:33:03 +01:00
Moritz Kobitzsch	fecd3d27ac	bugfixing/classification	2016-03-18 17:33:02 +01:00
Patrick Niklaus	0724c4a2d8	Big Restructuring / Cleanup	2016-03-18 17:33:02 +01:00
Moritz Kobitzsch	cba4baf920	starting on conflict resolution	2016-03-18 17:33:02 +01:00
Lauren Budorick	dda6d49f4a	Fixes for gcc compiling, temporary hacks to remove later	2016-03-18 17:33:02 +01:00
Moritz Kobitzsch	6f9d8a691d	handle segregated roads (merge for turn analysis)	2016-03-18 17:33:02 +01:00
Moritz Kobitzsch	f713408d46	structural changes, motorway handling	2016-03-18 17:33:02 +01:00
Moritz Kobitzsch	80843ecc89	enter and exit roundabout feature - currently not showing turn	2016-03-18 17:33:02 +01:00
Moritz Kobitzsch	aced4ebe56	migrated out of edge based graph factory	2016-03-18 17:33:02 +01:00
Moritz Kobitzsch	df00b99d84	relative waypoint locations	2016-03-18 17:33:02 +01:00
Moritz Kobitzsch	7dfe91bba0	handling of roundabouts (simple version)	2016-03-18 17:33:02 +01:00
Moritz Kobitzsch	8753590f59	advanced guidance on 5.0	2016-03-18 17:33:02 +01:00
Patrick Niklaus	12ff303cf8	Fix numerical problems with polyline	2016-03-18 17:33:02 +01:00
Patrick Niklaus	70dfe23f0e	Fix table response format to return null + double in seconds	2016-03-18 17:33:02 +01:00
Patrick Niklaus	6ca0afa212	Return NoMatch	2016-03-18 17:33:02 +01:00
Daniel J. Hofmann	31f735b08e	Provides ctor from base path for EngineConfig, fixes #2030	2016-03-18 17:33:02 +01:00
Patrick Niklaus	b01b7dcbca	Add support for tile plugin	2016-03-18 17:33:02 +01:00
Patrick Niklaus	248a0af761	Preliminary integration of the tile plugin	2016-03-18 17:33:02 +01:00
Patrick Niklaus	49fff1d93f	sources and destinations can be empty actually	2016-03-18 17:33:02 +01:00
Daniel J. Hofmann	29a72a9e1a	Fixes coordinate, source and destination validation by means of backporting #2041	2016-03-18 17:33:01 +01:00
Daniel J. Hofmann	b3a709b98d	Fixes ownership semantics and forwarding references misplacements in the JSON factory	2016-03-18 17:33:01 +01:00
Daniel J. Hofmann	aa3472cc6b	Unwrap function call from identity lambda	2016-03-18 17:33:01 +01:00
Daniel J. Hofmann	3db1509855	Uses JSON's String constructor for polyline encoding	2016-03-18 17:33:01 +01:00
Daniel J. Hofmann	53f47458a2	Passes coordinates by value	2016-03-18 17:33:01 +01:00
Daniel J. Hofmann	f784b85cd6	Asserts on unknown TurnInstruction	2016-03-18 17:33:01 +01:00
Daniel J. Hofmann	02c3c3e847	Fixes header includes in the JSON factory	2016-03-18 17:33:01 +01:00
Dane Springmeyer	8af3a036a7	fix compile of osrm-components	2016-03-18 17:33:01 +01:00
Patrick Niklaus	7803d6116b	Fix if the last coordinate is not found	2016-03-18 17:33:01 +01:00
Patrick Niklaus	07cd80d042	Allocate correct table size	2016-03-18 17:33:01 +01:00
Patrick Niklaus	fd6abcfde3	Fix travel mode passing from profiles up to the API	2016-03-18 17:33:01 +01:00
Patrick Niklaus	690a2a41a4	Fix geometries type in steps	2016-03-18 17:33:01 +01:00
Patrick Niklaus	dd1f9e5a6a	Fix table parameter parsing	2016-03-18 17:33:01 +01:00
Patrick Niklaus	e4ed2f6a2f	Fix behaviour of table if sources/destinations arrays are empty	2016-03-18 17:33:01 +01:00
Patrick Niklaus	25f86b68dc	Fuck. this. shit.	2016-03-18 17:33:01 +01:00
Patrick Niklaus	5916ddda80	Change stream operator of strong typedef	2016-03-18 17:33:01 +01:00
Patrick Niklaus	2e214ac222	Fix stream operator for coordinate	2016-03-18 17:33:01 +01:00
Patrick Niklaus	5acd2ca394	Add stream operator to Rectangle	2016-03-18 17:33:01 +01:00
Patrick Niklaus	ffaf0fc86f	Add euclideanDistance to coordinate_calculation	2016-03-18 17:33:01 +01:00
Patrick Niklaus	ef6c62d224	Simplify static_rtree tests	2016-03-18 17:33:01 +01:00
Patrick Niklaus	fed2a67e42	First round of lat,lng -> lng,lat switcheroo	2016-03-18 17:33:00 +01:00
Patrick Niklaus	059ee4e350	Add rectangle unit test	2016-03-18 17:33:00 +01:00
Patrick Niklaus	53a74ce3e6	Fix match and trip API response	2016-03-18 17:33:00 +01:00
Patrick Niklaus	b18c7d75da	Fix out-of-bounds write in map_matching	2016-03-18 17:33:00 +01:00
Dane Springmeyer	f3e5ce561a	Fix compile on OS X	2016-03-18 17:33:00 +01:00
Patrick Niklaus	65d56182f2	Finish the nearest plugin	2016-03-18 17:33:00 +01:00
Patrick Niklaus	1c05d8b7ae	Initialize NearestParameters correctly	2016-03-18 17:33:00 +01:00
Patrick Niklaus	6223ee887c	Adapt to feedback in #519	2016-03-18 17:33:00 +01:00
Patrick Niklaus	d1528dc4ac	Add trip plugin	2016-03-18 17:33:00 +01:00
Patrick Niklaus	7a042e643f	Hook up map matching	2016-03-18 17:33:00 +01:00
Patrick Niklaus	a129e549eb	First compiling version of map_match plugin	2016-03-18 17:33:00 +01:00
Daniel J. Hofmann	581b5c2ab6	Adapts example/example.cpp to new osrm api	2016-03-18 17:33:00 +01:00
Daniel J. Hofmann	ece2056a13	Install _all_ transitively from public headers included header	2016-03-18 17:33:00 +01:00
Daniel J. Hofmann	d6e5b79747	Fix missing headers in hint.hpp	2016-03-18 17:33:00 +01:00
Daniel J. Hofmann	2d98bacdd5	Adds $prefix/include/osrm to include dirs so that transitive header includes without osrm prefix can be found	2016-03-18 17:33:00 +01:00
Daniel J. Hofmann	8863947e86	Adapt the example to include all osrm public headers	2016-03-18 17:33:00 +01:00
Daniel J. Hofmann	27f74432a0	Fixes missing public header installations	2016-03-18 17:33:00 +01:00
Daniel J. Hofmann	03d88b3df2	Fix forward declarations in publicly facing osrm header	2016-03-18 17:33:00 +01:00
Daniel J. Hofmann	bdfa072cac	Enable all plugins with aStatus::Error return code fallback for not implemented ones	2016-03-18 17:33:00 +01:00
Daniel J. Hofmann	65ba774ebc	Adds publicly facing alias headers for parameters	2016-03-18 17:33:00 +01:00
Daniel J. Hofmann	d34c215c09	Temporarily comment out match.cpp as to not break the build process	2016-03-18 17:33:00 +01:00
Daniel J. Hofmann	c88eeb89c6	We don't need templates at all, this is not CRTP?	2016-03-18 17:32:59 +01:00
Daniel J. Hofmann	bde8ec1dbd	Fix classes for service member function definitions	2016-03-18 17:32:59 +01:00
Daniel J. Hofmann	49a173652b	Service skeletons for nearest, trip, match	2016-03-18 17:32:59 +01:00
Daniel J. Hofmann	e4dace1d51	Fix grammar constraint and enable all plugin links	2016-03-18 17:32:59 +01:00
Daniel J. Hofmann	43d1e40284	Plugin grammar skeletons	2016-03-18 17:32:59 +01:00
Daniel J. Hofmann	139220058e	Enforce parameter and grammar type to catch subtle bugs	2016-03-18 17:32:59 +01:00
Daniel J. Hofmann	11a92a8e54	Link parameters to grammars	2016-03-18 17:32:59 +01:00
Daniel J. Hofmann	d3a2c1c41c	Require a BaseParameters type at compile time via enable_if	2016-03-18 17:32:59 +01:00
Daniel J. Hofmann	566505fd0f	Adapts Nearest plugin to new API	2016-03-18 17:32:59 +01:00
Daniel J. Hofmann	9dada6b46a	Fix deleting incomplete type and make Engine moveable only	2016-03-18 17:32:59 +01:00
Daniel J. Hofmann	f9d2440d95	Adapts publicly facing new API	2016-03-18 17:32:59 +01:00
Daniel J. Hofmann	a4387f39f1	Adapts NearestParameters to new API	2016-03-18 17:32:59 +01:00
Patrick Niklaus	1902292629	Initial non-building match plugin	2016-03-18 17:32:59 +01:00
Lauren Budorick	bbf2ac23b4	Include numeric in assemble_overview.cpp (needed on OSX for std::accumulate)	2016-03-18 17:32:59 +01:00
Daniel J. Hofmann	445df08fb4	Semantic action handler requires passing optional by value and fusion::vector2	2016-03-18 17:32:59 +01:00
Patrick Niklaus	27a2b061bf	Add tests for bearing parsing	2016-03-18 17:32:59 +01:00
Patrick Niklaus	944947962b	Add table service	2016-03-18 17:32:59 +01:00
Patrick Niklaus	fda8f6ecef	Add table API	2016-03-18 17:32:59 +01:00
Daniel J. Hofmann	ca6c1d7bb1	Optional<T> semantic action handler takes T argument	2016-03-18 17:32:59 +01:00
Patrick Niklaus	d88dda1a45	Fix parameter parsing tests	2016-03-18 17:32:59 +01:00
Patrick Niklaus	207f1d7732	Fix table plugin	2016-03-18 17:32:58 +01:00
Daniel J. Hofmann	d73600387b	First take at distance table API re-write	2016-03-18 17:32:58 +01:00
Daniel J. Hofmann	9194ab590c	Adapts TableParameters and its validation to new API	2016-03-18 17:32:58 +01:00
Patrick Niklaus	68eeb20c5c	Add viaroute suport for new API	2016-03-18 17:32:58 +01:00
Patrick Niklaus	2f3b4373f9	Also exclude the compressed flag from the data format	2016-03-18 17:30:13 +01:00
Patrick Niklaus	1b25bebeac	Remove geometry indicator	2016-03-18 17:30:13 +01:00