Bump nodejs version to make new package.

There is no possibility until multiple-weights are implemented
to break tie in the contraction and the direct shortest path plugin
as duration is not computed during contraction.

This must be fixed after multiple-weights implementation
by using `std::tie(weight, duration)` pairs everywhere.

.babelrc

@@ -1,4 +1,5 @@
 {
+    "plugins": ["transform-class-properties"],
     "presets": [
         "stage-0",
         "es2015",

.gitignore

@@ -46,6 +46,7 @@ Thumbs.db
 
 # build related files #
 #######################
+/_build*
 /build/
 /example/build/
 /test/data/monaco*

.npmignore

@@ -0,0 +1,16 @@
+*
+!README.md
+!CHANGELOG.md
+!CONTRIBUTING.MD
+!LICENCE.TXT
+!package.json
+!package-lock.json
+!yarn.lock
+!docs
+!example
+!taginfo.json
+!lib/*.js
+!profiles/*
+!profiles/lib/*
+!profiles/examples/*
+!scripts/node_install.sh

.travis.yml

@@ -7,10 +7,6 @@ git:
 sudo: required
 dist: trusty
 
-node_js:
-    - "4"
-    - "6"
-
 notifications:
   email: false
 
@@ -72,7 +68,7 @@ matrix:
       addons: &gcc6
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
+          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
       env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' ENABLE_COVERAGE=ON CUCUMBER_TIMEOUT=20000
       after_success:
         - bash <(curl -s https://codecov.io/bash)
@@ -82,15 +78,15 @@ matrix:
       addons: &gcc6
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
-      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' TARGET_ARCH='x86_64-asan' ENABLE_SANITIZER=ON CUCUMBER_TIMEOUT=20000
+          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
+      env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Debug' TARGET_ARCH='x86_64-asan' ENABLE_SANITIZER=ON CUCUMBER_TIMEOUT=20000 LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/scripts/travis/leaksanitizer.conf"
 
     - os: linux
       compiler: "clang-4.0-debug"
       addons: &clang40
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
+          packages: ['libstdc++-4.9-dev', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
       env: CLANG_VERSION='4.0.0' BUILD_TYPE='Debug' CUCUMBER_TIMEOUT=60000
 
     - os: linux
@@ -98,8 +94,8 @@ matrix:
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev']
-      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_SANITIZER=ON
+          packages: ['libstdc++-4.9-dev']
+      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_SANITIZER=ON LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/scripts/travis/leaksanitizer.conf"
 
     # Release Builds
     - os: linux
@@ -107,7 +103,7 @@ matrix:
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev']
+          packages: ['libstdc++-4.9-dev']
       env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON RUN_CLANG_FORMAT=ON ENABLE_LTO=ON
 
     - os: linux
@@ -115,7 +111,7 @@ matrix:
       addons: &gcc6
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
+          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
       env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release'
 
     - os: linux
@@ -129,7 +125,7 @@ matrix:
       addons: &gcc6
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
+          packages: ['g++-6', 'libbz2-dev', 'libstxxl-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
       env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' ENABLE_STXXL=On
 
     - os: linux
@@ -137,14 +133,22 @@ matrix:
       addons: &gcc49
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.9', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
+          packages: ['g++-4.9', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev', 'ccache']
       env: CCOMPILER='gcc-4.9' CXXCOMPILER='g++-4.9' BUILD_TYPE='Release'
 
     - os: osx
       osx_image: xcode8.2
       compiler: "mason-osx-release"
       # we use the xcode provides clang and don't install our own
-      env: ENABLE_MASON=ON BUILD_TYPE='Release' CUCUMBER_TIMEOUT=60000 CCOMPILER='clang' CXXCOMPILER='clang++' ENABLE_ASSERTIONS=ON ENABLE_LTO=ON
+      env: ENABLE_MASON=ON BUILD_TYPE='Release' CUCUMBER_TIMEOUT=60000 CCOMPILER='clang' CXXCOMPILER='clang++' ENABLE_ASSERTIONS=ON ENABLE_LTO=ON NODE="4"
+      after_success:
+        - ./scripts/travis/publish.sh
+
+    - os: osx
+      osx_image: xcode8.2
+      compiler: "mason-osx-release"
+      # we use the xcode provides clang and don't install our own
+      env: ENABLE_MASON=ON BUILD_TYPE='Release' CUCUMBER_TIMEOUT=60000 CCOMPILER='clang' CXXCOMPILER='clang++' ENABLE_ASSERTIONS=ON ENABLE_LTO=ON NODE="6"
       after_success:
         - ./scripts/travis/publish.sh
 
@@ -154,7 +158,7 @@ matrix:
       #- addons: &clang40
       #-   apt:
       #-     sources: ['llvm-toolchain-trusty-4.0', 'ubuntu-toolchain-r-test']
-      #-     packages: ['clang-4.0', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
+      #-     packages: ['clang-4.0', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
       #- env: CCOMPILER='clang-4.0' CXXCOMPILER='clang++-4.0' BUILD_TYPE='Release'
 
     # Shared Library
@@ -163,7 +167,7 @@ matrix:
       addons: &gcc6
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
+          packages: ['g++-6', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
       env: CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
 
       # Disabled because CI slowness
@@ -172,7 +176,7 @@ matrix:
       #- addons: &clang40
       #-   apt:
       #-     sources: ['llvm-toolchain-trusty-4.0', 'ubuntu-toolchain-r-test']
-      #-     packages: ['clang-4.0', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
+      #-     packages: ['clang-4.0', 'libbz2-dev', 'libxml2-dev', 'libzip-dev', 'liblua5.2-dev', 'libtbb-dev', 'libgdal-dev', 'libboost-all-dev']
       #- env: CCOMPILER='clang-4.0' CXXCOMPILER='clang++-4.0' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
 
     # Node build jobs. These skip running the tests.
@@ -182,7 +186,7 @@ matrix:
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev']
+          packages: ['libstdc++-4.9-dev']
       env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3
       install:
         - pushd ${OSRM_BUILD_DIR}
@@ -191,7 +195,8 @@ matrix:
               -DENABLE_MASON=${ENABLE_MASON:-OFF} \
               -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
               -DENABLE_CCACHE=ON \
-              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
+              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \
+              -DENABLE_GLIBC_WORKAROUND=ON
         - make --jobs=${JOBS}
         - popd
       script:
@@ -205,7 +210,7 @@ matrix:
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev']
+          packages: ['libstdc++-4.9-dev']
       env: CLANG_VERSION='4.0.0' BUILD_TYPE='Debug' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3
       install:
         - pushd ${OSRM_BUILD_DIR}
@@ -214,7 +219,8 @@ matrix:
               -DENABLE_MASON=${ENABLE_MASON:-OFF} \
               -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
               -DENABLE_CCACHE=ON \
-              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
+              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \
+              -DENABLE_GLIBC_WORKAROUND=ON
         - make --jobs=${JOBS}
         - popd
       script:
@@ -228,7 +234,7 @@ matrix:
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev']
+          packages: ['libstdc++-4.9-dev']
       env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 NODE="6"
       install:
         - pushd ${OSRM_BUILD_DIR}
@@ -237,7 +243,8 @@ matrix:
               -DENABLE_MASON=${ENABLE_MASON:-OFF} \
               -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
               -DENABLE_CCACHE=ON \
-              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
+              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \
+              -DENABLE_GLIBC_WORKAROUND=ON
         - make --jobs=${JOBS}
         - popd
       script:
@@ -251,7 +258,7 @@ matrix:
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['libstdc++-5-dev']
+          packages: ['libstdc++-4.9-dev']
       env: CLANG_VERSION='4.0.0' BUILD_TYPE='Debug' ENABLE_MASON=ON ENABLE_LTO=ON JOBS=3 NODE="6"
       install:
         - pushd ${OSRM_BUILD_DIR}
@@ -260,7 +267,8 @@ matrix:
               -DENABLE_MASON=${ENABLE_MASON:-OFF} \
               -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF} \
               -DENABLE_CCACHE=ON \
-              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
+              -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \
+              -DENABLE_GLIBC_WORKAROUND=ON
         - make --jobs=${JOBS}
         - popd
       script:
@@ -301,7 +309,7 @@ before_install:
   - mkdir -p ${CMAKE_DIR}
   - travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C ${CMAKE_DIR} || travis_terminate 1
   - export PATH=${CMAKE_DIR}/bin:${PATH}
-  - ${MASON} install tbb 2017_20161128 && export LD_LIBRARY_PATH=$(${MASON} prefix tbb 2017_20161128)/lib/:${LD_LIBRARY_PATH}
+  - ${MASON} install tbb 2017_U7 && export LD_LIBRARY_PATH=$(${MASON} prefix tbb 2017_U7)/lib/:${LD_LIBRARY_PATH}
   - ${MASON} install ccache ${CCACHE_VERSION} && export PATH=$(${MASON} prefix ccache ${CCACHE_VERSION})/bin:${PATH}
   - |
     if [[ ! -z ${CLANG_VERSION} ]]; then
@@ -334,7 +342,8 @@ install:
              -DENABLE_STXXL=${ENABLE_STXXL:-OFF} \
              -DBUILD_TOOLS=ON \
              -DENABLE_CCACHE=ON \
-             -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR}
+             -DCMAKE_INSTALL_PREFIX=${OSRM_INSTALL_DIR} \
+             -DENABLE_GLIBC_WORKAROUND=${ENABLE_GLIBC_WORKAROUND:-OFF}
   - echo "travis_fold:start:MAKE"
   - make --jobs=${JOBS}
   - make tests --jobs=${JOBS}
@@ -361,6 +370,7 @@ script:
   - pushd ${OSRM_BUILD_DIR}
   - ./unit_tests/library-tests
   - ./unit_tests/extractor-tests
+  - ./unit_tests/contractor-tests
   - ./unit_tests/engine-tests
   - ./unit_tests/util-tests
   - ./unit_tests/server-tests

CHANGELOG.md

@@ -1,3 +1,57 @@
+# UNRELEASED
+    - Profile:
+      - New function to support relations: `process_relation`. Read more in profiles documentation.
+      - Support of `distance` weight in foot and bicycle profiles
+    - Infrastructure:
+      - Lua 5.1 support is removed due to lack of support in sol2 https://github.com/ThePhD/sol2/issues/302
+    - Node.js Bindings:
+      - Exposes `use_threads_number=Number` parameter of `EngineConfig` to limit a number of threads in a TBB internal pool
+    - Internals
+      - MLD uses a unidirectional Dijkstra for 1-to-N and N-to-1 matrices
+
+# 5.12.0
+    - Guidance
+      - now announcing turning onto oneways at the end of a road (e.g. onto dual carriageways)
+      - Adds new instruction types at the exit of roundabouts and rotaries `exit roundabout` and `exit rotary`.
+    - HTTP:
+      - New query parameter for route/table/match/trip plugings:
+        `exclude=` that can be used to exclude certain classes (e.g. exclude=motorway, exclude=toll).
+        This is configurable in the profile.
+    - NodeJS:
+      - New query option `exclude` for the route/table/match/trip plugins. (e.g. `exclude: ["motorway", "toll"]`)
+    - Profile:
+      - New property for profile table: `excludable` that can be used to configure which classes are excludable at query time.
+      - New optional property for profile table: `classes` that allows you to specify which classes you expect to be used.
+        We recommend this for better error messages around classes, otherwise the possible class names are infered automatically.
+    - Traffic:
+      - If traffic data files contain an empty 4th column, they will update edge durations but not modify the edge weight.  This is useful for
+        updating ETAs returned, without changing route selection (for example, in a distance-based profile with traffic data loaded).
+    - Infrastructure:
+      - New file `.osrm.cell_metrics` created by `osrm-customize`.
+    - Debug tiles:
+      - Added new properties `type` and `modifier` to `turns` layer, useful for viewing guidance calculated turn types on the map
+
+# 5.11.0
+  - Changes from 5.10:
+    - Features
+      - BREAKING: Added support for conditional via-way restrictions. This features changes the file format of osrm.restrictions and requires re-extraction
+    - Internals
+      - BREAKING: Traffic signals will no longer be represented as turns internally. This requires re-processing of data but enables via-way turn restrictions across highway=traffic_signals
+      - Additional checks for empty segments when loading traffic data files
+      - Tunes the constants for turns in sharp curves just a tiny bit to circumvent a mix-up in fork directions at a specific intersection (https://github.com/Project-OSRM/osrm-backend/issues/4331)
+    - Infrastructure
+      - Refactor datafacade to make implementing additional DataFacades simpler
+    - Bugfixes
+      - API docs are now buildable again
+      - Suppress unnecessary extra turn instruction when exiting a motorway via a motorway_link onto a primary road (https://github.com/Project-OSRM/osrm-backend/issues/4348 scenario 4)
+      - Suppress unnecessary extra turn instruction when taking a tertiary_link road from a teritary onto a residential road (https://github.com/Project-OSRM/osrm-backend/issues/4348 scenario 2)
+      - Various MSVC++ build environment fixes
+      - Avoid a bug that crashes GCC6
+      - Re-include .npmignore to slim down published modules
+      - Fix a pre-processing bug where incorrect directions could be issued when two turns would have similar instructions and we tried to give them distinct values (https://github.com/Project-OSRM/osrm-backend/pull/4375)
+      - The entry bearing for correct the cardinality of a direction value (https://github.com/Project-OSRM/osrm-backend/pull/4353
+      - Change timezones in West Africa to the WAT zone so they're recognized on the Windows platform
+
 # 5.10.0
   - Changes from 5.9:
     - Profiles:
@@ -17,6 +71,7 @@
       - Guidance: add support for throughabouts
     - Bugfixes
       - Properly save/retrieve datasource annotations for road segments ([#4346](https://github.com/Project-OSRM/osrm-backend/issues/4346)
+      - Fix conditional restriction grammer parsing so it works for single-day-of-week restrictions ([#4357](https://github.com/Project-OSRM/osrm-backend/pull/4357))
     - Algorithm)
       - BREAKING: the file format requires re-processing due to the changes on via-ways
       - Added support for via-way restrictions

CMakeLists.txt

@@ -31,12 +31,13 @@ option(ENABLE_LTO "Use LTO if available" OFF)
 option(ENABLE_FUZZING "Fuzz testing using LLVM's libFuzzer" OFF)
 option(ENABLE_GOLD_LINKER "Use GNU gold linker if available" ON)
 option(ENABLE_NODE_BINDINGS "Build NodeJs bindings" OFF)
+option(ENABLE_GLIBC_WORKAROUND "Workaround GLIBC symbol exports" OFF)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 if(ENABLE_MASON)
   # versions in use
-  set(MASON_BOOST_VERSION "1.63.0")
+  set(MASON_BOOST_VERSION "1.65.1")
   set(MASON_STXXL_VERSION "1.4.1-1")
   set(MASON_EXPAT_VERSION "2.2.0")
   set(MASON_LUA_VERSION "5.2.4")
@@ -60,7 +61,7 @@ if (POLICY CMP0048)
 endif()
 project(OSRM C CXX)
 set(OSRM_VERSION_MAJOR 5)
-set(OSRM_VERSION_MINOR 10)
+set(OSRM_VERSION_MINOR 13)
 set(OSRM_VERSION_PATCH 0)
 set(OSRM_VERSION "${OSRM_VERSION_MAJOR}.${OSRM_VERSION_MINOR}.${OSRM_VERSION_PATCH}")
 
@@ -102,11 +103,11 @@ if(WIN32 AND MSVC_VERSION LESS 1900)
 endif()
 
 # Strictly require GCC>=4.9 and Clang>=3.4 - GCC 4.8 is already too old for C++14.
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
   if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
     message(FATAL_ERROR "GCC>=4.9 required. In case you are on Ubuntu upgrade via ppa:ubuntu-toolchain-r/test")
   endif()
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4)
     message(FATAL_ERROR "Clang>=3.4 required. In case you are on Ubuntu upgrade via http://apt.llvm.org")
   endif()
@@ -182,7 +183,7 @@ endif()
 
 # Disable LTO when mason+gcc is detected before testing for / setting any flags.
 # Mason builds libraries with Clang, mixing does not work in the context of lto.
-if(ENABLE_MASON AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND ENABLE_LTO)
+if(ENABLE_MASON AND CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND ENABLE_LTO)
   set(ENABLE_LTO OFF)
   message(WARNING "Mason and GCC's LTO not work together. Disabling LTO.")
 endif()
@@ -211,9 +212,9 @@ endif()
 if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
   message(STATUS "Configuring debug mode flags")
   set(ENABLE_ASSERTIONS ON)
-  if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+  if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-inline -fno-omit-frame-pointer")
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
       if (CMAKE_BUILD_TYPE MATCHES Debug)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og -ggdb")
       else()
@@ -232,7 +233,7 @@ if(CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES MinRelSize OR CM
   if(ENABLE_LTO AND LTO_AVAILABLE)
     set(OLD_CXX_FLAGS ${CMAKE_CXX_FLAGS})
     # GCC in addition allows parallelizing LTO
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
       include(ProcessorCount)
       ProcessorCount(NPROC)
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto=${NPROC}")
@@ -255,7 +256,7 @@ if(CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES MinRelSize OR CM
     endif()
 
     # Since gcc 4.9 the LTO format is non-standart ('slim'), so we need to use the build-in tools
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
+    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND
         NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0" AND NOT MINGW)
       find_program(GCC_AR gcc-ar)
       find_program(GCC_RANLIB gcc-ranlib)
@@ -271,7 +272,7 @@ if(CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES MinRelSize OR CM
     endif()
 
     # Same for clang LTO requires their own toolchain
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
       find_program(LLVM_AR llvm-ar)
       find_program(LLVM_RANLIB llvm-ranlib)
       if ("${LLVM_AR}" STREQUAL "LLVM_AR-NOTFOUND" OR "${LLVM_RANLIB}" STREQUAL "LLVM_RANLIB-NOTFOUND")
@@ -285,7 +286,7 @@ if(CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES MinRelSize OR CM
       endif()
     endif()
 
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0")
+    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0")
       message(STATUS "Disabling LTO on GCC < 4.9.0 since it is broken, see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57038")
       set(CMAKE_CXX_FLAGS "${OLD_CXX_FLAGS}")
       set(ENABLE_LTO Off)
@@ -315,9 +316,9 @@ if (ENABLE_SANITIZER)
 endif()
 
 # Configuring compilers
-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wuninitialized -Wunreachable-code -Wstrict-overflow=2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC -fcolor-diagnostics -ftemplate-depth=1024 -Wno-unused-command-line-argument")
-elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
   set(COLOR_FLAG "-fdiagnostics-color=auto")
   check_cxx_compiler_flag("-fdiagnostics-color=auto" HAS_COLOR_FLAG)
   if(NOT HAS_COLOR_FLAG)
@@ -337,13 +338,14 @@ elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
   endif()
 
-elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
   # using Intel C++
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-intel -wd10237 -Wall -ipo -fPIC")
-elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
   # using Visual Studio C++
   set(BOOST_COMPONENTS ${BOOST_COMPONENTS} zlib)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") # avoid compiler error C1128 from scripting_environment_lua.cpp
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DWIN32_LEAN_AND_MEAN") # avoid compiler error C2011 from dual #include of winsock.h and winsock2.h
   add_dependency_defines(-DBOOST_LIB_DIAGNOSTIC)
   add_dependency_defines(-D_CRT_SECURE_NO_WARNINGS)
   add_dependency_defines(-DNOMINMAX) # avoid min and max macros that can break compilation
@@ -359,7 +361,7 @@ execute_process(COMMAND ${CMAKE_CXX_COMPILER} "-Wl,--version" ERROR_QUIET OUTPUT
 # For ld.gold and ld.bfs (the GNU linkers) we optimize hard
 if("${LINKER_VERSION}" MATCHES "GNU gold" OR "${LINKER_VERSION}" MATCHES "GNU ld")
   message(STATUS "Setting linker optimizations")
-  if(NOT (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC" OR "${LD_AVOID_GC_SECTIONS}"))
+  if(NOT (CMAKE_CXX_COMPILER_ID MATCHES "MSVC" OR "${LD_AVOID_GC_SECTIONS}"))
     # Tell compiler to put every function in separate section, linker can then match sections and functions
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections")
     # Tell linker to do dead code and data eminination during link time discarding sections
@@ -377,9 +379,9 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAGS}")
 set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")
 
 # Activate C++1y
-if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
-  set(OSRM_CXXFLAGS "${OSRM_CXXFLAGS} -std=c++1y")
+if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+  set(OSRM_CXXFLAGS "${OSRM_CXXFLAGS} -std=c++14")
 endif()
 
 # Configuring other platform dependencies
@@ -467,7 +469,7 @@ if(ENABLE_MASON)
     install(FILES ${TBBGlob} DESTINATION lib)
   endforeach()
   if(APPLE)
-    set(LINKER_FLAGS "${TBB_LINKER_RPATHS} -Wl,-rpath -Wl,@executable_path")
+    set(LINKER_FLAGS "${TBB_LINKER_RPATHS} -Wl,-rpath -Wl,@loader_path")
   elseif(UNIX)
     set(LINKER_FLAGS "${TBB_LINKER_RPATHS} '-Wl,-rpath,$ORIGIN' -Wl,-z,origin")
   endif()
@@ -516,29 +518,10 @@ else()
   find_package(BZip2 REQUIRED)
   add_dependency_includes(${BZIP2_INCLUDE_DIR})
 
-  FIND_PACKAGE(Lua 5.2 EXACT)
-  IF (LUA_FOUND)
-      MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}")
-  ELSE()
-    FIND_PACKAGE(Lua 5.1 EXACT)
-    IF (LUA_FOUND)
-      MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}")
-    ELSE()
-      # Now fall back to a lua verison without exact
-      # in case this cmake version also forces patch versions
-      FIND_PACKAGE(Lua 5.2)
-      IF (LUA_FOUND)
-          MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}")
-      ELSE()
-        FIND_PACKAGE(Lua 5.1)
-        IF (LUA_FOUND)
-          MESSAGE(STATUS "Using Lua ${LUA_VERSION_STRING}")
-        ELSE()
-          MESSAGE(FATAL_ERROR "Lua 5.1 or 5.2 was not found.")
-        ENDIF()
-      ENDIF()
-    ENDIF()
-  ENDIF()
+  find_package(Lua 5.2 REQUIRED)
+  if (LUA_FOUND)
+    message(STATUS "Using Lua ${LUA_VERSION_STRING}")
+  endif()
 
   set(USED_LUA_LIBRARIES ${LUA_LIBRARIES})
   add_dependency_includes(${LUA_INCLUDE_DIR})
@@ -568,7 +551,7 @@ else()
 endif()
 
 # prefix compilation with ccache by default if available and on clang or gcc
-if(ENABLE_CCACHE AND (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU"))
+if(ENABLE_CCACHE AND (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"))
   find_program(CCACHE_FOUND ccache)
   if(CCACHE_FOUND)
     message(STATUS "Using ccache to speed up incremental builds")
@@ -691,10 +674,10 @@ set(UTIL_LIBRARIES
 # Libraries
 target_link_libraries(osrm ${ENGINE_LIBRARIES})
 target_link_libraries(osrm_update ${UPDATER_LIBRARIES})
-target_link_libraries(osrm_contract ${CONTRACTOR_LIBRARIES} osrm_update)
+target_link_libraries(osrm_contract ${CONTRACTOR_LIBRARIES} osrm_update osrm_store)
 target_link_libraries(osrm_extract ${EXTRACTOR_LIBRARIES})
 target_link_libraries(osrm_partition ${PARTITIONER_LIBRARIES})
-target_link_libraries(osrm_customize ${CUSTOMIZER_LIBRARIES} osrm_update)
+target_link_libraries(osrm_customize ${CUSTOMIZER_LIBRARIES} osrm_update osrm_store)
 target_link_libraries(osrm_store ${STORAGE_LIBRARIES})
 
 # BUILD_COMPONENTS
@@ -737,7 +720,7 @@ file(GLOB VariantGlob third_party/variant/include/mapbox/*.hpp)
 file(GLOB LibraryGlob include/osrm/*.hpp)
 file(GLOB ParametersGlob include/engine/api/*_parameters.hpp)
 set(EngineHeader include/engine/status.hpp include/engine/engine_config.hpp include/engine/hint.hpp include/engine/bearing.hpp include/engine/approach.hpp include/engine/phantom_node.hpp)
-set(UtilHeader include/util/coordinate.hpp include/util/json_container.hpp include/util/typedefs.hpp include/util/alias.hpp include/util/exception.hpp)
+set(UtilHeader include/util/coordinate.hpp include/util/json_container.hpp include/util/typedefs.hpp include/util/alias.hpp include/util/exception.hpp include/util/bearing.hpp)
 set(ExtractorHeader include/extractor/extractor.hpp include/storage/io_config.hpp include/extractor/extractor_config.hpp include/extractor/travel_mode.hpp)
 set(PartitionerHeader include/partition/partitioner.hpp include/partition/partition_config.hpp)
 set(ContractorHeader include/contractor/contractor.hpp include/contractor/contractor_config.hpp)
@@ -828,6 +811,10 @@ add_custom_target(uninstall
 add_subdirectory(unit_tests)
 add_subdirectory(src/benchmarks)
 
+if (ENABLE_GLIBC_WORKAROUND)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGLIBC_WORKAROUND")
+endif()
+
 if (ENABLE_NODE_BINDINGS)
   add_subdirectory(src/nodejs)
 endif()

CONTRIBUTING.md

@@ -18,7 +18,7 @@ if [ x"$remote" = xorigin  ] ; then
         echo "Rejected push to $remote/master" ; exit 1
     fi
 
-    ./scripts/format.sh
+    ./scripts/format.sh && ./scripts/error_on_dirty.sh
     if [ $? -ne 0 ] ; then
         echo "Unstaged format changes" ; exit 1
     fi

README.md

@@ -157,7 +157,9 @@ which will check and use pre-built binaries if they're available for this releas
 
 to always force building the Node.js bindings from source.
 
-For usage details have a look [these API docs](docs/nodejs/api.md).
+For usage details have a look [these API docs](docs/nodejs/api.md). 
+
+An exemplary implementation by a 3rd party with Docker and Node.js can be found [here](https://github.com/door2door-io/osrm-express-server-demo).
 
 
 ## References in publications

appveyor-build.bat

@@ -7,19 +7,22 @@ ECHO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 SET PROJECT_DIR=%CD%
 ECHO PROJECT_DIR^: %PROJECT_DIR%
 ECHO NUMBER_OF_PROCESSORS^: %NUMBER_OF_PROCESSORS%
+
+
+:: Check CMake version
+SET CMAKE_VERSION=3.9.2
+SET PATH=%PROJECT_DIR%\cmake-%CMAKE_VERSION%-win32-x86\bin;%PATH%
 ECHO cmake^: && cmake --version
 IF %ERRORLEVEL% NEQ 0 ECHO CMAKE not found && GOTO CMAKE_NOT_OK
 
-cmake --version | findstr /C:"3.7.1" && GOTO CMAKE_OK
+cmake --version | findstr /C:%CMAKE_VERSION% && GOTO CMAKE_OK
 
 :CMAKE_NOT_OK
-SET CMAKE_VERSION=3.7.1
 ECHO CMAKE NOT OK - downloading new CMake %CMAKE_VERSION%
-IF NOT EXIST cm.zip powershell Invoke-WebRequest https://cmake.org/files/v3.7/cmake-%CMAKE_VERSION%-win32-x86.zip -OutFile $env:PROJECT_DIR\cm.zip
+powershell Invoke-WebRequest https://cmake.org/files/v3.9/cmake-%CMAKE_VERSION%-win32-x86.zip -OutFile $env:PROJECT_DIR\cm.zip
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 IF NOT EXIST cmake-%CMAKE_VERSION%-win32-x86 7z -y x cm.zip | %windir%\system32\FIND "ing archive"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-SET PATH=%PROJECT_DIR%\cmake-%CMAKE_VERSION%-win32-x86\bin;%PATH%
 
 :CMAKE_OK
 ECHO CMAKE_OK
@@ -37,7 +40,7 @@ ECHO msbuild version
 msbuild /version
 
 :: HARDCODE "x64" as it is uppercase on AppVeyor and download from S3 is case sensitive
-SET DEPSPKG=osrm-deps-win-x64-14.0.7z
+SET DEPSPKG=osrm-deps-win-x64-14.0-2017.09.7z
 
 :: local development
 ECHO.

cmake/FindLua.cmake

@@ -36,6 +36,8 @@
 # This is because, the lua location is not standardized and may exist in
 # locations other than lua/
 
+include(FindPkgConfig)
+
 unset(_lua_include_subdirs)
 unset(_lua_library_names)
 unset(_lua_append_versions)
@@ -81,6 +83,7 @@ function(_lua_set_version_vars)
              lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
              lua.${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
         )
+        pkg_check_modules(LUA QUIET "lua${ver}")
     endforeach ()
 
     set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)

cucumber.js

@@ -1,7 +1,7 @@
 module.exports = {
-    default: '--strict --tags ~@stress --tags ~@todo --require features/support --require features/step_definitions',
-    verify: '--strict --tags ~@stress --tags ~@todo -f progress --require features/support --require features/step_definitions',
+    default: '--strict --tags ~@stress --tags ~@mld --tags ~@todo --require features/support --require features/step_definitions',
+    verify: '--strict --tags ~@stress --tags ~@mld --tags ~@todo -f progress --require features/support --require features/step_definitions',
     todo: '--strict --tags @todo --require features/support --require features/step_definitions',
     all: '--strict --require features/support --require features/step_definitions',
-    mld: '--strict --tags ~@stress --tags ~@todo --tags ~@alternative --require features/support --require features/step_definitions -f progress'
-}
+    mld: '--strict --tags ~@stress --tags ~@todo --tags ~@alternative --tags ~@ch --require features/support --require features/step_definitions -f progress'
+};

docker/Dockerfile

@@ -7,7 +7,7 @@ RUN NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
     echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
     apk update && \
     apk upgrade && \
-    apk add git cmake wget make libc-dev gcc g++ bzip2-dev boost-dev zlib-dev expat-dev lua5.1-dev libtbb@testing libtbb-dev@testing && \
+    apk add git cmake wget make libc-dev gcc g++ bzip2-dev boost-dev zlib-dev expat-dev lua5.2-dev libtbb@testing libtbb-dev@testing && \
     \
     echo "Building libstxxl" && \
     cd /opt && \
@@ -46,8 +46,8 @@ RUN NPROC=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || 1) && \
     rm /usr/local/lib/libstxxl* && \
     cd /opt && \
     apk del boost-dev && \
-    apk del g++ cmake libc-dev expat-dev zlib-dev bzip2-dev lua5.1-dev git make gcc && \
-    apk add boost-filesystem boost-program_options boost-regex boost-iostreams boost-thread libgomp lua5.1 expat && \
+    apk del g++ cmake libc-dev expat-dev zlib-dev bzip2-dev lua5.2-dev git make gcc && \
+    apk add boost-filesystem boost-program_options boost-regex boost-iostreams boost-thread libgomp lua5.2 expat && \
     rm -rf /src /opt/stxxl /usr/local/bin/stxxl_tool /usr/local/lib/libosrm*
 
 EXPOSE 5000

docs/developing.md

@@ -20,7 +20,7 @@ A guard (ScopedGeojsonLoggerGuard) requires a logging policy. Per default we pro
 
 The initialisation to do so looks like this:
 `util::ScopedGeojsonLoggerGuard<util::NodeIdVectorToLineString> geojson_guard( "debug.geojson", data-for-conversion);`
-Make sure to give the guar a name, so it actually gets a lifetime.
+Make sure to give the guard a name, so it actually gets a lifetime.
 
 The field `data-for-conversion` can be an arbitrary long set of features and needs to match the parameters used for constructing our policy (in this case `util::NodeIdVectorToLineString`).
 

docs/http.md

@@ -31,6 +31,7 @@ To pass parameters to each location some options support an array like encoding:
 |generate\_hints |`true` (default), `false`                               |Adds a Hint to the response which can be used in subsequent requests, see `hints` parameter.           |
 |hints           |`{hint};{hint}[;{hint} ...]`                            |Hint from previous request to derive position in street network.                                       |
 |approaches      |`{approach};{approach}[;{approach} ...]`                |Keep waypoints on curb side.                                                                           |
+|exclude         |`{class}[,{class}]`                                     |Additive list of classes to avoid, order does not matter.                                              |
 
 Where the elements follow the following format:
 
@@ -40,12 +41,13 @@ Where the elements follow the following format:
 |radius      |`double >= 0` or `unlimited` (default)                  |
 |hint        |Base64 `string`                                         |
 |approach    |`curb` or `unrestricted` (default)                      |
+|class       |A class name determined by the profile or `none`.       |
 
 ```
 {option}={element};{element}[;{element} ... ]
 ```
 
-The number of elements must match exactly the number of locations. If you don't want to pass a value but instead use the default you can pass an empty `element`.
+The number of elements must match exactly the number of locations (except for `generate_hints` and `exclude`). If you don't want to pass a value but instead use the default you can pass an empty `element`.
 
 Example: 2nd location use the default value for `option`:
 
@@ -59,6 +61,9 @@ Example: 2nd location use the default value for `option`:
 # Query on Berlin with three coordinates:
 curl 'http://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219?overview=false'
 
+# Query on Berlin excluding the usage of motorways:
+curl 'http://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.397634,52.529407?exclude=motorway'
+
 # Using polyline:
 curl 'http://router.project-osrm.org/route/v1/driving/polyline(ofp_Ik_vpAilAyu@te@g`E)?overview=false'
 ```
@@ -432,6 +437,8 @@ Vector tiles contain two layers:
 | `turn_angle` | `integer` | the angle of the turn, relative to the `bearing_in`.  -180 to +180, 0 = straight ahead, 90 = 90-degrees to the right |
 | `cost`       | `float`   | the time we think it takes to make that turn, in seconds.  May be negative, depending on how the data model is constructed (some turns get a "bonus"). |
 | `weight`     | `float`   | the weight we think it takes to make that turn.  May be negative, depending on how the data model is constructed (some turns get a "bonus"). ACTUAL ROUTING USES THIS VALUE |
+| `type`       | `string`  | the type of this turn - values like `turn`, `continue`, etc.  See the `StepManeuver` for a partial list, this field also exposes internal turn types that are never returned with an API response |
+| `modifier`   | `string`  | the direction modifier of the turn (`left`, `sharp left`, etc) |
 
 
 ## Result objects
@@ -661,6 +668,8 @@ step.
 | `rotary`         | a traffic circle. While very similar to a larger version of a roundabout, it does not necessarily follow roundabout rules for right of way. It can offer `rotary_name` and/or `rotary_pronunciation` parameters (located in the RouteStep object) in addition to the `exit` parameter (located on the StepManeuver object).  |
 | `roundabout turn`| Describes a turn at a small roundabout that should be treated as normal turn. The `modifier` indicates the turn direciton. Example instruction: `At the roundabout turn left`. |
 | `notification`   | not an actual turn but a change in the driving conditions. For example the travel mode or classes. If the road takes a turn itself, the `modifier` describes the direction |
+| `exit roundabout`| Describes a maneuver exiting a roundabout (usually preceeded by a `roundabout` instruction) |
+| `exit rotary`    | Describes the maneuver exiting a rotary (large named roundabout) |
 
   Please note that even though there are `new name` and `notification` instructions, the `mode` and `name` can change
   between all instructions. They only offer a fallback in case nothing else is to report.

docs/nodejs/api.md

@@ -27,11 +27,11 @@ var osrm = new OSRM('network.osrm');
                This requires you to run `osrm-datastore` prior to creating an `OSRM` object.
     -   `options.path` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** The path to the `.osrm` files. This is mutually exclusive with setting {options.shared_memory} to true.
     -   `options.max_locations_trip` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in trip query (default: unlimited).
-    -   `options.max_locations_viaroute` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in viaroute query 9default: unlimited).
+    -   `options.max_locations_viaroute` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in viaroute query (default: unlimited).
     -   `options.max_locations_distance_table` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in distance table query (default: unlimited).
-    -   `options.max_locations_map_matching` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in map matching query (default: unlimited).
+    -   `options.max_locations_map_matching` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. locations supported in map-matching query (default: unlimited).
     -   `options.max_results_nearest` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. results supported in nearest query (default: unlimited).
-    -   `options.max_alternatives` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max. number of alternative routes supported (default: 3).
+    -   `options.max_alternatives` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Max.number of alternatives supported in alternative routes query (default: 3).
 
 ### route
 
@@ -45,15 +45,16 @@ Returns the fastest route between two or more coordinates while visiting the way
                                           Can be `null` or an array of `[{value},{range}]` with `integer 0 .. 360,integer 0 .. 180`.
     -   `options.radiuses` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the coordinate snapping to streets in the given radius in meters. Can be `null` (unlimited, default) or `double >= 0`.
     -   `options.hints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
-    -   `options.alternatives` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Search for alternative routes and return as well.
-        _Please note that even if an alternative route is requested, a result cannot be guaranteed._ (optional, default `false`)
-    -   `options.steps` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Returned route steps for each route leg. (optional, default `false`)
+    -   `options.alternatives` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Search for alternative routes. (optional, default `false`)
+    -   `options.alternatives` **[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)** Search for up to this many alternative routes.
+        _Please note that even if alternative routes are requested, a result cannot be guaranteed._ (optional, default `0`)
+    -   `options.steps` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route steps for each route leg. (optional, default `false`)
     -   `options.annotations` **([Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array) \| [Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean))** An array with strings of `duration`, `nodes`, `distance`, `weight`, `datasources`, `speed` or boolean for enabling/disabling all. (optional, default `false`)
     -   `options.geometries` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route geometry format (influences overview and per step). Can also be `geojson`. (optional, default `polyline`)
     -   `options.overview` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Add overview geometry either `full`, `simplified` according to highest zoom level it could be display on, or not at all (`false`). (optional, default `simplified`)
     -   `options.continue_straight` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Forces the route to keep going straight at waypoints and don't do a uturn even if it would be faster. Default value depends on the profile.
-                         `null`/`true`/`false`
     -   `options.approaches` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
+                         `null`/`true`/`false`
 -   `callback` **[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)** 
 
 **Examples**
@@ -194,14 +195,14 @@ if they can not be matched successfully.
     -   `options.bearings` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
                                           Can be `null` or an array of `[{value},{range}]` with `integer 0 .. 360,integer 0 .. 180`.
     -   `options.hints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
-    -   `options.steps` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Returned route steps for each route. (optional, default `false`)
+    -   `options.steps` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route steps for each route. (optional, default `false`)
     -   `options.annotations` **([Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array) \| [Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean))** An array with strings of `duration`, `nodes`, `distance`, `weight`, `datasources`, `speed` or boolean for enabling/disabling all. (optional, default `false`)
     -   `options.geometries` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route geometry format (influences overview and per step). Can also be `geojson`. (optional, default `polyline`)
     -   `options.overview` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Add overview geometry either `full`, `simplified` according to highest zoom level it could be display on, or not at all (`false`). (optional, default `simplified`)
     -   `options.timestamps` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)<[Number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)>?** Timestamp of the input location (integers, UNIX-like timestamp).
     -   `options.radiuses` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Standard deviation of GPS precision used for map matching. If applicable use GPS accuracy. Can be `null` for default value `5` meters or `double >= 0`.
-    -   `options.gaps` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Allows the input track splitting based on huge timestamp gaps between points. Either `split` or `ignore`. (optional, default `split`)
-    -   `options.tidy` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Allows the input track modification to obtain better matching quality for noisy tracks. (optional, default `false`)
+    -   `options.gaps` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** Allows the input track splitting based on huge timestamp gaps between points. Either `split` or `ignore` (optional, default `split`).
+    -   `options.tidy` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Allows the input track modification to obtain better matching quality for noisy tracks (optional, default `false`).
 -   `callback` **[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)** 
 
 **Examples**
@@ -235,25 +236,7 @@ The trip plugin solves the Traveling Salesman Problem using a greedy heuristic
 waypoints. The returned path does not have to be the shortest path, _ as TSP is NP-hard it is
 only an approximation.
 
-**Parameters**
-
--   `options` **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the trip query.
-    -   `options.coordinates` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
-    -   `options.bearings` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
-                                          Can be `null` or an array of `[{value},{range}]` with `integer 0 .. 360,integer 0 .. 180`.
-    -   `options.radiuses` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the coordinate snapping to streets in the given radius in meters. Can be `double >= 0` or `null` (unlimited, default).
-    -   `options.hints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
-    -   `options.steps` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Returned route steps for each route. (optional, default `false`)
-    -   `options.annotations` **([Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array) \| [Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean))** An array with strings of `duration`, `nodes`, `distance`, `weight`, `datasources`, `speed` or boolean for enabling/disabling all. (optional, default `false`)
-    -   `options.geometries` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route geometry format (influences overview and per step). Can also be `geojson`. (optional, default `polyline`)
-    -   `options.overview` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Add overview geometry either `full`, `simplified` (optional, default `simplified`)
-    -   `options.roundtrip` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Returned route is a roundtrip (route returns to first location). (optional, default `true`)
-    -   `options.source` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route starts at `any` or `first` coordinate. (optional, default `any`)
-    -   `options.destination` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route ends at `any` or `last` coordinate. (optional, default `any`)
-    -   `options.approaches` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
--   `callback` **[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)** 
-
-A requirement for computing trips is that all input coordinates are connected.
+Note that all input coordinates have to be connected for the trip service to work.
 Currently, not all combinations of `roundtrip`, `source` and `destination` are supported.
 Right now, the following combinations are possible:
 
@@ -268,6 +251,24 @@ Right now, the following combinations are possible:
 | false     | any    | last        | no        |
 | false     | any    | any         | no        |
 
+**Parameters**
+
+-   `options` **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)** Object literal containing parameters for the trip query.
+    -   `options.coordinates` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** The coordinates this request will use, coordinates as `[{lon},{lat}]` values, in decimal degrees.
+    -   `options.bearings` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the search to segments with given bearing in degrees towards true north in clockwise direction.
+                                          Can be `null` or an array of `[{value},{range}]` with `integer 0 .. 360,integer 0 .. 180`.
+    -   `options.radiuses` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Limits the coordinate snapping to streets in the given radius in meters. Can be `double >= 0` or `null` (unlimited, default).
+    -   `options.hints` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Hints for the coordinate snapping. Array of base64 encoded strings.
+    -   `options.steps` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route steps for each route. (optional, default `false`)
+    -   `options.annotations` **([Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array) \| [Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean))** An array with strings of `duration`, `nodes`, `distance`, `weight`, `datasources`, `speed` or boolean for enabling/disabling all. (optional, default `false`)
+    -   `options.geometries` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Returned route geometry format (influences overview and per step). Can also be `geojson`. (optional, default `polyline`)
+    -   `options.overview` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Add overview geometry either `full`, `simplified` (optional, default `simplified`)
+    -   `options.roundtrip` **[Boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)** Return route is a roundtrip. (optional, default `true`)
+    -   `options.source` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Return route starts at `any` or `first` coordinate. (optional, default `any`)
+    -   `options.destination` **[String](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)** Return route ends at `any` or `last` coordinate. (optional, default `any`)
+    -   `options.approaches` **[Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array)?** Keep waypoints on curb side. Can be `null` (unrestricted, default) or `curb`.
+-   `callback` **[Function](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/function)** 
+
 **Examples**
 
 ```javascript

docs/profiles.md

@@ -47,7 +47,7 @@ Profiles can also define a `process_segment` function to handle differences in s
 
 At the end of the file, a table if returned with references to the setup and processing functions the profile has defined.
 
-## Understanding speed, weight and rate 
+## Understanding speed, weight and rate
 When computing a route from A to B there can be different measure of what is the best route. That's why there's a need for different profiles.
 
 Because speeds very on different types of roads, the shortest and the fastest route are typically different. But there are many other possible preferences. For example a user might prefer a bicycle route that follow parks or other green areas, even though both duration and distance are a bit longer.
@@ -91,7 +91,7 @@ The `setup` function is called once when the profile is loaded and must return a
 
 Note that processing of data is parallelized and several unconnected LUA interpreters will be running at the same time. The `setup` function will be called once for each. Each LUA iinterpreter will have it's own set of globals.
 
-The following global properties can be set under `properties` in the hash you return in the `setup` function: 
+The following global properties can be set under `properties` in the hash you return in the `setup` function:
 
 Attribute                            | Type     | Notes
 -------------------------------------|----------|----------------------------------------------------------------------------
@@ -104,7 +104,17 @@ max_speed_for_map_matching           | Float    | Maximum vehicle speed to be as
 max_turn_weight                      | Float    | Maximum turn penalty weight
 force_split_edges                    | Boolean  | True value forces a split of forward and backward edges of extracted ways and guarantees that `process_segment` will be called for all segments (default `false`)
 
-### process_node(profile, node, result)
+The following additional global properties can be set in the hash you return in the `setup` function:
+
+Attribute                            | Type             | Notes
+-------------------------------------|------------------|----------------------------------------------------------------------------
+excludable                           | Sequence of Sets | Determines which class-combinations are supported by the `exclude` option at query time.
+                                     |                  | E.g. `Sequence{Set{"ferry", "motorway"}, Set{"motorway"}}` will allow you to exclude ferries and motorways, or only motorways.
+classes                              | Sequence         | Determines the allowed classes that can be referenced using `{forward,backward}_classes` on the way in the `process_way` function.
+restrictions                         | Sequence         | Determines which turn restrictions will be used for this profile.
+suffix_list                          | Set              | List of name suffixes needed for determining if "Highway 101 NW" the same road as "Highway 101 ES".
+
+### process_node(profile, node, result, relations)
 Process an OSM node to determine whether this node is a barrier or can be passed and whether passing it incurs a delay.
 
 Argument | Description
@@ -112,6 +122,7 @@ Argument | Description
 profile  | The configuration table you returned in `setup`.
 node     | The input node to process (read-only).
 result   | The output that you will modify.
+relations| The list of relation attributes passed from `process_relation` function for this node.
 
 The following attributes can be set on `result`:
 
@@ -120,7 +131,7 @@ Attribute       | Type    | Notes
 barrier         | Boolean | Is it an impassable barrier?
 traffic_lights  | Boolean | Is it a traffic light (incurs delay in `process_turn`)?
 
-## process_way(profile, way, result)
+### process_way(profile, way, result, relations)
 Given an OpenStreetMap way, the `process_way` function will either return nothing (meaning we are not going to route over this way at all), or it will set up a result hash.
 
 Argument | Description
@@ -128,6 +139,7 @@ Argument | Description
 profile  | The configuration table you returned in `setup`.
 node     | The input way to process (read-only).
 result   | The output that you will modify.
+relations| The list of relation attributes passed from `process_relation` function for this way.
 
 Importantly it will set `result.forward_mode` and `result.backward_mode` to indicate the travel mode in each direction, as well as set `result.forward_speed` and `result.backward_speed` to integer values representing the speed for traversing the way.
 
@@ -167,10 +179,60 @@ road_classification.road_priority_class | Enum     | Guidance: order in priority
 road_classification.may_be_ignored      | Boolean  | Guidance: way is non-highway
 road_classification.num_lanes           | Unsigned | Guidance: total number of lanes in way
 
-### process_segment(profile, segment)
-The `process_segment` function is called for every segment of OSM ways. A segment is a straight line between two OSM nodes. 
+### process_relation(profile, relation, result)
 
-On OpenStreetMap way cannot have different tags on different parts of a way. Instead you would split the way into several smaller ways. However many ways are long. For example, many ways pass hills without any change in tags. 
+Supported since API **version 3**.
+
+Given an OpenStreetMap relation, the `process_relation` function should setup values into result structure.
+
+Argument | Description
+---------|-------------------------------------------------------
+profile  | The configuration table you returned in `setup`.
+node     | The input relation to process (read-only).
+result   | The output that you will modify.
+
+Relation process work flow consist of next steps:
+1. Calls `process_relation` function for each relation. It should fill a `result` structure
+2. After that each data will be passed for each member of processed relation into `process_node` and `process_way` functions
+
+The following attributes can be set on that result in `process_relation`:
+
+Attribute                               | Type     | Notes
+----------------------------------------|----------|--------------------------------------------------------------------------
+is_restriction                          | Boolean  | Flag to determine if relation is a turn restriction
+
+Example processing code:
+```lua
+
+function process_way(profile, way, result, relations)
+  for _, r in ipairs(relations) do
+    for k, v in pairs(r) do
+      print('data_' .. k .. '_value_' .. v)
+    end
+  end
+  print ('process_way ' .. way:id() .. ' ' .. result.name)
+end
+
+function process_relation(profile, relation, result)
+  local t = relation:get_value_by_key("type")
+  if t == "route" then
+    for _, m in ipairs(relation:members()) do
+      if m:role == "north" then
+        result[m]['direction'] = 'north'
+        print('direction_north')
+      end
+    end
+
+    print('route_relation')
+  end
+end
+```
+
+
+### process_segment(profile, segment)
+The `process_segment` function is called for every segment of OSM ways. A segment is a straight line between two OSM nodes.
+
+On OpenStreetMap way cannot have different tags on different parts of a way. Instead you would split the way into several smaller ways. However many ways are long. For example, many ways pass hills without any change in tags.
 
 Processing each segment of an OSM way makes it possible to have different speeds on different parts of a way based on external data like data about elevation, pollution, noise or scenic value and adjust weight and duration of the segment.
 
@@ -255,7 +317,7 @@ Example:
 function process_segment (profile, segment)
   local sourceData = raster:query(profile.raster_source, segment.source.lon, segment.source.lat)
   local targetData = raster:query(profile.raster_source, segment.target.lon, segment.target.lat)
-  
+
   local invalid = sourceData.invalid_data()
   if sourceData.datum ~= invalid and targetData.datum ~= invalid then
       -- use values to adjust weight and duration
@@ -272,4 +334,4 @@ durationIsValid
 parseDuration
 trimLaneString
 applyAccessTokens
-canonicalizeStringList
+canonicalizeStringList

docs/releasing.md

@@ -47,10 +47,10 @@ We may introduce forward-compatible changes: query parameters and response prope
 4. Make sure the `package.json` is up to date.
 5. Make sure all tests are passing (e.g. Travis CI gives you a :thumbs_up:)
 6. Use an annotated tag to mark the release: `git tag vx.y.z -a` Body of the tag description should be the changelog entries.
-7. Use `npm run build-api-docs` to generate the API documentation.  Copy `build/docs/*` to `https://github.com/Project-OSRM/project-osrm.github.com` in the `docs/vN.N.N/api` directory
+7. Use `npm run docs` to generate the API documentation.  Copy `build/docs/*` to `https://github.com/Project-OSRM/project-osrm.github.com` in the `docs/vN.N.N/api` directory
 8. Push tags and commits: `git push; git push --tags`
 9. If not a release-candidate: Write a mailing-list post to osrm-talk@openstreetmap.org to announce the release
 10. Wait until the travis build has been completed and check if the node binaries were published by doing:
     `rm -rf node_modules && npm install` locally.
 11. For final releases run `npm publish` or `npm publish --tag next` for release candidates.
-
+12. Bump version in `package.json` to `{MAJOR}.{MINOR+1}.0-latest.1` on the `master` branch after the release.

features/bicycle/bridge.feature

@@ -21,13 +21,6 @@ Feature: Bicycle - Handle cycling
         When I route I should get
             | from | to | route           | modes                           |
             | a    | g  | abc,cde,efg,efg | cycling,cycling,cycling,cycling |
-            | b    | f  | abc,cde,efg,efg | cycling,cycling,cycling,cycling |
-            | e    | c  | cde,cde         | cycling,cycling                 |
-            | e    | b  | cde,abc,abc     | cycling,cycling,cycling         |
-            | e    | a  | cde,abc,abc     | cycling,cycling,cycling         |
-            | c    | e  | cde,cde         | cycling,cycling                 |
-            | c    | f  | cde,efg,efg     | cycling,cycling,cycling         |
-            | c    | g  | cde,efg,efg     | cycling,cycling,cycling         |
 
     Scenario: Bicycle - Properly handle durations
         Given the node map

features/bicycle/destination.feature

@@ -21,15 +21,15 @@ Feature: Bike - Destination only, no passing through
             | axye  |             |
 
         When I route I should get
-            | from | to | route      |
-            | a    | b  | ab,ab      |
-            | a    | c  | ab,bcd,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,ab     |
+            | a    | c  | ab,bcd    |
+            | a    | d  | ab,bcd    |
+            | a    | e  | axye,axye |
+            | e    | d  | de,de     |
+            | e    | c  | de,bcd    |
+            | e    | b  | de,bcd    |
+            | e    | a  | axye,axye |
 
     Scenario: Bike - Destination only street
         Given the node map
@@ -49,15 +49,15 @@ Feature: Bike - Destination only, no passing through
             | axye  |             |
 
         When I route I should get
-            | from | to | route       |
-            | a    | b  | ab,ab       |
-            | a    | c  | ab,bc,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,ab     |
+            | a    | c  | ab,bc     |
+            | a    | d  | ab,bc,cd  |
+            | a    | e  | axye,axye |
+            | e    | d  | de,de     |
+            | e    | c  | de,cd,cd  |
+            | e    | b  | de,cd,bc  |
+            | e    | a  | axye,axye |
 
     Scenario: Bike - Routing inside a destination only area
         Given the node map
@@ -76,8 +76,8 @@ Feature: Bike - Destination only, no passing through
             | axye  |             |
 
         When I route I should get
-            | from | to | route          |
-            | a    | e  | ab,bc,cd,de,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       |

features/bicycle/distance.feature

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

features/bicycle/ferry.feature

@@ -21,12 +21,7 @@ Feature: Bike - Handle ferry routes
         When I route I should get
             | from | to | route           |
             | a    | g  | abc,cde,efg,efg |
-            | b    | f  | abc,cde,efg,efg |
-            | e    | c  | cde,cde         |
-            | e    | b  | cde,abc,abc     |
-            | e    | a  | cde,abc,abc     |
             | c    | e  | cde,cde         |
-            | c    | f  | cde,efg,efg     |
             | c    | g  | cde,efg,efg     |
 
     Scenario: Bike - Ferry duration, single node

features/bicycle/mode.feature

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

features/bicycle/ref.feature

@@ -1,47 +0,0 @@
-@routing @bicycle @ref @name
-Feature: Bike - Way ref
-
-    Background:
-        Given the profile "bicycle"
-
-    Scenario: Bike - Way with both name and ref
-        Given the node map
-            """
-            a b
-            """
-
-        And the ways
-            | nodes | name         | ref |
-            | ab    | Utopia Drive | E7  |
-
-        When I route I should get
-            | from | to | route                               | ref   |
-            | a    | b  | Utopia Drive,Utopia Drive           | E7,E7 |
-
-    Scenario: Bike - Way with only ref
-        Given the node map
-            """
-            a b
-            """
-
-        And the ways
-            | nodes | name | ref |
-            | ab    |      | E7  |
-
-        When I route I should get
-            | from | to | route | ref   |
-            | a    | b  | ,     | E7,E7 |
-
-    Scenario: Bike - Way with only name
-        Given the node map
-            """
-            a b
-            """
-
-        And the ways
-            | nodes | name         |
-            | ab    | Utopia Drive |
-
-        When I route I should get
-            | from | to | route                     |
-            | a    | b  | Utopia Drive,Utopia Drive |

features/bicycle/restrictions.feature

@@ -7,6 +7,8 @@ Feature: Bike - Turn restrictions
         Given the profile "bicycle"
         Given a grid size of 200 meters
 
+    # check to see if bicycle profiles handle relations. The code path is the same as in cars.
+    # If relations are passed, all variants tested in car also work for bike
     @no_turning
     Scenario: Bike - No left turn
         Given the node map
@@ -33,188 +35,7 @@ Feature: Bike - Turn restrictions
             | s    | n  | sj,nj,nj |
             | s    | e  | sj,ej,ej |
 
-    @no_turning
-    Scenario: Bike - No right turn
-        Given the node map
-            """
-              n
-            w j e
-              s
-            """
-
-        And the ways
-            | nodes | oneway | foot |
-            | sj    | yes    | no   |
-            | nj    | -1     | no   |
-            | wj    | -1     | no   |
-            | ej    | -1     | no   |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction   |
-            | restriction | sj       | ej     | j        | no_right_turn |
-
-        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
-
-    @no_turning
-    Scenario: Bike - No u-turn
-        Given the node map
-            """
-              n
-            w j e
-              s
-            """
-
-        And the ways
-            | nodes | oneway | foot |
-            | sj    | yes    | no   |
-            | nj    | -1     | no   |
-            | wj    | -1     | no   |
-            | ej    | -1     | no   |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction |
-            | restriction | sj       | wj     | j        | no_u_turn   |
-
-        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
-
-    @no_turning
-    Scenario: Bike - Handle any no_* relation
-        Given the node map
-            """
-              n
-            w j e
-              s
-            """
-
-        And the ways
-            | nodes | oneway | foot |
-            | sj    | yes    | no   |
-            | nj    | -1     | no   |
-            | wj    | -1     | no   |
-            | ej    | -1     | no   |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction      |
-            | restriction | sj       | wj     | j        | no_weird_zigzags |
-
-        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
-
-    @only_turning
-    Scenario: Bike - Only left turn
-        Given the node map
-            """
-              n
-            w j e
-              s
-            """
-
-        And the ways
-            | nodes | oneway | foot |
-            | sj    | yes    | no   |
-            | nj    | -1     | no   |
-            | wj    | -1     | no   |
-            | ej    | -1     | no   |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction    |
-            | restriction | sj       | wj     | j        | only_left_turn |
-
-        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
-
-    @only_turning
-    Scenario: Bike - Only right turn
-        Given the node map
-            """
-              n
-            w j e
-              s
-            """
-
-        And the ways
-            | nodes | oneway | foot |
-            | sj    | yes    | no   |
-            | nj    | -1     | no   |
-            | wj    | -1     | no   |
-            | ej    | -1     | no   |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction     |
-            | restriction | sj       | ej     | j        | only_right_turn |
-
-        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
-
-    @only_turning
-    Scenario: Bike - Only straight on
-        Given the node map
-            """
-              n
-            w j e
-              s
-            """
-
-        And the ways
-            | nodes | oneway | foot |
-            | sj    | yes    | no   |
-            | nj    | -1     | no   |
-            | wj    | -1     | no   |
-            | ej    | -1     | no   |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction      |
-            | restriction | sj       | nj     | j        | only_straight_on |
-
-        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
-
-    @no_turning
-    Scenario: Bike - Handle any only_* restriction
-        Given the node map
-            """
-              n
-            w j e
-              s
-            """
-
-        And the ways
-            | nodes | oneway | foot |
-            | sj    | yes    | no   |
-            | nj    | -1     | no   |
-            | wj    | -1     | no   |
-            | ej    | -1     | no   |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction        |
-            | restriction | sj       | nj     | j        | only_weird_zigzags |
-
-        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
-
+    ## exceptions are different for bike over car and need to be tested here
     @except
     Scenario: Bike - Except tag and on no_ restrictions
         Given the node map

features/car/bridge.feature

@@ -22,13 +22,7 @@ Feature: Car - Handle driving
         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         |
 
     Scenario: Car - Control test without durations, osrm uses movable bridge speed to calculate duration
         Given the node map
@@ -47,8 +41,6 @@ Feature: Car - Handle driving
         When I route I should get
             | from | to | route           | modes                           | speed   | time     |
             | a    | g  | abc,cde,efg,efg | driving,driving,driving,driving | 13 km/h | 340s +-1 |
-            | b    | f  | abc,cde,efg,efg | driving,driving,driving,driving | 9 km/h  | 318s +-1 |
-            | c    | e  | cde,cde         | driving,driving                 | 5 km/h  | 295s +-1 |
             | e    | c  | cde,cde         | driving,driving                 | 5 km/h  | 295s +-1 |
 
     Scenario: Car - Properly handle durations
@@ -68,6 +60,5 @@ Feature: Car - Handle driving
         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 |

features/car/classes.feature

@@ -122,6 +122,6 @@ Feature: Car - Mode flag
             | df    | yes    | motorway|            | yes      |
 
         When I route I should get
-            | from | to | route    | turns                           | classes                                   |
-            | a    | f  | ab,df,df | depart,roundabout-exit-2,arrive | [()],[(),(motorway),(toll,motorway)],[()] |
+            | from | to | route       | turns                                                        | classes                                     |
+            | a    | f  | ab,df,df,df | depart,roundabout-exit-2,exit roundabout slight right,arrive | [()],[(),(motorway)],[(toll,motorway)],[()] |
 

features/car/conditional_restrictions.feature

@@ -72,6 +72,75 @@ Feature: Car - Turn restrictions
             | n    | m  | nj,pjm,pjm |
             | s    | m  | js,pjm,pjm |
 
+    @no_turning @conditionals
+    Scenario: Car - Restriction With Compressed Geometry
+        Given the extract extra arguments "--parse-conditional-restrictions"
+                                            # time stamp for 10am on Tues, 02 May 2017 GMT
+        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
+        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
+
+        Given the node map
+            """
+            n
+            |
+            i
+            |
+            j-k-l-m
+            |
+            s
+            """
+
+        And the ways
+            | nodes |
+            | nij   |
+            | js    |
+            | jklm  |
+
+        And the relations
+            | type        | way:from | way:to | node:via | restriction:conditional             |
+            | restriction | nij      | jklm   | j        | no_left_turn @ (Mo-Fr 07:00-10:30)  |
+
+        When I route I should get
+            | from | to | route               |
+            | n    | m  | nij,js,js,jklm,jklm |
+
+    @no_turning @conditionals
+    Scenario: Car - Restriction With Compressed Geometry and Traffic Signal
+        Given the extract extra arguments "--parse-conditional-restrictions"
+                                            # time stamp for 10am on Tues, 02 May 2017 GMT
+        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
+        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493719200"
+
+        Given the node map
+            """
+            n
+            |
+            i
+            |
+            j-k-l-m
+            |
+            s
+            """
+
+        And the ways
+            | nodes |
+            | nij   |
+            | js    |
+            | jklm  |
+
+        And the nodes
+            | node | highway        |
+            | i    | traffic_signal |
+            | k    | traffic_signal |
+
+        And the relations
+            | type        | way:from | way:to | node:via | restriction:conditional             |
+            | restriction | nij      | jklm   | j        | no_left_turn @ (Mo-Fr 07:00-10:30)  |
+
+        When I route I should get
+            | from | to | route               |
+            | n    | m  | nij,js,js,jklm,jklm |
+
     @no_turning @conditionals
     Scenario: Car - ignores except restriction
         Given the extract extra arguments "--parse-conditional-restrictions"
@@ -530,6 +599,81 @@ Feature: Car - Turn restrictions
             | n    | p  | nj,js,js,jp,jp |
             | m    | p  | mj,jp,jp       |
 
+    @restriction-way
+    Scenario: Car - prohibit turn
+        Given the extract extra arguments "--parse-conditional-restrictions"
+        # 5pm Wed 02 May, 2017 GMT
+        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
+        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
+
+        Given the node map
+            """
+            c
+            |
+            |   f
+            |   |
+            b---e
+            |   |
+            a   d
+            """
+
+        And the ways
+            | nodes |
+            | ab    |
+            | bc    |
+            | be    |
+            | de    |
+            | ef    |
+
+        And the relations
+            | type        | way:from | way:via | way:to | restriction:conditional                         |
+            | restriction | ab       | be      | de     | no_right_turn @ (Mo-Fr 07:00-11:00,16:00-18:30) |
+
+        When I route I should get
+            | from | to | route             | turns                                                               | locations   |
+            | a    | d  | ab,be,ef,ef,de,de | depart,turn right,turn left,continue uturn,new name straight,arrive | a,b,e,f,e,d |
+            | a    | f  | ab,be,ef,ef       | depart,turn right,turn left,arrive                                  | a,b,e,f     |
+            | c    | d  | bc,be,de,de       | depart,turn left,turn right,arrive                                  | c,b,e,d     |
+            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |
+
+    # condition is off
+    @restriction-way
+    Scenario: Car - prohibit turn
+        Given the extract extra arguments "--parse-conditional-restrictions"
+        # time stamp for 12am on Tues, 02 May 2017 GMT
+        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493726400"
+        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493726400"
+
+        Given the node map
+            """
+            c
+            |
+            |   f
+            |   |
+            b---e
+            |   |
+            a   d
+            """
+
+        And the ways
+            | nodes |
+            | ab    |
+            | bc    |
+            | be    |
+            | de    |
+            | ef    |
+
+        And the relations
+            | type        | way:from | way:via | way:to | restriction:conditional                         |
+            | restriction | ab       | be      | de     | no_right_turn @ (Mo-Fr 07:00-11:00,16:00-18:30) |
+
+        When I route I should get
+            | from | to | route       |
+            | a    | d  | ab,be,de,de |
+            | a    | f  | ab,be,ef,ef |
+            | c    | d  | bc,be,de,de |
+            | c    | f  | bc,be,ef,ef |
+
     # https://www.openstreetmap.org/#map=18/38.91099/-77.00888
     @no_turning @conditionals
     Scenario: Car - DC North capitol situation, two on one off
@@ -739,3 +883,175 @@ Feature: Car - Turn restrictions
             | from | to | route                       | turns                                            |
             | a    | c  | albic,dobe,dobe,albic,albic | depart,turn left,continue uturn,turn left,arrive |
             | a    | e  | albic,dobe,dobe             | depart,turn left,arrive                          |
+
+    @no_turning @conditionals
+    Scenario: Car - Conditional restriction with multiple time windows
+        Given the extract extra arguments "--parse-conditional-restrictions"
+        # 5pm Wed 02 May, 2017 GMT
+        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
+        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
+
+        Given the node map
+            """
+            a   f
+            |   |
+            b - e - h
+            |   |   |
+            c   d - g
+                  1
+            """
+
+        And the ways
+            | nodes |
+            | ab    |
+            | bc    |
+            | de    |
+            | ef    |
+            | be    |
+            | eh    |
+            | gh    |
+            | dg    |
+
+        And the relations
+            | type        | way:from | way:via | way:to | restriction:conditional                    |
+            | restriction | ab       | be      | ef     | no_uturn @ (Mo-Fr 07:00-11:00,16:00-18:30) |
+
+        And the relations
+            | type        | way:from | way:to | node:via | restriction:conditional                    |
+            | restriction | ed       | dg     | d        | no_uturn @ (Mo-Fr 07:00-11:00,16:00-18:30) |
+
+        When I route I should get
+            | from | to | route             |
+            | a    | f  | ab,bc,bc,be,ef,ef |
+            | f    | 1  | ef,eh,gh,dg,dg    |
+
+    @restriction-way @overlap
+    Scenario: Car - prohibit turn
+        Given the extract extra arguments "--parse-conditional-restrictions"
+        # 5pm Wed 02 May, 2017 GMT
+        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
+        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
+
+        Given the node map
+            """
+            c
+            |
+            |   f
+            |   |
+            b---e
+            |   |
+            a   d
+            """
+
+        And the ways
+            | nodes |
+            | ab    |
+            | bc    |
+            | be    |
+            | de    |
+            | ef    |
+
+        And the relations
+            | type        | way:from | way:via | way:to | restriction:conditional             |
+            | restriction | ab       | be      | de     | no_right_turn @ (Mo-Fr 07:00-11:00) |
+
+        And the relations
+            | type        | way:from | way:via | way:to | restriction   |
+            | restriction | ab       | be      | de     | no_right_turn |
+
+        # condition is off, but the general restriction should take precedence
+        When I route I should get
+            | from | to | route             | turns                                                               | locations   |
+            | a    | d  | ab,be,ef,ef,de,de | depart,turn right,turn left,continue uturn,new name straight,arrive | a,b,e,f,e,d |
+            | a    | f  | ab,be,ef,ef       | depart,turn right,turn left,arrive                                  | a,b,e,f     |
+            | c    | d  | bc,be,de,de       | depart,turn left,turn right,arrive                                  | c,b,e,d     |
+            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |
+
+    @restriction-way @overlap
+    Scenario: Car - prohibit turn
+        Given the extract extra arguments "--parse-conditional-restrictions"
+        # 5pm Wed 02 May, 2017 GMT
+        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
+        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
+
+        Given the node map
+            """
+            c
+            |
+            |   f
+            |   |
+            b---e
+            |   |
+            |   d
+            |
+            a
+            """
+
+        And the ways
+            | nodes |
+            | ab    |
+            | bc    |
+            | be    |
+            | de    |
+            | ef    |
+
+        And the relations
+            | type        | way:from | way:via | way:to | restriction:conditional             |
+            | restriction | ab       | be      | de     | no_right_turn @ (Mo-Fr 07:00-11:00) |
+
+        And the relations
+            | type        | way:from | node:via | way:to | restriction:conditional             |
+            | restriction | be       | e        | de     | no_right_turn @ (Mo-Fr 16:00-18:00) |
+
+        # way restriction is off, node-restriction is on
+        When I route I should get
+            | from | to | route             | turns                                                               | locations   |
+            | a    | d  | ab,be,ef,ef,de,de | depart,turn right,turn left,continue uturn,new name straight,arrive | a,b,e,f,e,d |
+            | a    | f  | ab,be,ef,ef       | depart,turn right,turn left,arrive                                  | a,b,e,f     |
+            | c    | d  | bc,be,ef,ef,de,de | depart,turn left,turn left,continue uturn,new name straight,arrive  | c,b,e,f,e,d |
+            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |
+
+    @restriction-way @overlap
+    Scenario: Car - prohibit turn
+        Given the extract extra arguments "--parse-conditional-restrictions"
+        # 5pm Wed 02 May, 2017 GMT
+        Given the contract extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
+        Given the customize extra arguments "--time-zone-file=test/data/tz/{timezone_names}/guinea.geojson --parse-conditionals-from-now=1493744400"
+
+        Given the node map
+            """
+            c
+            |
+            |   f
+            |   |
+            b---e
+            |   |
+            |   d
+            |
+            a
+            """
+
+        And the ways
+            | nodes |
+            | ab    |
+            | bc    |
+            | be    |
+            | de    |
+            | ef    |
+
+        And the relations
+            | type        | way:from | way:via | way:to | restriction:conditional             |
+            | restriction | ab       | be      | de     | no_right_turn @ (Mo-Fr 16:00-18:00) |
+
+        And the relations
+            | type        | way:from | node:via | way:to | restriction:conditional             |
+            | restriction | be       | e        | de     | no_right_turn @ (Mo-Fr 07:00-11:00) |
+
+        # node restrictino is off, way restriction is on
+        When I route I should get
+            | from | to | route             | turns                                                               | locations   |
+            | a    | d  | ab,be,ef,ef,de,de | depart,turn right,turn left,continue uturn,new name straight,arrive | a,b,e,f,e,d |
+            | a    | f  | ab,be,ef,ef       | depart,turn right,turn left,arrive                                  | a,b,e,f     |
+            | c    | d  | bc,be,de,de       | depart,turn left,turn right,arrive                                  | c,b,e,d     |
+            | c    | f  | bc,be,ef,ef       | depart,turn left,turn left,arrive                                   | c,b,e,f     |
+

features/car/ferry.feature

@@ -50,6 +50,7 @@ Feature: Car - Handle ferry routes
             | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 9 km/h  | 162.4s  |
             | c    | e  | cde,cde         | ferry,ferry                   | 5 km/h  | 151.4s  |
             | e    | c  | cde,cde         | ferry,ferry                   | 5 km/h  | 151.4s  |
+
     Scenario: Car - Properly handle simple durations
         Given the node map
             """
@@ -91,3 +92,20 @@ Feature: Car - Handle ferry routes
             | b    | f  | abc,cde,efg,efg | driving,ferry,driving,driving | 18 km/h | 78.4s |
             | c    | e  | cde,cde         | ferry,ferry                   | 11 km/h | 67.4s |
             | e    | c  | cde,cde         | ferry,ferry                   | 11 km/h | 67.4s |
+
+	@snapping
+    Scenario: Car - Snapping when using a ferry
+        Given the node map
+            """
+            a b   c d   e f
+            """
+
+        And the ways
+            | nodes | highway | route | duration |
+            | ab    | primary |       |          |
+            | bcde  |         | ferry | 0:10     |
+            | ef    | primary |       |          |
+
+        When I route I should get
+            | from | to | route     | modes       | time  |
+            | c    | d  | bcde,bcde | ferry,ferry | 600s  |

features/car/mode.feature

@@ -1,44 +0,0 @@
-@routing @car @mode
-Feature: Car - Mode flag
-    Background:
-        Given the profile "car"
-
-    Scenario: Car - Mode when using a ferry
-        Given the node map
-            """
-            a b
-              c d
-            """
-
-        And the ways
-            | nodes | highway | route | duration |
-            | ab    | primary |       |          |
-            | bc    |         | ferry | 0:01     |
-            | cd    | primary |       |          |
-
-        When I route I should get
-            | from | to | route       | modes                         |
-            | a    | d  | ab,bc,cd,cd | driving,ferry,driving,driving |
-            | d    | a  | cd,bc,ab,ab | driving,ferry,driving,driving |
-            | c    | a  | bc,ab,ab    | ferry,driving,driving         |
-            | d    | b  | cd,bc,bc    | driving,ferry,ferry           |
-            | a    | c  | ab,bc,bc    | driving,ferry,ferry           |
-            | b    | d  | bc,cd,cd    | ferry,driving,driving         |
-
-    Scenario: Car - Snapping when using a ferry
-        Given the node map
-            """
-            a b   c d   e f
-            """
-
-        And the ways
-            | nodes | highway | route | duration |
-            | ab    | primary |       |          |
-            | bcde  |         | ferry | 0:10     |
-            | ef    | primary |       |          |
-
-        When I route I should get
-            | from | to | route     | modes       | time  |
-            | c    | d  | bcde,bcde | ferry,ferry | 600s  |
-
-

features/car/names.feature

@@ -5,22 +5,6 @@ Feature: Car - Street names in instructions
         Given the profile "car"
         Given a grid size of 5 meters
 
-    Scenario: Car - A named street
-        Given the node map
-            """
-            a b
-              c
-            """
-
-        And the ways
-            | nodes | name     | ref |
-            | ab    | My Way   |     |
-            | bc    | Your Way | A1  |
-
-        When I route I should get
-            | from | to | route           | ref  |
-            | a    | c  | My Way,Your Way | ,A1|
-
     Scenario: Car - A named street with pronunciation
         Given the node map
             """

features/car/restrictions.feature

@@ -954,11 +954,11 @@ Feature: Car - Turn restrictions
         # this case is currently not handling the via-way restrictions and we need support for looking across traffic signals.
         # It is mainly included to show limitations and to prove that we don't crash hard here
         When I route I should get
-            | from | to | route        |
-            | a    | d  | ab,bge,de,de |
-            | a    | f  | ab,bge,ef,ef |
-            | c    | d  | bc,bge,de,de |
-            | c    | f  | bc,bge,ef,ef |
+            | from | to | route              |
+            | a    | d  | ab,bge,ef,ef,de,de |
+            | a    | f  | ab,bge,ef,ef       |
+            | c    | d  | bc,bge,de,de       |
+            | c    | f  | bc,bge,de,de,ef,ef |
 
       # don't crash hard on invalid restrictions
       @restriction @invalid
@@ -991,3 +991,40 @@ Feature: Car - Turn restrictions
         When I route I should get
             | from | to | route       |
             | a    | f  | ab,be,ef,ef |
+
+
+    @restriction @overlap @geometry
+    Scenario: Duplicated restriction
+        Given the node map
+            """
+            c
+            |
+            |   f
+            |   |
+            b-g-e
+            |   |
+            |   d
+            |
+            a
+            """
+
+        And the ways
+            | nodes |
+            | ab    |
+            | bc    |
+            | bge   |
+            | de    |
+            | ef    |
+
+        And the relations
+            | type        | way:from | way:to | node:via | restriction  |
+            | restriction | bge      | ef     | e        | no_left_turn |
+
+        And the relations
+            | type        | way:from | way:via | way:to | restriction   |
+            | restriction | ab       | bge     | de     | no_right_turn |
+            | restriction | bc       | bge     | ef     | no_left_turn  |
+
+        When I route I should get
+            | from | to | route              |
+            | a    | d  | ab,bc,bc,bge,de,de |

features/car/side_bias.feature

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

features/car/traffic_light_penalties.feature

@@ -37,3 +37,57 @@ Feature: Car - Handle traffic lights
             | 3    | 4  |  13.1s | no turn with traffic light    |
             | g    | j  |  18.7s | turn with no traffic light    |
             | k    | n  |  20.7s | turn with traffic light       |
+
+
+    Scenario: Tarrif Signal Geometry
+        Given the query options
+            | overview   | full      |
+            | geometries | polyline  |
+
+        Given the node map
+            """
+            a - b - c
+            """
+
+        And the ways
+            | nodes | highway |
+            | abc   | primary |
+
+        And the nodes
+            | node | highway         |
+            | b    | traffic_signals |
+
+        When I route I should get
+            | from | to | route   | geometry       |
+            | a    | c  | abc,abc | _ibE_ibE?gJ?gJ |
+
+    @traffic
+    Scenario: Traffic update on the edge with a traffic signal
+        Given the node map
+            """
+            a - b - c
+            """
+
+        And the ways
+          | nodes | highway |
+          | abc   | primary |
+
+
+        And the nodes
+            | node | highway         |
+            | b    | traffic_signals |
+
+        And the contract extra arguments "--segment-speed-file {speeds_file}"
+        And the customize extra arguments "--segment-speed-file {speeds_file}"
+        And the speed file
+        """
+        1,2,65
+        2,1,65
+        """
+        And the query options
+          | annotations | datasources,nodes,speed,duration,weight |
+
+        When I route I should get
+          | from | to | route   | speed   | weights | time  | distances | a:datasources | a:nodes | a:speed | a:duration |  a:weight |
+          | a    | c  | abc,abc | 59 km/h | 24.2,0  | 24.2s | 399.9m,0m |           1:0 |  1:2:3  |   18:18 |  11.1:11.1 | 11.1:11.1 |
+          | c    | a  | abc,abc | 59 km/h | 24.2,0  | 24.2s | 399.9m,0m |           0:1 |  3:2:1  |   18:18 |  11.1:11.1 | 11.1:11.1 |

features/foot/distance.feature

@@ -0,0 +1,35 @@
+@routing @foot
+Feature: Foot - Use distance weight
+
+    Background:
+        Given a grid size of 200 meters
+
+    Scenario: Foot - Check distance weight
+        Given the profile file
+        """
+        local functions = require('foot')
+        functions.setup_testbot = functions.setup
+
+        functions.setup = function()
+          local profile = functions.setup_testbot()
+          profile.properties.weight_name = 'distance'
+          return profile
+        end
+
+        return functions
+        """
+
+        Given the node map
+            """
+            a-b-c
+            """
+
+
+        And the ways
+            | nodes | highway     |
+            | abc   | residential |
+
+        When I route I should get
+            | from | to | route   | weight | time | distance |
+            | a    | b  | abc,abc |    200 | 144s | 200m +-1 |
+            | a    | c  | abc,abc |    400 | 288s | 400m +-1 |

features/foot/ferry.feature

@@ -21,13 +21,7 @@ Feature: Foot - Handle ferry routes
         When I route I should get
             | from | to | route           | modes                         |
             | a    | g  | abc,cde,efg,efg | walking,ferry,walking,walking |
-            | b    | f  | abc,cde,efg,efg | walking,ferry,walking,walking |
-            | e    | c  | cde,cde         | ferry,ferry                   |
-            | e    | b  | cde,abc,abc     | ferry,walking,walking         |
             | e    | a  | cde,abc,abc     | ferry,walking,walking         |
-            | c    | e  | cde,cde         | ferry,ferry                   |
-            | c    | f  | cde,efg,efg     | ferry,walking,walking         |
-            | c    | g  | cde,efg,efg     | ferry,walking,walking         |
 
     Scenario: Foot - Ferry duration, single node
         Given the node map

features/foot/names.feature

@@ -14,25 +14,9 @@ Feature: Foot - Street names in instructions
 
         And the ways
             | nodes | name     | ref |
-            | ab    | My Way   | A6  |
-            | bc    | Your Way | B7  |
+            | ab    | My Way   |     |
+            | bc    |          | A7  |
 
         When I route I should get
-            | from | to | route                                   |
-            | a    | c  | My Way,Your Way,Your Way                |
-
-    @unnamed
-    Scenario: Foot - No longer use way type to describe unnamed ways, see #3231
-        Given the node map
-            """
-            a b c d
-            """
-
-        And the ways
-            | nodes | highway | name |
-            | ab    | footway |      |
-            | bcd   | track   |      |
-
-        When I route I should get
-            | from | to | route |
-            | a    | d  | ,     |
+            | from | to | route    | ref    |
+            | a    | c  | My Way,, | ,A7,A7 |

features/foot/ref.feature

@@ -1,47 +0,0 @@
-@routing @foot @ref @name
-Feature: Foot - Way ref
-
-    Background:
-        Given the profile "foot"
-
-    Scenario: Foot - Way with both name and ref
-        Given the node map
-            """
-            a b
-            """
-
-        And the ways
-            | nodes | name         | ref |
-            | ab    | Utopia Drive | E7  |
-
-        When I route I should get
-            | from | to | route                     | ref   |
-            | a    | b  | Utopia Drive,Utopia Drive | E7,E7 |
-
-    Scenario: Foot - Way with only ref
-        Given the node map
-            """
-            a b
-            """
-
-        And the ways
-            | nodes | name | ref |
-            | ab    |      | E7  |
-
-        When I route I should get
-            | from | to | route | ref   |
-            | a    | b  | ,     | E7,E7 |
-
-    Scenario: Foot - Way with only name
-        Given the node map
-            """
-            a b
-            """
-
-        And the ways
-            | nodes | name         |
-            | ab    | Utopia Drive |
-
-        When I route I should get
-            | from | to | route                     |
-            | a    | b  | Utopia Drive,Utopia Drive |

features/foot/restrictions.feature

@@ -32,84 +32,6 @@ Feature: Foot - Turn restrictions
             | s    | n  | sj,nj,nj |
             | s    | e  | sj,ej,ej |
 
-    @no_turning
-    Scenario: Foot - No right turn
-        Given the node map
-            """
-              n
-            w j e
-              s
-            """
-
-        And the ways
-            | nodes | oneway |
-            | sj    | yes    |
-            | nj    | -1     |
-            | wj    | -1     |
-            | ej    | -1     |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction   |
-            | restriction | sj       | ej     | j        | no_right_turn |
-
-        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
-
-    @no_turning
-    Scenario: Foot - No u-turn
-        Given the node map
-            """
-              n
-            w j e
-              s
-            """
-
-        And the ways
-            | nodes | oneway |
-            | sj    | yes    |
-            | nj    | -1     |
-            | wj    | -1     |
-            | ej    | -1     |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction |
-            | restriction | sj       | wj     | j        | no_u_turn   |
-
-        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
-
-    @no_turning
-    Scenario: Foot - Handle any no_* relation
-        Given the node map
-            """
-              n
-            w j e
-              s
-            """
-
-        And the ways
-            | nodes | oneway |
-            | sj    | yes    |
-            | nj    | -1     |
-            | wj    | -1     |
-            | ej    | -1     |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction      |
-            | restriction | sj       | wj     | j        | no_weird_zigzags |
-
-        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
-
     @only_turning
     Scenario: Foot - Only left turn
         Given the node map
@@ -136,84 +58,6 @@ Feature: Foot - Turn restrictions
             | s    | n  | sj,nj,nj |
             | s    | e  | sj,ej,ej |
 
-    @only_turning
-    Scenario: Foot - Only right turn
-        Given the node map
-            """
-              n
-            w j e
-              s
-            """
-
-        And the ways
-            | nodes | oneway |
-            | sj    | yes    |
-            | nj    | -1     |
-            | wj    | -1     |
-            | ej    | -1     |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction     |
-            | restriction | sj       | ej     | j        | only_right_turn |
-
-        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
-
-    @only_turning
-    Scenario: Foot - Only straight on
-        Given the node map
-            """
-              n
-            w j e
-              s
-            """
-
-        And the ways
-            | nodes | oneway |
-            | sj    | yes    |
-            | nj    | -1     |
-            | wj    | -1     |
-            | ej    | -1     |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction      |
-            | restriction | sj       | nj     | j        | only_straight_on |
-
-        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
-
-    @no_turning
-    Scenario: Foot - Handle any only_* restriction
-        Given the node map
-            """
-              n
-            w j e
-              s
-            """
-
-        And the ways
-            | nodes | oneway |
-            | sj    | yes    |
-            | nj    | -1     |
-            | wj    | -1     |
-            | ej    | -1     |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction        |
-            | restriction | sj       | nj     | j        | only_weird_zigzags |
-
-        When I route I should get
-            | from | to | route    |
-            | s    | w  | sj,wj,wj |
-            | s    | n  | sj,nj,nj |
-            | s    | e  | sj,ej,ej |
-
     @except
     Scenario: Foot - Except tag and on no_ restrictions
         Given the node map
@@ -246,30 +90,6 @@ Feature: Foot - Turn restrictions
             | s    | c  | sj,cj,cj |
             | s    | d  | sj,dj,dj |
 
-    @except
-    Scenario: Foot - Except tag and on only_ restrictions
-        Given the node map
-            """
-            a   b
-              j
-              s
-            """
-
-        And the ways
-            | nodes | oneway |
-            | sj    | yes    |
-            | aj    | no     |
-            | bj    | no     |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction      | except |
-            | restriction | sj       | aj     | j        | only_straight_on | foot   |
-
-        When I route I should get
-            | from | to | route    |
-            | s    | a  | sj,aj,aj |
-            | s    | b  | sj,bj,bj |
-
     @except
     Scenario: Foot - Multiple except tag values
         Given the node map

features/foot/roundabout.feature

@@ -1,10 +1,9 @@
-@routing @foot @roundabout @instruction
+@routing @foot @roundabout @instruction @todo
 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.
@@ -27,7 +26,7 @@ Feature: Roundabout Instructions
             | abcda | roundabout |
 
         When I route I should get
-            | from | to | route | turns                            |
+            | from | to | route | turns                           |
             | s    | t  | sa,tb | depart,roundabout-exit-1,arrive |
             | s    | u  | sa,uc | depart,roundabout-exit-2,arrive |
             | s    | v  | sa,vd | depart,roundabout-exit-3,arrive |

features/guidance/anticipate-lanes.feature

@@ -52,9 +52,9 @@ Feature: Turn Lane Guidance
             | dy    |                       |                     | YSt  |
 
        When I route I should get
-            | waypoints | route               | turns                                   | lanes                                                         |
-            | a,e       | MySt,MySt,MySt,MySt | depart,continue right,turn right,arrive | ,straight:false right:false right:true,left:false right:true, |
-            | e,a       | MySt,MySt,MySt,MySt | depart,continue left,turn left,arrive   | ,left:true left:false straight:false,left:true right:false,   |
+            | waypoints | route               | turns                                       | lanes                                                         |
+            | a,e       | MySt,MySt,MySt,MySt | depart,continue right,continue right,arrive | ,straight:false right:false right:true,left:false right:true, |
+            | e,a       | MySt,MySt,MySt,MySt | depart,continue left,continue left,arrive   | ,left:true left:false straight:false,left:true right:false,   |
 
     @anticipate
     Scenario: Anticipate Lane Change for quick same direction turns, changing between streets
@@ -553,8 +553,8 @@ Feature: Turn Lane Guidance
             | fy    |                            | primary |            |
 
         When I route I should get
-            | waypoints | route    | turns                           | lanes    |
-            | a,h       | ab,gh,gh | depart,roundabout-exit-5,arrive |  ,;;;;;, |
+            | waypoints | route       | turns                                                 | lanes    |
+            | a,h       | ab,gh,gh,gh | depart,roundabout-exit-5,exit roundabout right,arrive |  ,;;;;,, |
 
     @anticipate
     Scenario: No Lanes for Roundabouts, see #2626
@@ -569,16 +569,16 @@ Feature: Turn Lane Guidance
             | nodes | turn:lanes:forward         | highway | junction   | name       |
             | xb    | slight_right\|slight_right | primary |            | xb         |
             | dy    |                            | primary |            | dy         |
-            | ab    |                            | primary | roundabout | roundabout |
-            | bc    |                            | primary | roundabout | roundabout |
-            | cd    | left\|slight_right         | primary | roundabout | roundabout |
-            | da    |                            | primary | roundabout | roundabout |
+            | ab    |                            | primary | roundabout | rotary     |
+            | bc    |                            | primary | roundabout | rotary     |
+            | cd    | left\|slight_right         | primary | roundabout | rotary     |
+            | da    |                            | primary | roundabout | rotary     |
 
         When I route I should get
-            | waypoints | route                    | turns                                   | lanes |
-            | x,y       | xb,dy,dy                 | depart,roundabout-exit-1,arrive         | ,;,   |
-            | x,c       | xb,roundabout,roundabout | depart,roundabout-exit-undefined,arrive | ,,    |
-            | x,a       | xb,roundabout,roundabout | depart,roundabout-exit-undefined,arrive | ,;,   |
+            | waypoints | route            | turns                                         | lanes |
+            | x,y       | xb,dy,dy,dy      | depart,rotary-exit-1,exit rotary right,arrive | ,,,   |
+            | x,c       | xb,rotary,rotary | depart,rotary-exit-undefined,arrive           | ,,    |
+            | x,a       | xb,rotary,rotary | depart,rotary-exit-undefined,arrive           | ,;,   |
 
     @anticipate
     Scenario: No Lanes for Roundabouts, see #2626
@@ -614,8 +614,8 @@ Feature: Turn Lane Guidance
             | fy    |                            | primary |            |
 
         When I route I should get
-            | waypoints | route      | turns                           | lanes      |
-            | a,h       | ab,ch,ch   | depart,roundabout-exit-5,arrive | ,;;;;;,    |
+            | waypoints | route       | turns                                                | lanes      |
+            | a,h       | ab,ch,ch,ch | depart,roundabout-exit-5,exit roundabout left,arrive | ,;;;;,,    |
 
     @anticipate
     Scenario: No Lanes for Roundabouts, see #2626
@@ -635,16 +635,16 @@ Feature: Turn Lane Guidance
             | nodes | turn:lanes:forward         | highway | junction   | name       |
             | xb    | slight_right\|slight_right | primary |            | xb         |
             | dy    |                            | primary |            | dy         |
-            | ab    |                            | primary | roundabout | roundabout |
-            | bc    |                            | primary | roundabout | roundabout |
-            | cd    | left\|slight_right         | primary | roundabout | roundabout |
-            | da    |                            | primary | roundabout | roundabout |
+            | ab    |                            | primary | roundabout | rotary     |
+            | bc    |                            | primary | roundabout | rotary     |
+            | cd    | left\|slight_right         | primary | roundabout | rotary     |
+            | da    |                            | primary | roundabout | rotary     |
 
         When I route I should get
-            | waypoints | route                    | turns                                   | lanes |
-            | x,y       | xb,dy,dy                 | depart,roundabout-exit-1,arrive         | ,;,   |
-            | x,c       | xb,roundabout,roundabout | depart,roundabout-exit-undefined,arrive | ,,    |
-            | x,a       | xb,roundabout,roundabout | depart,roundabout-exit-undefined,arrive | ,;,   |
+            | waypoints | route            | turns                                         | lanes |
+            | x,y       | xb,dy,dy,dy      | depart,rotary-exit-1,exit rotary right,arrive | ,,,   |
+            | x,c       | xb,rotary,rotary | depart,rotary-exit-undefined,arrive           | ,,    |
+            | x,a       | xb,rotary,rotary | depart,rotary-exit-undefined,arrive           | ,;,   |
 
     @anticipate @todo @2032
     Scenario: No Lanes for Roundabouts, see #2626
@@ -780,8 +780,8 @@ Feature: Turn Lane Guidance
             | dy    |                                | YSt  |
 
        When I route I should get
-            | waypoints | route               | turns                                   | lanes                                                                        |
-            | a,e       | MySt,MySt,MySt,MySt | depart,continue right,turn right,arrive | ,straight:false straight:false right:false right:true,left:false right:true, |
+            | waypoints | route               | turns                                       | lanes                                                                        |
+            | a,e       | MySt,MySt,MySt,MySt | depart,continue right,continue right,arrive | ,straight:false straight:false right:false right:true,left:false right:true, |
 
     @anticipate
     Scenario: Don't Overdo It

features/guidance/circular.feature

@@ -1,5 +1,8 @@
 @routing  @guidance
-Feature: Rotary
+Feature: Circular
+
+    # Circular tags are treated just as rotaries. We can rely on the rotary tests for their handling on special cases.
+    # Here we only ensure that the `circular` tag is handled and assigned a rotary type
 
     Background:
         Given the profile "car"
@@ -24,259 +27,16 @@ Feature: Rotary
             | bgecb  | circular |
 
        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  | circular |
-
-       When I route I should get
-           | waypoints | route          | turns                              |
-           | a,c       | ab,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
-           | a,e       | ab,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
-           | a,g       | ab,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
-           | d,e       | cd,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
-           | d,g       | cd,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
-           | d,b       | cd,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
-           | f,g       | ef,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
-           | f,b       | ef,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
-           | f,c       | ef,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
-           | h,b       | gh,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
-           | h,c       | gh,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
-           | h,e       | gh,bcegb,bcegb | depart,bcegb-exit-undefined,arrive |
-
-    Scenario: Only Exit
-        Given the node map
-            """
-                a
-                b
-            d c   g h
-                e
-                f
-            """
-
-       And the ways
-            | nodes  | junction |
-            | ab     |          |
-            | cd     |          |
-            | ef     |          |
-            | gh     |          |
-            | bcegb  | circular |
-
-       When I route I should get
-           | waypoints | route       | turns                      |
-           | b,d       | bcegb,cd,cd | depart,bcegb-exit-1,arrive |
-           | b,f       | bcegb,ef,ef | depart,bcegb-exit-2,arrive |
-           | b,h       | bcegb,gh,gh | depart,bcegb-exit-3,arrive |
-           | c,f       | bcegb,ef,ef | depart,bcegb-exit-1,arrive |
-           | c,h       | bcegb,gh,gh | depart,bcegb-exit-2,arrive |
-           | c,a       | bcegb,ab,ab | depart,bcegb-exit-3,arrive |
-           | e,h       | bcegb,gh,gh | depart,bcegb-exit-1,arrive |
-           | e,a       | bcegb,ab,ab | depart,bcegb-exit-2,arrive |
-           | e,d       | bcegb,cd,cd | depart,bcegb-exit-3,arrive |
-           | g,a       | bcegb,ab,ab | depart,bcegb-exit-1,arrive |
-           | g,d       | bcegb,cd,cd | depart,bcegb-exit-2,arrive |
-           | g,f       | bcegb,ef,ef | depart,bcegb-exit-3,arrive |
-      #phantom node snapping can result in a full round-trip here, therefore we cannot test b->a and the other direct exits
-
-    Scenario: Drive Around
-        Given the node map
-            """
-                a
-                b
-            d c   g h
-                e
-                f
-            """
-
-       And the ways
-            | nodes  | junction   |
-            | ab     |            |
-            | cd     |            |
-            | ef     |            |
-            | gh     |            |
-            | bcegb  | circular   |
-
-       When I route I should get
-           | waypoints | route       | turns         |
-           | b,c       | bcegb,bcegb | depart,arrive |
-           | b,e       | bcegb,bcegb | depart,arrive |
-           | b,g       | bcegb,bcegb | depart,arrive |
-           | c,e       | bcegb,bcegb | depart,arrive |
-           | c,g       | bcegb,bcegb | depart,arrive |
-           | c,b       | bcegb,bcegb | depart,arrive |
-           | e,g       | bcegb,bcegb | depart,arrive |
-           | e,b       | bcegb,bcegb | depart,arrive |
-           | e,c       | bcegb,bcegb | depart,arrive |
-           | g,b       | bcegb,bcegb | depart,arrive |
-           | g,c       | bcegb,bcegb | depart,arrive |
-           | g,e       | bcegb,bcegb | depart,arrive |
-
-     #needs to be adjusted when name-discovery works for entrys
-     Scenario: Mixed Entry and Exit
-        Given the node map
-           """
-             c   a
-           j   b   f
-             k   e
-           l   h   d
-             g   i
-           """
-
-        And the ways
-           | nodes | junction | oneway |
-           | abc   |          | yes    |
-           | def   |          | yes    |
-           | ghi   |          | yes    |
-           | jkl   |          | yes    |
-           | bkheb | circular | yes    |
-
-        When I route I should get
-           | waypoints | route       | turns                       |
-           | a,c       | abc,abc,abc | depart,rotary-exit-1,arrive |
-           | a,l       | abc,jkl,jkl | depart,bkheb-exit-2,arrive  |
-           | a,i       | abc,ghi,ghi | depart,bkheb-exit-3,arrive  |
-           | a,f       | abc,def,def | depart,bkheb-exit-4,arrive  |
-           | d,f       | def,def,def | depart,rotary-exit-1,arrive |
-           | d,c       | def,abc,abc | depart,bkheb-exit-2,arrive  |
-           | d,l       | def,jkl,jkl | depart,bkheb-exit-3,arrive  |
-           | d,i       | def,ghi,ghi | depart,bkheb-exit-4,arrive  |
-           | g,i       | ghi,ghi,ghi | depart,rotary-exit-1,arrive |
-           | g,f       | ghi,def,def | depart,bkheb-exit-2,arrive  |
-           | g,c       | ghi,abc,abc | depart,bkheb-exit-3,arrive  |
-           | g,l       | ghi,jkl,jkl | depart,bkheb-exit-4,arrive  |
-           | j,l       | jkl,jkl,jkl | depart,rotary-exit-1,arrive |
-           | j,i       | jkl,ghi,ghi | depart,bkheb-exit-2,arrive  |
-           | j,f       | jkl,def,def | depart,bkheb-exit-3,arrive  |
-           | j,c       | jkl,abc,abc | depart,bkheb-exit-4,arrive  |
-
-       Scenario: Collinear in X,Y
-        Given the node map
-            """
-            a
-            b
-            c d f
-            e
-            """
-
-        And the ways
-            | nodes | junction |
-            | ab    |          |
-            | bcdb  | circular |
-            | ce    |          |
-            | df    |          |
-
-        When I route I should get
-            | waypoints | route    | turns                     |
-            | a,e       | ab,ce,ce | depart,bcdb-exit-1,arrive |
-            | a,f       | ab,df,df | depart,bcdb-exit-2,arrive |
-
-       Scenario: Collinear in X,Y
-        Given the node map
-            """
-            a
-            d
-            b c f
-            e
-            """
-
-        And the ways
-            | nodes | junction |
-            | ad    |          |
-            | bcdb  | circular |
-            | be    |          |
-            | cf    |          |
-
-        When I route I should get
-            | waypoints | route    | turns                     |
-            | a,e       | ad,be,be | depart,bcdb-exit-1,arrive |
-            | a,f       | ad,cf,cf | depart,bcdb-exit-2,arrive |
-
-       Scenario: Collinear in X,Y
-        Given the node map
-            """
-            a
-            c
-            d b f
-            e
-            """
-
-        And the ways
-            | nodes | junction |
-            | ac    |          |
-            | bcdb  | circular |
-            | de    |          |
-            | bf    |          |
-
-        When I route I should get
-            | waypoints | route    | turns                     |
-            | a,e       | ac,de,de | depart,bcdb-exit-1,arrive |
-            | a,f       | ac,bf,bf | depart,bcdb-exit-2,arrive |
-
-       Scenario: Collinear in X,Y
-        Given the node map
-            """
-            f
-            d c e
-              b
-              a
-            """
-
-        And the ways
-            | nodes | junction |
-            | ab    |          |
-            | bcdb  | circular |
-            | ce    |          |
-            | df    |          |
-
-        When I route I should get
-            | waypoints | route    | turns                     |
-            | a,e       | ab,ce,ce | depart,bcdb-exit-1,arrive |
-            | a,f       | ab,df,df | depart,bcdb-exit-2,arrive |
-
-       Scenario: Collinear in X,Y
-        Given the node map
-            """
-            f
-            d c e
-            b
-            a
-            """
-
-        And the ways
-            | nodes | junction |
-            | ab    |          |
-            | bcdb  | circular |
-            | ce    |            |
-            | df    |            |
-
-        When I route I should get
-            | waypoints | route    | turns                     |
-            | a,e       | ab,ce,ce | depart,bcdb-exit-1,arrive |
-            | a,f       | ab,df,df | depart,bcdb-exit-2,arrive |
+           | waypoints | route       | turns                                        |
+           | a,d       | ab,cd,cd,cd | depart,bgecb-exit-3,exit rotary right,arrive |
+           | a,f       | ab,ef,ef,ef | depart,bgecb-exit-2,exit rotary right,arrive |
+           | a,h       | ab,gh,gh,gh | depart,bgecb-exit-1,exit rotary right,arrive |
+           | d,f       | cd,ef,ef,ef | depart,bgecb-exit-3,exit rotary right,arrive |
+           | d,h       | cd,gh,gh,gh | depart,bgecb-exit-2,exit rotary right,arrive |
+           | d,a       | cd,ab,ab,ab | depart,bgecb-exit-1,exit rotary right,arrive |
+           | f,h       | ef,gh,gh,gh | depart,bgecb-exit-3,exit rotary right,arrive |
+           | f,a       | ef,ab,ab,ab | depart,bgecb-exit-2,exit rotary right,arrive |
+           | f,d       | ef,cd,cd,cd | depart,bgecb-exit-1,exit rotary right,arrive |
+           | h,a       | gh,ab,ab,ab | depart,bgecb-exit-3,exit rotary right,arrive |
+           | h,d       | gh,cd,cd,cd | depart,bgecb-exit-2,exit rotary right,arrive |
+           | h,f       | gh,ef,ef,ef | depart,bgecb-exit-1,exit rotary right,arrive |

features/guidance/collapse.feature

@@ -628,9 +628,9 @@ Feature: Collapse
             | cf    | secondary | bottom |
 
         When I route I should get
-            | waypoints | turns                                   | route               | locations |
-            | a,d       | depart,continue right,turn right,arrive | road,road,road,road | a,b,c,d   |
-            | d,a       | depart,continue left,turn left,arrive   | road,road,road,road | d,c,b,a   |
+            | waypoints | turns                                       | route               | locations |
+            | a,d       | depart,continue right,continue right,arrive | road,road,road,road | a,b,c,d   |
+            | d,a       | depart,continue left,continue left,arrive   | road,road,road,road | d,c,b,a   |
 
     Scenario: Forking before a turn
         Given the node map

features/guidance/continue.feature

@@ -136,3 +136,24 @@ Feature: Continue Instructions
           | a,d       | abcdefb,abcdefb,abcdefb | depart,continue right,arrive |
           # continuing right here, since the turn to the left is more expensive
           | a,e       | abcdefb,abcdefb,abcdefb | depart,continue right,arrive |
+
+    Scenario: End-Of-Road Continue
+        Given the node map
+            """
+            a - b - c
+                |
+                d - e
+                |
+                f
+            """
+
+        And the ways
+            | nodes | highway | name |
+            | abc   | primary | road |
+            | bdf   | primary | road |
+            | ed    | primary | turn |
+
+
+        When I route I should get
+            | waypoints | route               | turns                                  |
+            | e,a       | turn,road,road,road | depart,turn right,continue left,arrive |

features/guidance/dedicated-turn-roads.feature

@@ -863,8 +863,8 @@ Feature: Slipways and Dedicated Turn Lanes
             | af    | primary | sliproad | yes    |
 
        When I route I should get
-            | waypoints | route                         | turns                              | locations |
-            | s,g       | main,sliproad,another,another | depart,turn right,turn left,arrive | s,a,f,g   |
+            | waypoints | route                         | turns                                     | locations |
+            | s,g       | main,sliproad,another,another | depart,turn right,turn slight left,arrive | s,a,f,g   |
 
     @sliproads:
     Scenario: Throughabout-Sliproad
@@ -905,8 +905,8 @@ Feature: Slipways and Dedicated Turn Lanes
             | restriction | yb       | be     | b        | only_straight |
 
         When I route I should get
-            | waypoints | route            | turns                                            | locations |
-            | z,t       | through,,out,out | depart,off ramp slight right,round-exit-3,arrive | z,s,c,t   |
+            | waypoints | route                | turns                                                              | locations |
+            | z,t       | through,,out,out,out | depart,off ramp slight right,round-exit-3,exit rotary right,arrive | z,s,c,e,t |
 
     Scenario: Sliproad before a roundabout
         Given the node map
@@ -942,5 +942,57 @@ Feature: Slipways and Dedicated Turn Lanes
             | restriction | bc       | cd     | c        | only_straight |
 
         When I route I should get
-            | waypoints | route     | turns                                                 | locations |
-            | a,k       | road,,,   | depart,turn right,roundabout turn right exit-1,arrive | a,b,h,k   |
+            | waypoints | route    | turns                                                 | locations |
+            | a,k       | road,,,  | depart,turn right,roundabout turn right exit-1,arrive | a,b,h,k   |
+
+    @sliproads
+    Scenario: Sliproad with 4 roads at target
+        Given the node map
+            """
+                    d
+                    .
+            s . a . b  . c . t
+                 `  .   '
+                  ` .  '
+                   '.'
+                    e
+                    .
+                    f
+            """
+
+        And the ways
+            | nodes | highway      | name  | oneway |
+            | sabct | primary      | sabct |        |
+            | dbef  | primary      | dbef  |        |
+            | ae    | primary_link | ae    | yes    |
+            | ec    | primary_link | ec    | yes    |
+
+       When I route I should get
+            | waypoints | route            | turns                    | locations |
+            | s,f       | sabct,dbef,dbef  | depart,turn right,arrive | s,a,f     |
+            | f,t       | dbef,sabct,sabct | depart,turn right,arrive | f,e,t     |
+
+    @sliproads
+    Scenario: Sliproad and acute angle (50°) at the main intersection
+        Given the node map
+            """
+                          d
+                         /
+            s . a . .  b  . c
+                 `    /
+                  ' /
+                  e
+                 /
+                f
+            """
+
+        And the ways
+            | nodes | highway      | name  | oneway |
+            | sabc  | primary      | sabc  |        |
+            | dbef  | primary      | dbef  |        |
+            | ae    | primary_link | ae    | yes    |
+
+
+       When I route I should get
+            | waypoints | route          | turns                    | locations |
+            | s,f       | sabc,dbef,dbef | depart,turn right,arrive | s,a,f     |

features/guidance/divided-highways.feature

@@ -0,0 +1,102 @@
+@routing  @guidance
+Feature: Divided road entry
+
+    Background:
+        Given the profile "car"
+        Given a grid size of 5 meters
+
+    Scenario: Join on a divided road named after the main road
+        Given the node map
+            """
+            a-------b-----c
+                    |
+            d-------e-----f
+                    |
+                    |
+                    g
+            """
+
+        And the ways
+            | nodes  | name    | highway     | oneway |
+            | abc    | main st | residential | -1     |
+            | def    | main st | residential | yes    |
+            | be     | main st | residential |        |
+            | eg     | side st | residential |        |
+
+       When I route I should get
+            | waypoints | route                  | turns                   |
+            | g,a       | side st,main st,main st| depart,end of road left,arrive |
+
+
+    # Similar to previous one, but the joining way is tagged with the side-street name
+    Scenario: Join on a divided road, named after the side street
+        Given the node map
+            """
+            a-------b-----c
+                    |
+            d-------e-----f
+                    |
+                    |
+                    g
+            """
+
+        And the ways
+            | nodes  | name    | highway     | oneway |
+            | abc    | main st | residential | -1     |
+            | def    | main st | residential | yes    |
+            | beg    | side st | residential |        |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | g,a       | side st,main st,main st| depart,end of road left,arrive |
+
+
+    # Center join named after crossroad
+    Scenario: Crossing a divided road, named after side-street
+        Given the node map
+            """
+                    h
+                    |
+            a-------b-----c
+                    |
+            d-------e-----f
+                    |
+                    |
+                    g
+            """
+
+        And the ways
+            | nodes  | name    | highway     | oneway |
+            | abc    | main st | residential | -1     |
+            | def    | main st | residential | yes    |
+            | hbeg   | side st | residential |        |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | g,a       | side st,main st,main st| depart,turn left,arrive |
+
+    # Join named after divided road
+    Scenario: Crossing a divided road, named after main street
+        Given the node map
+            """
+                    h
+                    |
+            a-------b-----c
+                    |
+            d-------e-----f
+                    |
+                    |
+                    g
+            """
+
+        And the ways
+            | nodes  | name    | highway     | oneway |
+            | abc    | main st | residential | -1     |
+            | def    | main st | residential | yes    |
+            | be     | main st | residential |        |
+            | hb     | side st | residential |        |
+            | eg     | side st | residential |        |
+
+       When I route I should get
+            | waypoints | route    | turns                           |
+            | g,a       | side st,main st,main st| depart,turn left,arrive |

features/guidance/end-of-road.feature

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

features/guidance/intersections.feature

@@ -140,9 +140,9 @@ Feature: Intersections Data
 
         When I route I should get
             | waypoints | route          | intersections                                                                                                                 |
-            | e,f       | ea,fb,fb       | true:180;false:0 false:150 true:210,false:30 true:150 true:270;true:90                                                        |
-            | e,g       | ea,gc,gc       | true:180;false:0 false:150 true:210,false:30 true:150 true:270,true:30 true:180 false:330;true:0                              |
-            | e,h       | ea,hd,hd       | true:180;false:0 false:150 true:210,false:30 true:150 true:270,true:30 true:180 false:330,true:90 false:210 true:330;true:270 |
+            | e,f       | ea,fb,fb,fb    | true:180;false:0 false:150 true:210;false:30 true:150 true:270;true:90                                                        |
+            | e,g       | ea,gc,gc,gc    | true:180;false:0 false:150 true:210,false:30 true:150 true:270;true:30 true:180 false:330;true:0                              |
+            | e,h       | ea,hd,hd,hd    | true:180;false:0 false:150 true:210,false:30 true:150 true:270,true:30 true:180 false:330;true:90 false:210 true:330;true:270 |
             | e,2       | ea,abcda,abcda | true:180;false:0 false:150 true:210,false:30 true:150 true:270;true:327 +-1                                                   |
-            | 1,g       | abcda,gc,gc    | true:214;false:30 true:150 true:270,true:30 true:180 false:330;true:0                                                         |
+            | 1,g       | abcda,gc,gc    | true:214,false:30 true:150 true:270;true:30 true:180 false:330;true:0                                                         |
             | 1,3       | abcda,abcda    | true:214,false:30 true:150 true:270,true:30 true:180 false:330;true:214                                                       |

features/guidance/perception.feature

@@ -97,5 +97,7 @@ Feature: Simple Turns
             | ei    | left  | yes    |
 
         When I route I should get
-            | waypoints | route        | turns                    |
-            | g,a       | in,road,road | depart,fork right,arrive |
+            | waypoints | route          | turns                           |
+            | g,a       | in,road,road   | depart,fork slight right,arrive |
+            | g,h       | in,right,right | depart,fork straight,arrive     |
+            | g,i       | in,left,left   | depart,fork slight left,arrive  |

features/guidance/rotary-bike.feature

@@ -1,177 +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  |

features/guidance/rotary.feature

@@ -24,19 +24,19 @@ Feature: Rotary
             | 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 |
+           | waypoints | route       | turns                                        |
+           | a,d       | ab,cd,cd,cd | depart,bgecb-exit-3,exit rotary right,arrive |
+           | a,f       | ab,ef,ef,ef | depart,bgecb-exit-2,exit rotary right,arrive |
+           | a,h       | ab,gh,gh,gh | depart,bgecb-exit-1,exit rotary right,arrive |
+           | d,f       | cd,ef,ef,ef | depart,bgecb-exit-3,exit rotary right,arrive |
+           | d,h       | cd,gh,gh,gh | depart,bgecb-exit-2,exit rotary right,arrive |
+           | d,a       | cd,ab,ab,ab | depart,bgecb-exit-1,exit rotary right,arrive |
+           | f,h       | ef,gh,gh,gh | depart,bgecb-exit-3,exit rotary right,arrive |
+           | f,a       | ef,ab,ab,ab | depart,bgecb-exit-2,exit rotary right,arrive |
+           | f,d       | ef,cd,cd,cd | depart,bgecb-exit-1,exit rotary right,arrive |
+           | h,a       | gh,ab,ab,ab | depart,bgecb-exit-3,exit rotary right,arrive |
+           | h,d       | gh,cd,cd,cd | depart,bgecb-exit-2,exit rotary right,arrive |
+           | h,f       | gh,ef,ef,ef | depart,bgecb-exit-1,exit rotary right,arrive |
 
     Scenario: Only Enter
         Given the node map
@@ -90,19 +90,19 @@ Feature: Rotary
             | bcegb  | roundabout |
 
        When I route I should get
-           | waypoints | route       | turns                      |
-           | b,d       | bcegb,cd,cd | depart,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 |
+           | waypoints | route       | turns                           |
+           | b,d       | bcegb,cd,cd | depart,exit rotary right,arrive |
+           | b,f       | bcegb,ef,ef | depart,exit rotary right,arrive |
+           | b,h       | bcegb,gh,gh | depart,exit rotary right,arrive |
+           | c,f       | bcegb,ef,ef | depart,exit rotary right,arrive |
+           | c,h       | bcegb,gh,gh | depart,exit rotary right,arrive |
+           | c,a       | bcegb,ab,ab | depart,exit rotary right,arrive |
+           | e,h       | bcegb,gh,gh | depart,exit rotary right,arrive |
+           | e,a       | bcegb,ab,ab | depart,exit rotary right,arrive |
+           | e,d       | bcegb,cd,cd | depart,exit rotary right,arrive |
+           | g,a       | bcegb,ab,ab | depart,exit rotary right,arrive |
+           | g,d       | bcegb,cd,cd | depart,exit rotary right,arrive |
+           | g,f       | bcegb,ef,ef | depart,exit rotary right,arrive |
       #phantom node snapping can result in a full round-trip here, therefore we cannot test b->a and the other direct exits
 
     Scenario: Drive Around
@@ -158,23 +158,23 @@ Feature: Rotary
            | bkheb | roundabout | yes    |
 
         When I route I should get
-           | waypoints | route       | turns                       |
-           | a,c       | abc,abc,abc | depart,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  |
+           | waypoints | route           | turns                                           |
+           | a,c       | abc,abc,abc     | depart,exit rotary right,arrive                 |
+           | a,l       | abc,jkl,jkl,jkl | depart,bkheb-exit-2,exit rotary straight,arrive |
+           | a,i       | abc,ghi,ghi,ghi | depart,bkheb-exit-3,exit rotary straight,arrive |
+           | a,f       | abc,def,def,def | depart,bkheb-exit-4,exit rotary straight,arrive |
+           | d,f       | def,def,def     | depart,exit rotary right,arrive                 |
+           | d,c       | def,abc,abc,abc | depart,bkheb-exit-2,exit rotary straight,arrive |
+           | d,l       | def,jkl,jkl,jkl | depart,bkheb-exit-3,exit rotary straight,arrive |
+           | d,i       | def,ghi,ghi,ghi | depart,bkheb-exit-4,exit rotary straight,arrive |
+           | g,i       | ghi,ghi,ghi     | depart,exit rotary right,arrive                 |
+           | g,f       | ghi,def,def,def | depart,bkheb-exit-2,exit rotary straight,arrive |
+           | g,c       | ghi,abc,abc,abc | depart,bkheb-exit-3,exit rotary straight,arrive |
+           | g,l       | ghi,jkl,jkl,jkl | depart,bkheb-exit-4,exit rotary straight,arrive |
+           | j,l       | jkl,jkl,jkl     | depart,exit rotary right,arrive                 |
+           | j,i       | jkl,ghi,ghi,ghi | depart,bkheb-exit-2,exit rotary straight,arrive |
+           | j,f       | jkl,def,def,def | depart,bkheb-exit-3,exit rotary straight,arrive |
+           | j,c       | jkl,abc,abc,abc | depart,bkheb-exit-4,exit rotary straight,arrive |
 
        Scenario: Collinear in X,Y
         Given the node map
@@ -193,9 +193,9 @@ Feature: Rotary
             | df    |            |
 
         When I route I should get
-            | waypoints | route    | turns                     |
-            | a,e       | ab,ce,ce | depart,bcdb-exit-1,arrive |
-            | a,f       | ab,df,df | depart,bcdb-exit-2,arrive |
+            | waypoints | route       | turns                                          |
+            | a,e       | ab,ce,ce,ce | depart,bcdb-exit-1,exit rotary straight,arrive |
+            | a,f       | ab,df,df,df | depart,bcdb-exit-2,exit rotary straight,arrive |
 
        Scenario: Collinear in X,Y
         Given the node map
@@ -214,9 +214,9 @@ Feature: Rotary
             | cf    |            |
 
         When I route I should get
-            | waypoints | route    | turns                     |
-            | a,e       | ad,be,be | depart,bcdb-exit-1,arrive |
-            | a,f       | ad,cf,cf | depart,bcdb-exit-2,arrive |
+            | waypoints | route       | turns                                          |
+            | a,e       | ad,be,be,be | depart,bcdb-exit-1,exit rotary straight,arrive |
+            | a,f       | ad,cf,cf,cf | depart,bcdb-exit-2,exit rotary straight,arrive |
 
        Scenario: Collinear in X,Y
         Given the node map
@@ -235,9 +235,9 @@ Feature: Rotary
             | bf    |            |
 
         When I route I should get
-            | waypoints | route    | turns                     |
-            | a,e       | ac,de,de | depart,bcdb-exit-1,arrive |
-            | a,f       | ac,bf,bf | depart,bcdb-exit-2,arrive |
+            | waypoints | route       | turns                                          |
+            | a,e       | ac,de,de,de | depart,bcdb-exit-1,exit rotary straight,arrive |
+            | a,f       | ac,bf,bf,bf | depart,bcdb-exit-2,exit rotary straight,arrive |
 
        Scenario: Collinear in X,Y
         Given the node map
@@ -256,9 +256,9 @@ Feature: Rotary
             | df    |            |
 
         When I route I should get
-            | waypoints | route    | turns                     |
-            | a,e       | ab,ce,ce | depart,bcdb-exit-1,arrive |
-            | a,f       | ab,df,df | depart,bcdb-exit-2,arrive |
+            | waypoints | route       | turns                                       |
+            | a,e       | ab,ce,ce,ce | depart,bcdb-exit-1,exit rotary right,arrive |
+            | a,f       | ab,df,df,df | depart,bcdb-exit-2,exit rotary right,arrive |
 
        Scenario: Collinear in X,Y
         Given the node map
@@ -277,6 +277,6 @@ Feature: Rotary
             | df    |            |
 
         When I route I should get
-            | waypoints | route    | turns                     |
-            | a,e       | ab,ce,ce | depart,bcdb-exit-1,arrive |
-            | a,f       | ab,df,df | depart,bcdb-exit-2,arrive |
+            | waypoints | route       | turns                                       |
+            | a,e       | ab,ce,ce,ce | depart,bcdb-exit-1,exit rotary right,arrive |
+            | a,f       | ab,df,df,df | depart,bcdb-exit-2,exit rotary right,arrive |

features/guidance/roundabout-bike.feature

@@ -5,39 +5,6 @@ Feature: Basic Roundabout
         Given the profile "bicycle"
         Given a grid size of 10 meters
 
-    Scenario: Only Enter
-        Given the node map
-            """
-                a
-                b
-            d c   g h
-                e
-                f
-            """
-
-       And the ways
-            | nodes  | junction   |
-            | ab     |            |
-            | cd     |            |
-            | ef     |            |
-            | gh     |            |
-            | bcegb  | roundabout |
-
-       When I route I should get
-           | waypoints | route          | turns                                   |
-           | a,c       | ab,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
-           | a,e       | ab,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
-           | a,g       | ab,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
-           | d,e       | cd,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
-           | d,g       | cd,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
-           | d,b       | cd,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
-           | f,g       | ef,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
-           | f,b       | ef,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
-           | f,c       | ef,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
-           | h,b       | gh,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
-           | h,c       | gh,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
-           | h,e       | gh,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
-
     Scenario: Only Exit
         Given the node map
             """
@@ -57,54 +24,21 @@ Feature: Basic Roundabout
             | 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 |
+           | waypoints | route       | turns                               |
+           | b,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
+           | b,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
+           | b,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
+           | c,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
+           | c,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
+           | c,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
+           | e,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
+           | e,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
+           | e,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
+           | g,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
+           | g,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
+           | g,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
       #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
            """
@@ -124,20 +58,20 @@ Feature: Basic Roundabout
            | 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 |
+           | waypoints | route           | turns                                                    |
+           | a,c       | abc,abc,abc     | depart,exit roundabout right,arrive                      |
+           | a,l       | abc,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout straight,arrive |
+           | a,i       | abc,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout straight,arrive |
+           | a,f       | abc,def,def,def | depart,roundabout-exit-4,exit roundabout straight,arrive |
+           | d,f       | def,def,def     | depart,exit roundabout right,arrive                      |
+           | d,c       | def,abc,abc,abc | depart,roundabout-exit-2,exit roundabout straight,arrive |
+           | d,l       | def,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout straight,arrive |
+           | d,i       | def,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout straight,arrive |
+           | g,i       | ghi,ghi,ghi     | depart,exit roundabout right,arrive                      |
+           | g,f       | ghi,def,def,def | depart,roundabout-exit-2,exit roundabout straight,arrive |
+           | g,c       | ghi,abc,abc,abc | depart,roundabout-exit-3,exit roundabout straight,arrive |
+           | g,l       | ghi,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout straight,arrive |
+           | j,l       | jkl,jkl,jkl     | depart,exit roundabout right,arrive                      |
+           | j,i       | jkl,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout straight,arrive |
+           | j,f       | jkl,def,def,def | depart,roundabout-exit-3,exit roundabout straight,arrive |
+           | j,c       | jkl,abc,abc,abc | depart,roundabout-exit-4,exit roundabout straight,arrive |

features/guidance/roundabout-left-sided.feature

@@ -52,7 +52,7 @@ Feature: Basic Roundabout
            | behkb | roundabout | yes    |
 
         When I route I should get
-           | waypoints | route       | turns                           |
-           | c,a       | cba,cba,cba | depart,roundabout-exit-1,arrive |
-           | l,a       | lkj,cba,cba | depart,roundabout-exit-2,arrive |
-           | i,a       | ihg,cba,cba | depart,roundabout-exit-3,arrive |
+           | waypoints | route           | turns                                                    |
+           | c,a       | cba,cba,cba     | depart,exit roundabout left,arrive                       |
+           | l,a       | lkj,cba,cba,cba | depart,roundabout-exit-2,exit roundabout straight,arrive |
+           | i,a       | ihg,cba,cba,cba | depart,roundabout-exit-3,exit roundabout straight,arrive |

features/guidance/roundabout-turn-bike.feature

@@ -5,39 +5,6 @@ Feature: Basic Roundabout
         Given the profile "bicycle"
         Given a grid size of 10 meters
 
-    Scenario: Enter and Exit
-        Given the node map
-            """
-                a
-                b
-            h g   c d
-                e
-                f
-            """
-
-       And the ways
-            | nodes  | junction   |
-            | ab     |            |
-            | cd     |            |
-            | ef     |            |
-            | gh     |            |
-            | bgecb  | roundabout |
-
-       When I route I should get
-           | waypoints | route    | turns                                         |
-           | a,d       | ab,cd,cd | depart,roundabout turn left exit-3,arrive     |
-           | a,f       | ab,ef,ef | depart,roundabout turn straight exit-2,arrive |
-           | a,h       | ab,gh,gh | depart,roundabout turn right exit-1,arrive    |
-           | d,f       | cd,ef,ef | depart,roundabout turn left exit-3,arrive     |
-           | d,h       | cd,gh,gh | depart,roundabout turn straight exit-2,arrive |
-           | d,a       | cd,ab,ab | depart,roundabout turn right exit-1,arrive    |
-           | f,h       | ef,gh,gh | depart,roundabout turn left exit-3,arrive     |
-           | f,a       | ef,ab,ab | depart,roundabout turn straight exit-2,arrive |
-           | f,d       | ef,cd,cd | depart,roundabout turn right exit-1,arrive    |
-           | h,a       | gh,ab,ab | depart,roundabout turn left exit-3,arrive     |
-           | h,d       | gh,cd,cd | depart,roundabout turn straight exit-2,arrive |
-           | h,f       | gh,ef,ef | depart,roundabout turn right exit-1,arrive    |
-
     # https://www.openstreetmap.org/way/223225602
     Scenario: Enter and Exit with changing mode
         Given the node map
@@ -58,16 +25,16 @@ Feature: Basic Roundabout
             | bgecb | roundabout | residential |
 
        When I route I should get
-           | waypoints | route          | turns                                                              |
-           | a,d       | ab,cd,cd       | depart,roundabout turn left exit-1,arrive                          |
-           | a,f       | ab,ef,ef,ef    | depart,roundabout turn left exit-1,notification right,arrive       |
-           | a,h       | ab,bgecb,gh,gh | depart,roundabout turn right exit-1,notification right,arrive      |
-           | d,f       | cd,ef,ef,ef    | depart,roundabout turn sharp left exit-2,notification right,arrive |
-           | d,h       | cd,gh,gh,gh    | depart,roundabout turn left exit-2,notification right,arrive       |
-           | d,a       | cd,ab,ab       | depart,roundabout turn right exit-1,arrive                         |
-           | f,h       | ef,gh,gh,gh    | depart,roundabout turn sharp left exit-3,notification right,arrive |
-           | f,a       | ef,ab,ab       | depart,roundabout turn straight exit-2,arrive                      |
-           | f,d       | ef,cd,cd       | depart,roundabout turn right exit-1,arrive                         |
-           | h,a       | gh,ab,ab       | depart,roundabout turn left exit-2,arrive                          |
-           | h,d       | gh,cd,cd       | depart,roundabout turn straight exit-1,arrive                      |
-           | h,f       | gh,bgecb,ef,ef | depart,roundabout turn right exit-1,notification right,arrive      |
+           | waypoints | route       | turns                                                               |
+           | a,d       | ab,cd,cd    | depart,roundabout turn left exit-1,arrive                           |
+           | a,f       | ab,ef,ef,ef | depart,roundabout turn straight exit-1,exit roundabout right,arrive |
+           | a,h       | ab,gh,gh,gh | depart,roundabout turn right exit-1,exit roundabout right,arrive    |
+           | d,f       | cd,ef,ef,ef | depart,roundabout turn left exit-2,exit roundabout right,arrive     |
+           | d,h       | cd,gh,gh,gh | depart,roundabout turn straight exit-2,exit roundabout right,arrive |
+           | d,a       | cd,ab,ab    | depart,roundabout turn right exit-1,arrive                          |
+           | f,h       | ef,gh,gh,gh | depart,roundabout turn left exit-3,exit roundabout right,arrive     |
+           | f,a       | ef,ab,ab    | depart,roundabout turn straight exit-2,arrive                       |
+           | f,d       | ef,cd,cd    | depart,roundabout turn right exit-1,arrive                          |
+           | h,a       | gh,ab,ab    | depart,roundabout turn left exit-2,arrive                           | 
+           | h,d       | gh,cd,cd    | depart,roundabout turn straight exit-1,arrive                       |
+           | h,f       | gh,ef,ef,ef | depart,roundabout turn right exit-1,exit roundabout right,arrive    |

features/guidance/roundabout-turn.feature

@@ -56,19 +56,19 @@ Feature: Basic Roundabout
             | bgecb  | roundabout |
 
        When I route I should get
-           | waypoints | route    | turns                                         |
-           | a,d       | ab,cd,cd | depart,roundabout turn left exit-3,arrive     |
-           | a,f       | ab,ef,ef | depart,roundabout turn straight exit-2,arrive |
-           | a,h       | ab,gh,gh | depart,roundabout turn right exit-1,arrive    |
-           | d,f       | cd,ef,ef | depart,roundabout turn left exit-3,arrive     |
-           | d,h       | cd,gh,gh | depart,roundabout turn straight exit-2,arrive |
-           | d,a       | cd,ab,ab | depart,roundabout turn right exit-1,arrive    |
-           | f,h       | ef,gh,gh | depart,roundabout turn left exit-3,arrive     |
-           | f,a       | ef,ab,ab | depart,roundabout turn straight exit-2,arrive |
-           | f,d       | ef,cd,cd | depart,roundabout turn right exit-1,arrive    |
-           | h,a       | gh,ab,ab | depart,roundabout turn left exit-3,arrive     |
-           | h,d       | gh,cd,cd | depart,roundabout turn straight exit-2,arrive |
-           | h,f       | gh,ef,ef | depart,roundabout turn right exit-1,arrive    |
+           | waypoints | route    | turns                                           |
+           | a,d       | ab,cd,cd | depart,roundabout turn left exit-3,arrive       |
+           | a,f       | ab,ef,ef | depart,roundabout turn straight exit-2,arrive   |
+           | a,h       | ab,gh,gh | depart,roundabout turn right exit-1,arrive      |
+           | d,f       | cd,ef,ef | depart,roundabout turn left exit-3,arrive       |
+           | d,h       | cd,gh,gh | depart,roundabout turn straight exit-2,arrive   |
+           | d,a       | cd,ab,ab | depart,roundabout turn right exit-1,arrive      |
+           | f,h       | ef,gh,gh | depart,roundabout turn left exit-3,arrive       |
+           | f,a       | ef,ab,ab | depart,roundabout turn straight exit-2,arrive   |
+           | f,d       | ef,cd,cd | depart,roundabout turn right exit-1,arrive      |
+           | h,a       | gh,ab,ab | depart,roundabout turn left exit-3,arrive       |
+           | h,d       | gh,cd,cd | depart,roundabout turn straight exit-2,arrive   |
+           | h,f       | gh,ef,ef | depart,roundabout turn right exit-1,arrive      |
 
     Scenario: Only Enter
         Given the node map
@@ -122,19 +122,19 @@ Feature: Basic Roundabout
             | bcegb  | roundabout |
 
        When I route I should get
-           | waypoints | route       | turns                           |
-           | b,d       | bcegb,cd,cd | depart,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 |
+           | waypoints | route       | turns                               |
+           | b,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
+           | b,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
+           | b,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
+           | c,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
+           | c,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
+           | c,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
+           | e,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
+           | e,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
+           | e,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
+           | g,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
+           | g,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
+           | g,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
       #phantom node snapping can result in a full round-trip here, therefore we cannot test b->a and the other direct exits
 
     Scenario: Drive Around
@@ -189,23 +189,23 @@ Feature: Basic Roundabout
            | bkheb | roundabout | yes    |
 
         When I route I should get
-           | waypoints | route       | turns                           |
-           | a,c       | abc,abc,abc | depart,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 |
+           | waypoints | route              | turns                                                 |
+           | a,c       | abc,abc,abc     | depart,exit roundabout right,arrive                      |
+           | a,l       | abc,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout straight,arrive |
+           | a,i       | abc,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout straight,arrive |
+           | a,f       | abc,def,def,def | depart,roundabout-exit-4,exit roundabout straight,arrive |
+           | d,f       | def,def,def     | depart,exit roundabout right,arrive                      |
+           | d,c       | def,abc,abc,abc | depart,roundabout-exit-2,exit roundabout straight,arrive |
+           | d,l       | def,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout straight,arrive |
+           | d,i       | def,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout straight,arrive |
+           | g,i       | ghi,ghi,ghi     | depart,exit roundabout right,arrive                      |
+           | g,f       | ghi,def,def,def | depart,roundabout-exit-2,exit roundabout straight,arrive |
+           | g,c       | ghi,abc,abc,abc | depart,roundabout-exit-3,exit roundabout straight,arrive |
+           | g,l       | ghi,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout straight,arrive |
+           | j,l       | jkl,jkl,jkl     | depart,exit roundabout right,arrive                      |
+           | j,i       | jkl,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout straight,arrive |
+           | j,f       | jkl,def,def,def | depart,roundabout-exit-3,exit roundabout straight,arrive |
+           | j,c       | jkl,abc,abc,abc | depart,roundabout-exit-4,exit roundabout straight,arrive |
 
     Scenario: Segregated roads - Not an intersection
         Given the node map
@@ -226,23 +226,23 @@ Feature: Basic Roundabout
            | bkheb | roundabout | yes    |
 
         When I route I should get
-           | waypoints | route       | turns                           |
-           | a,c       | abc,abc,abc | depart,roundabout-exit-4,arrive |
-           | a,l       | abc,jkl,jkl | depart,roundabout-exit-1,arrive |
-           | a,i       | abc,ghi,ghi | depart,roundabout-exit-2,arrive |
-           | a,f       | abc,def,def | depart,roundabout-exit-3,arrive |
-           | d,f       | def,def,def | depart,roundabout-exit-4,arrive |
-           | d,c       | def,abc,abc | depart,roundabout-exit-1,arrive |
-           | d,l       | def,jkl,jkl | depart,roundabout-exit-2,arrive |
-           | d,i       | def,ghi,ghi | depart,roundabout-exit-3,arrive |
-           | g,i       | ghi,ghi,ghi | depart,roundabout-exit-4,arrive |
-           | g,f       | ghi,def,def | depart,roundabout-exit-1,arrive |
-           | g,c       | ghi,abc,abc | depart,roundabout-exit-2,arrive |
-           | g,l       | ghi,jkl,jkl | depart,roundabout-exit-3,arrive |
-           | j,l       | jkl,jkl,jkl | depart,roundabout-exit-4,arrive |
-           | j,i       | jkl,ghi,ghi | depart,roundabout-exit-1,arrive |
-           | j,f       | jkl,def,def | depart,roundabout-exit-2,arrive |
-           | j,c       | jkl,abc,abc | depart,roundabout-exit-3,arrive |
+           | waypoints | route            | turns                                                |
+           | a,c       | abc,abc,abc,abc | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | a,l       | abc,jkl,jkl,jkl | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | a,i       | abc,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | a,f       | abc,def,def,def | depart,roundabout-exit-3,exit roundabout right,arrive |
+           | d,f       | def,def,def,def | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | d,c       | def,abc,abc,abc | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | d,l       | def,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | d,i       | def,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout right,arrive |
+           | g,i       | ghi,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | g,f       | ghi,def,def,def | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | g,c       | ghi,abc,abc,abc | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | g,l       | ghi,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout right,arrive |
+           | j,l       | jkl,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | j,i       | jkl,ghi,ghi,ghi | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | j,f       | jkl,def,def,def | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | j,c       | jkl,abc,abc,abc | depart,roundabout-exit-3,exit roundabout right,arrive |
 
        Scenario: Collinear in X
         Given the node map
@@ -368,19 +368,19 @@ Feature: Basic Roundabout
             | bigecb | roundabout |
 
        When I route I should get
-           | waypoints | route    | turns                           |
-           | a,d       | ab,cd,cd | depart,roundabout-exit-4,arrive |
-           | a,f       | ab,ef,ef | depart,roundabout-exit-3,arrive |
-           | a,h       | ab,gh,gh | depart,roundabout-exit-2,arrive |
-           | d,f       | cd,ef,ef | depart,roundabout-exit-4,arrive |
-           | d,h       | cd,gh,gh | depart,roundabout-exit-3,arrive |
-           | d,a       | cd,ab,ab | depart,roundabout-exit-1,arrive |
-           | f,h       | ef,gh,gh | depart,roundabout-exit-4,arrive |
-           | f,a       | ef,ab,ab | depart,roundabout-exit-2,arrive |
-           | f,d       | ef,cd,cd | depart,roundabout-exit-1,arrive |
-           | h,a       | gh,ab,ab | depart,roundabout-exit-3,arrive |
-           | h,d       | gh,cd,cd | depart,roundabout-exit-2,arrive |
-           | h,f       | gh,ef,ef | depart,roundabout-exit-1,arrive |
+           | waypoints | route       | turns                                                 |
+           | a,d       | ab,cd,cd,cd | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | a,f       | ab,ef,ef,ef | depart,roundabout-exit-3,exit roundabout right,arrive |
+           | a,h       | ab,gh,gh,gh | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | d,f       | cd,ef,ef,ef | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | d,h       | cd,gh,gh,gh | depart,roundabout-exit-3,exit roundabout right,arrive |
+           | d,a       | cd,ab,ab,ab | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | f,h       | ef,gh,gh,gh | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | f,a       | ef,ab,ab,ab | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | f,d       | ef,cd,cd,cd | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | h,a       | gh,ab,ab,ab | depart,roundabout-exit-3,exit roundabout right,arrive |
+           | h,d       | gh,cd,cd,cd | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | h,f       | gh,ef,ef,ef | depart,roundabout-exit-1,exit roundabout right,arrive |
 
     Scenario: Enter and Exit -- Non-Distinct
         Given the node map
@@ -401,19 +401,19 @@ Feature: Basic Roundabout
             | bgecb | roundabout |
 
        When I route I should get
-           | waypoints | route    | turns                           |
-           | a,d       | ab,cd,cd | 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,cd | depart,roundabout-exit-3,exit roundabout right,arrive     |
+           | a,f       | ab,ef,ef,ef | depart,roundabout-exit-2,exit roundabout right,arrive     |
+           | a,h       | ab,gh,gh,gh | depart,roundabout-exit-1,exit roundabout straight,arrive  |
+           | d,f       | cd,ef,ef,ef | depart,roundabout-exit-3,exit roundabout right,arrive     |
+           | d,h       | cd,gh,gh,gh | depart,roundabout-exit-2,exit roundabout straight,arrive  |
+           | d,a       | cd,ab,ab,ab | depart,roundabout-exit-1,exit roundabout right,arrive     |
+           | f,h       | ef,gh,gh,gh | depart,roundabout-exit-3,exit roundabout straight,arrive  |
+           | f,a       | ef,ab,ab,ab | depart,roundabout-exit-2,exit roundabout right,arrive     |
+           | f,d       | ef,cd,cd,cd | depart,roundabout-exit-1,exit roundabout right,arrive     |
+           | h,a       | gh,ab,ab,ab | depart,roundabout-exit-3,exit roundabout right,arrive     |
+           | h,d       | gh,cd,cd,cd | depart,roundabout-exit-2,exit roundabout right,arrive     |
+           | h,f       | gh,ef,ef,ef | depart,roundabout-exit-1,exit roundabout right,arrive     |
 
     Scenario: Enter and Exit -- Bearing
         Given the node map

features/guidance/roundabout.feature

@@ -57,10 +57,10 @@ Feature: Basic Roundabout
             | bcegb  | roundabout | primary |
 
         When I route I should get
-            | waypoints | route    | turns                           |
-            | a,d       | ab,cd,cd | depart,roundabout-exit-1,arrive |
-            | a,h       | ab,gh,gh | depart,roundabout-exit-2,arrive |
-            | a,f       | ab,ef,ef | depart,roundabout-exit-2,arrive |
+            | waypoints | route       | turns                                                    |
+            | a,d       | ab,cd,cd,cd | depart,roundabout-exit-1,exit roundabout right,arrive    |
+            | a,h       | ab,gh,gh,gh | depart,roundabout-exit-2,exit roundabout straight,arrive |
+            | a,f       | ab,ef,ef,ef | depart,roundabout-exit-2,exit roundabout right,arrive    |
 
     #2927
     Scenario: Only Roundabout
@@ -98,19 +98,19 @@ Feature: Basic Roundabout
             | bcegb  | roundabout |
 
        When I route I should get
-           | waypoints | route       | turns                           |
-           | b,d       | bcegb,cd,cd | depart,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 |
+           | waypoints | route       | turns                               |
+           | b,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
+           | b,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
+           | b,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
+           | c,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
+           | c,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
+           | c,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
+           | e,h       | bcegb,gh,gh | depart,exit roundabout right,arrive |
+           | e,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
+           | e,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
+           | g,a       | bcegb,ab,ab | depart,exit roundabout right,arrive |
+           | g,d       | bcegb,cd,cd | depart,exit roundabout right,arrive |
+           | g,f       | bcegb,ef,ef | depart,exit roundabout right,arrive |
       #phantom node snapping can result in a full round-trip here, therefore we cannot test b->a and the other direct exits
 
     Scenario: Drive Around
@@ -165,23 +165,23 @@ Feature: Basic Roundabout
            | bkheb | roundabout | yes    |
 
         When I route I should get
-           | waypoints | route       | turns                           |
-           | a,c       | abc,abc,abc | depart,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 |
+           | waypoints | route           | turns                                                    |
+           | a,c       | abc,abc,abc     | depart,exit roundabout right,arrive                      |
+           | a,l       | abc,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout straight,arrive |
+           | a,i       | abc,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout straight,arrive |
+           | a,f       | abc,def,def,def | depart,roundabout-exit-4,exit roundabout straight,arrive |
+           | d,f       | def,def,def     | depart,exit roundabout right,arrive                      |
+           | d,c       | def,abc,abc,abc | depart,roundabout-exit-2,exit roundabout straight,arrive |
+           | d,l       | def,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout straight,arrive |
+           | d,i       | def,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout straight,arrive |
+           | g,i       | ghi,ghi,ghi     | depart,exit roundabout right,arrive                      |
+           | g,f       | ghi,def,def,def | depart,roundabout-exit-2,exit roundabout straight,arrive |
+           | g,c       | ghi,abc,abc,abc | depart,roundabout-exit-3,exit roundabout straight,arrive |
+           | g,l       | ghi,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout straight,arrive |
+           | j,l       | jkl,jkl,jkl     | depart,exit roundabout right,arrive                      |
+           | j,i       | jkl,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout straight,arrive |
+           | j,f       | jkl,def,def,def | depart,roundabout-exit-3,exit roundabout straight,arrive |
+           | j,c       | jkl,abc,abc,abc | depart,roundabout-exit-4,exit roundabout straight,arrive |
 
     Scenario: Mixed Entry and Exit - segregated roads
         Given the node map
@@ -204,23 +204,23 @@ Feature: Basic Roundabout
            | bkheb | roundabout | yes    |
 
         When I route I should get
-           | waypoints | route       | turns                           |
-           | a,c       | abc,abc,abc | depart,roundabout-exit-4,arrive |
-           | a,l       | abc,jkl,jkl | depart,roundabout-exit-1,arrive |
-           | a,i       | abc,ghi,ghi | depart,roundabout-exit-2,arrive |
-           | a,f       | abc,def,def | depart,roundabout-exit-3,arrive |
-           | d,f       | def,def,def | depart,roundabout-exit-4,arrive |
-           | d,c       | def,abc,abc | depart,roundabout-exit-1,arrive |
-           | d,l       | def,jkl,jkl | depart,roundabout-exit-2,arrive |
-           | d,i       | def,ghi,ghi | depart,roundabout-exit-3,arrive |
-           | g,i       | ghi,ghi,ghi | depart,roundabout-exit-4,arrive |
-           | g,f       | ghi,def,def | depart,roundabout-exit-1,arrive |
-           | g,c       | ghi,abc,abc | depart,roundabout-exit-2,arrive |
-           | g,l       | ghi,jkl,jkl | depart,roundabout-exit-3,arrive |
-           | j,l       | jkl,jkl,jkl | depart,roundabout-exit-4,arrive |
-           | j,i       | jkl,ghi,ghi | depart,roundabout-exit-1,arrive |
-           | j,f       | jkl,def,def | depart,roundabout-exit-2,arrive |
-           | j,c       | jkl,abc,abc | depart,roundabout-exit-3,arrive |
+           | waypoints | route           | turns                                                 |
+           | a,c       | abc,abc,abc,abc | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | a,l       | abc,jkl,jkl,jkl | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | a,i       | abc,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | a,f       | abc,def,def,def | depart,roundabout-exit-3,exit roundabout right,arrive |
+           | d,f       | def,def,def,def | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | d,c       | def,abc,abc,abc | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | d,l       | def,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | d,i       | def,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout right,arrive |
+           | g,i       | ghi,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | g,f       | ghi,def,def,def | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | g,c       | ghi,abc,abc,abc | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | g,l       | ghi,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout right,arrive |
+           | j,l       | jkl,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | j,i       | jkl,ghi,ghi,ghi | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | j,f       | jkl,def,def,def | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | j,c       | jkl,abc,abc,abc | depart,roundabout-exit-3,exit roundabout right,arrive |
 
      Scenario: Mixed Entry and Exit - clockwise order
         Given the node map
@@ -241,23 +241,23 @@ Feature: Basic Roundabout
            | behkb | roundabout | yes    |
 
         When I route I should get
-           | waypoints | route       | turns                           |
-           | a,c       | abc,abc,abc | depart,roundabout-exit-4,arrive |
-           | a,l       | abc,jkl,jkl | depart,roundabout-exit-3,arrive |
-           | a,i       | abc,ghi,ghi | depart,roundabout-exit-2,arrive |
-           | a,f       | abc,def,def | depart,roundabout-exit-1,arrive |
-           | d,f       | def,def,def | depart,roundabout-exit-4,arrive |
-           | d,c       | def,abc,abc | depart,roundabout-exit-3,arrive |
-           | d,l       | def,jkl,jkl | depart,roundabout-exit-2,arrive |
-           | d,i       | def,ghi,ghi | depart,roundabout-exit-1,arrive |
-           | g,i       | ghi,ghi,ghi | depart,roundabout-exit-4,arrive |
-           | g,f       | ghi,def,def | depart,roundabout-exit-3,arrive |
-           | g,c       | ghi,abc,abc | depart,roundabout-exit-2,arrive |
-           | g,l       | ghi,jkl,jkl | depart,roundabout-exit-1,arrive |
-           | j,l       | jkl,jkl,jkl | depart,roundabout-exit-4,arrive |
-           | j,i       | jkl,ghi,ghi | depart,roundabout-exit-3,arrive |
-           | j,f       | jkl,def,def | depart,roundabout-exit-2,arrive |
-           | j,c       | jkl,abc,abc | depart,roundabout-exit-1,arrive |
+           | waypoints | route           | turns                                                |
+           | a,c       | abc,abc,abc,abc | depart,roundabout-exit-4,exit roundabout left,arrive |
+           | a,l       | abc,jkl,jkl,jkl | depart,roundabout-exit-3,exit roundabout left,arrive |
+           | a,i       | abc,ghi,ghi,ghi | depart,roundabout-exit-2,exit roundabout left,arrive |
+           | a,f       | abc,def,def,def | depart,roundabout-exit-1,exit roundabout left,arrive |
+           | d,f       | def,def,def,def | depart,roundabout-exit-4,exit roundabout left,arrive |
+           | d,c       | def,abc,abc,abc | depart,roundabout-exit-3,exit roundabout left,arrive |
+           | d,l       | def,jkl,jkl,jkl | depart,roundabout-exit-2,exit roundabout left,arrive |
+           | d,i       | def,ghi,ghi,ghi | depart,roundabout-exit-1,exit roundabout left,arrive |
+           | g,i       | ghi,ghi,ghi,ghi | depart,roundabout-exit-4,exit roundabout left,arrive |
+           | g,f       | ghi,def,def,def | depart,roundabout-exit-3,exit roundabout left,arrive |
+           | g,c       | ghi,abc,abc,abc | depart,roundabout-exit-2,exit roundabout left,arrive |
+           | g,l       | ghi,jkl,jkl,jkl | depart,roundabout-exit-1,exit roundabout left,arrive |
+           | j,l       | jkl,jkl,jkl,jkl | depart,roundabout-exit-4,exit roundabout left,arrive |
+           | j,i       | jkl,ghi,ghi,ghi | depart,roundabout-exit-3,exit roundabout left,arrive |
+           | j,f       | jkl,def,def,def | depart,roundabout-exit-2,exit roundabout left,arrive |
+           | j,c       | jkl,abc,abc,abc | depart,roundabout-exit-1,exit roundabout left,arrive |
 
     Scenario: Mixed Entry and Exit - segregated roads, different names
         Given the node map
@@ -284,23 +284,23 @@ Feature: Basic Roundabout
            | bkheb | roundabout | yes    |
 
         When I route I should get
-           | waypoints | route    | turns                           |
-           | a,c       | ab,bc,bc | depart,roundabout-exit-4,arrive |
-           | a,l       | ab,kl,kl | depart,roundabout-exit-1,arrive |
-           | a,i       | ab,hi,hi | depart,roundabout-exit-2,arrive |
-           | a,f       | ab,ef,ef | depart,roundabout-exit-3,arrive |
-           | d,f       | de,ef,ef | depart,roundabout-exit-4,arrive |
-           | d,c       | de,bc,bc | depart,roundabout-exit-1,arrive |
-           | d,l       | de,kl,kl | depart,roundabout-exit-2,arrive |
-           | d,i       | de,hi,hi | depart,roundabout-exit-3,arrive |
-           | g,i       | gh,hi,hi | depart,roundabout-exit-4,arrive |
-           | g,f       | gh,ef,ef | depart,roundabout-exit-1,arrive |
-           | g,c       | gh,bc,bc | depart,roundabout-exit-2,arrive |
-           | g,l       | gh,kl,kl | depart,roundabout-exit-3,arrive |
-           | j,l       | jk,kl,kl | depart,roundabout-exit-4,arrive |
-           | j,i       | jk,hi,hi | depart,roundabout-exit-1,arrive |
-           | j,f       | jk,ef,ef | depart,roundabout-exit-2,arrive |
-           | j,c       | jk,bc,bc | depart,roundabout-exit-3,arrive |
+           | waypoints | route       | turns                                                 |
+           | a,c       | ab,bc,bc,bc | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | a,l       | ab,kl,kl,kl | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | a,i       | ab,hi,hi,hi | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | a,f       | ab,ef,ef,ef | depart,roundabout-exit-3,exit roundabout right,arrive |
+           | d,f       | de,ef,ef,ef | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | d,c       | de,bc,bc,bc | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | d,l       | de,kl,kl,kl | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | d,i       | de,hi,hi,hi | depart,roundabout-exit-3,exit roundabout right,arrive |
+           | g,i       | gh,hi,hi,hi | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | g,f       | gh,ef,ef,ef | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | g,c       | gh,bc,bc,bc | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | g,l       | gh,kl,kl,kl | depart,roundabout-exit-3,exit roundabout right,arrive |
+           | j,l       | jk,kl,kl,kl | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | j,i       | jk,hi,hi,hi | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | j,f       | jk,ef,ef,ef | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | j,c       | jk,bc,bc,bc | depart,roundabout-exit-3,exit roundabout right,arrive |
 
     Scenario: Motorway Roundabout
     #See 39.933742 -75.082345
@@ -338,11 +338,10 @@ Feature: Basic Roundabout
             | dmg   | roundabout |          | trunk_link | yes    |        |
 
         When I route I should get
-            | waypoints | route                                                 | turns                           | ref                     |
-            | a,e       | crescent,crescent,crescent                            | depart,roundabout-exit-3,arrive | US 130,US 130,US 130    |
-            | j,l       | ,,                                                    | depart,roundabout-exit-2,arrive | NJ 38,NJ 38,NJ 38       |
+            | waypoints | route                               | turns                                                    | ref                         |
+            | a,e       | crescent,crescent,crescent,crescent | depart,roundabout-exit-3,exit roundabout straight,arrive | US 130,US 130,US 130,US 130 |
+            | j,l       | ,,,                                 | depart,roundabout-exit-2,exit roundabout straight,arrive | NJ 38,NJ 38,NJ 38,NJ 38     |
 
-    @todo
     # this test previously only passed by accident. We need to handle throughabouts correctly, since staying on massachusetts is actually
     # the desired setting. Rotary instructions here are not wanted but rather no instruction at all to go through the roundabout (or add
     # a throughabout instruction)
@@ -389,8 +388,8 @@ Feature: Basic Roundabout
             | restriction | pi       | ij     | i        | no_left_turn  |
 
         When I route I should get
-            | waypoints | route                                                   | turns                                              |
-            | a,k       | massachusetts,massachusetts,massachusetts,massachusetts | depart,sheridan circle-exit-2,rotary-exit-1,arrive |
+            | waypoints | route                                                   | turns                                                  |
+            | a,k       | massachusetts,massachusetts,massachusetts,massachusetts | depart,sheridan circle-exit-2,exit rotary right,arrive |
 
     #2856 - http://www.openstreetmap.org/#map=19/47.23318/-1.56563
     Scenario: Linked Roundabouts
@@ -477,8 +476,8 @@ Feature: Basic Roundabout
             | cdefib | roundabout | roundabout    | yes    |                       |
 
         When I route I should get
-            | waypoints | route                                  | turns                           |
-            | 1,h       | roundabout,right-bot-out,right-bot-out | depart,roundabout-exit-1,arrive |
+            | waypoints | route                                  | turns                              |
+            | 1,h       | roundabout,right-bot-out,right-bot-out | depart,exit rotary straight,arrive |
 
     @3254
     Scenario: Driving up to and through a roundabout
@@ -495,15 +494,15 @@ Feature: Basic Roundabout
 
         And the ways
             | nodes | junction   | name       | highway     |
-            | abcda | roundabout | roundabout | residential |
+            | abcda | roundabout | rotary     | residential |
             | gfi   |            | side       | residential |
             | efb   |            | left       | residential |
             | dh    |            | right      | residential |
             | ck    |            | bottom     | residential |
 
         When I route I should get
-            | waypoints | route            | turns                           |
-            | e,h       | left,right,right | depart,roundabout-exit-2,arrive |
+            | waypoints | route                  | turns                                         |
+            | e,h       | left,right,right,right | depart,rotary-exit-2,exit rotary right,arrive |
 
     @3254
     Scenario: Driving up to and through a roundabout
@@ -520,15 +519,15 @@ Feature: Basic Roundabout
 
         And the ways
             | nodes | junction   | name       | highway     |
-            | abcda | roundabout | roundabout | residential |
+            | abcda | roundabout | rotary     | residential |
             | gfi   |            | side       | residential |
             | efb   |            | left       | residential |
             | dh    |            | right      | residential |
             | ck    |            | bottom     | residential |
 
         When I route I should get
-            | waypoints | route            | turns                           |
-            | e,h       | left,right,right | depart,roundabout-exit-2,arrive |
+            | waypoints | route                  | turns                                         |
+            | e,h       | left,right,right,right | depart,rotary-exit-2,exit rotary right,arrive |
 
     @3361
     Scenario: Bersarinplatz (Not a Roundabout)
@@ -565,13 +564,13 @@ Feature: Basic Roundabout
             | mn        |            | Petersburger Strasse | B 96a | primary     | yes    |
 
         When I route I should get
-            | waypoints | route                                                          | turns                                                                            |
-            | a,g       | Petersburger Strasse,Petersburger Strasse,Petersburger Strasse | depart,Bersarinplatz-exit-2,arrive |
-            | d,g       | Weidenweg,Petersburger Strasse,Petersburger Strasse            | depart,Bersarinplatz-exit-1,arrive |
-            | i,k       | Petersburger Strasse,Rigaer Strasse,Rigaer Strasse             | depart,Bersarinplatz-exit-1,arrive |
-            | i,n       | Petersburger Strasse,Petersburger Strasse,Petersburger Strasse | depart,Bersarinplatz-exit-2,arrive |
-            | i,d       | Petersburger Strasse,Weidenweg,Weidenweg                       | depart,Bersarinplatz-exit-3,arrive |
-            | i,g       | Petersburger Strasse,Petersburger Strasse,Petersburger Strasse | depart,Bersarinplatz-exit-4,arrive |
+            | waypoints | route                                                                               | turns                                                   |
+            | a,g       | Petersburger Strasse,Petersburger Strasse,Petersburger Strasse,Petersburger Strasse | depart,Bersarinplatz-exit-2,exit rotary straight,arrive |
+            | d,g       | Weidenweg,Petersburger Strasse,Petersburger Strasse,Petersburger Strasse            | depart,Bersarinplatz-exit-1,exit rotary straight,arrive |
+            | i,k       | Petersburger Strasse,Rigaer Strasse,Rigaer Strasse,Rigaer Strasse                   | depart,Bersarinplatz-exit-1,exit rotary right,arrive    |
+            | i,n       | Petersburger Strasse,Petersburger Strasse,Petersburger Strasse,Petersburger Strasse | depart,Bersarinplatz-exit-2,exit rotary straight,arrive |
+            | i,d       | Petersburger Strasse,Weidenweg,Weidenweg,Weidenweg                                  | depart,Bersarinplatz-exit-3,exit rotary right,arrive    |
+            | i,g       | Petersburger Strasse,Petersburger Strasse,Petersburger Strasse,Petersburger Strasse | depart,Bersarinplatz-exit-4,exit rotary straight,arrive |
 
     @turboroundabout
     # http://www.openstreetmap.org/?mlat=48.782118&mlon=8.194456&zoom=16#map=19/48.78216/8.19457
@@ -606,11 +605,11 @@ Feature: Basic Roundabout
             | ob    | trunk       | yes    | roundabout | Europaplatz   |                                        |
 
        When I route I should get
-           | waypoints | route                        | turns                            |
-           | a,d       | ,Europastrasse,Europastrasse | depart,Europaplatz-exit-1,arrive |
-           | a,h       | ,Allee Cite,Allee Cite       | depart,Europaplatz-exit-2,arrive |
-           | a,l       | ,Europastrasse,Europastrasse | depart,Europaplatz-exit-3,arrive |
-           | a,p       | ,,                           | depart,Europaplatz-exit-4,arrive |
+           | waypoints | route                                      | turns                                              |
+           | a,d       | ,Europastrasse,Europastrasse,Europastrasse | depart,Europaplatz-exit-1,exit rotary right,arrive |
+           | a,h       | ,Allee Cite,Allee Cite,Allee Cite          | depart,Europaplatz-exit-2,exit rotary right,arrive |
+           | a,l       | ,Europastrasse,Europastrasse,Europastrasse | depart,Europaplatz-exit-3,exit rotary right,arrive |
+           | a,p       | ,,,                                        | depart,Europaplatz-exit-4,exit rotary right,arrive |
 
     @turboroundabout
     # http://www.openstreetmap.org/?mlat=50.180039&mlon=8.474939&zoom=16#map=19/50.17999/8.47506
@@ -658,14 +657,14 @@ Feature: Basic Roundabout
             | wb    | primary      | yes    | roundabout |                              | through\|through;right             |
 
        When I route I should get
-           | waypoints | route                                                                      | turns                                   |
-           | a,w       | Le-Cannet-Rocheville-Strasse,,                                             | depart,roundabout-exit-undefined,arrive |
-           | a,r       | Le-Cannet-Rocheville-Strasse,,                                             | depart,roundabout-exit-4,arrive         |
-           | a,f       | Le-Cannet-Rocheville-Strasse,Frankfurter Strasse,Frankfurter Strasse       | depart,roundabout-exit-1,arrive         |
-           | a,h       | Le-Cannet-Rocheville-Strasse,Bischof-Kaller-Strasse,Bischof-Kaller-Strasse | depart,roundabout-exit-2,arrive         |
-           | u,r       | ,,                                                                         | depart,roundabout-exit-5,arrive         |
-           | j,h       | Bischof-Kaller-Strasse,Bischof-Kaller-Strasse,Bischof-Kaller-Strasse       | depart,roundabout-exit-5,arrive         |
-           | n,m       | ,                                                                          | depart,arrive                           |
+           | waypoints | route                                                                                             | turns                                                 |
+           | a,w       | Le-Cannet-Rocheville-Strasse,,                                                                    | depart,roundabout-exit-undefined,arrive               |
+           | a,r       | Le-Cannet-Rocheville-Strasse,,,                                                                   | depart,roundabout-exit-4,exit roundabout right,arrive |
+           | a,f       | Le-Cannet-Rocheville-Strasse,Frankfurter Strasse,Frankfurter Strasse,Frankfurter Strasse          | depart,roundabout-exit-1,exit roundabout right,arrive |
+           | a,h       | Le-Cannet-Rocheville-Strasse,Bischof-Kaller-Strasse,Bischof-Kaller-Strasse,Bischof-Kaller-Strasse | depart,roundabout-exit-2,exit roundabout right,arrive |
+           | u,r       | ,,,                                                                                               | depart,roundabout-exit-5,exit roundabout right,arrive |
+           | j,h       | Bischof-Kaller-Strasse,Bischof-Kaller-Strasse,Bischof-Kaller-Strasse,Bischof-Kaller-Strasse       | depart,roundabout-exit-5,exit roundabout right,arrive |
+           | n,m       | ,                                                                                                 | depart,arrive                                         |
 
     @turboroundabout
     # http://www.openstreetmap.org/?mlat=47.57723&mlon=7.796765&zoom=16#map=19/47.57720/7.79711
@@ -708,17 +707,16 @@ Feature: Basic Roundabout
             | la    | primary      | yes    | roundabout |
 
        When I route I should get
-           | waypoints | route    | turns                           |
-           | w,r       | wk,ar,ar | depart,roundabout-exit-1,arrive |
-           | w,s       | wk,ds,ds | depart,roundabout-exit-2,arrive |
-           | w,t       | wk,ft,ft | depart,roundabout-exit-3,arrive |
-           | w,v       | wk,hv,hv | depart,roundabout-exit-4,arrive |
-           | u,v       | ug,hv,hv | depart,roundabout-exit-1,arrive |
-           | u,w       | ug,jw,jw | depart,roundabout-exit-2,arrive |
-           | u,r       | ug,ar,ar | depart,roundabout-exit-3,arrive |
-           | u,s       | ug,ds,ds | depart,roundabout-exit-4,arrive |
-           | u,t       | ug,ft,ft | depart,roundabout-exit-5,arrive |
-
+           | waypoints | route       | turns                                                        |
+           | w,r       | wk,ar,ar,ar | depart,roundabout-exit-1,exit roundabout slight right,arrive |
+           | w,s       | wk,ds,ds,ds | depart,roundabout-exit-2,exit roundabout right,arrive        |
+           | w,t       | wk,ft,ft,ft | depart,roundabout-exit-3,exit roundabout right,arrive        |
+           | w,v       | wk,hv,hv,hv | depart,roundabout-exit-4,exit roundabout straight,arrive     |
+           | u,v       | ug,hv,hv,hv | depart,roundabout-exit-1,exit roundabout straight,arrive     |
+           | u,w       | ug,jw,jw,jw | depart,roundabout-exit-2,exit roundabout slight right,arrive |
+           | u,r       | ug,ar,ar,ar | depart,roundabout-exit-3,exit roundabout slight right,arrive |
+           | u,s       | ug,ds,ds,ds | depart,roundabout-exit-4,exit roundabout right,arrive        |
+           | u,t       | ug,ft,ft,ft | depart,roundabout-exit-5,exit roundabout right,arrive        |
 
     @3762
     Scenario: Only Enter
@@ -742,8 +740,8 @@ Feature: Basic Roundabout
             | bcjdeb | roundabout |       |
 
         When I route I should get
-            | waypoints | route          | turns                                                                           |
-            | a,h       | ab,ef,ef,fh,fh | depart,roundabout-exit-4,notification slight right,notification straight,arrive |
+            | waypoints | route          | turns                                                                              |
+            | a,h       | ab,ef,ef,fh,fh | depart,roundabout-exit-4,exit roundabout slight right,notification straight,arrive |
 
 
      Scenario: Drive through roundabout
@@ -762,12 +760,12 @@ Feature: Basic Roundabout
            | gch   |            | yes    |
 
         When I route I should get
-           | waypoints | bearings | route       | turns                           |
-           | e,f       | 90 90    | edf,edf     | depart,arrive                   |
-           | e,h       | 90 135   | edf,gch,gch | depart,roundabout-exit-2,arrive |
-           | g,f       | 45 90    | gch,edf,edf | depart,roundabout-exit-2,arrive |
-           | g,h       | 45 135   | gch,gch,gch | depart,roundabout-exit-1,arrive |
-           | e,e       | 90 270   | edf,edf,edf | depart,roundabout-exit-3,arrive |
+           | waypoints | bearings | route           | turns                                                      |
+           | e,f       | 90 90    | edf,edf         | depart,arrive                                              |
+           | e,h       | 90 135   | edf,gch,gch,gch | depart,roundabout-exit-2,exit roundabout straight,arrive   |
+           | g,f       | 45 90    | gch,edf,edf,edf | depart,roundabout-exit-2,exit roundabout right,arrive      |
+           | g,h       | 45 135   | gch,gch,gch     | depart,exit roundabout right,arrive                        |
+           | e,e       | 90 270   | edf,edf,edf,edf | depart,roundabout-exit-3,exit roundabout sharp left,arrive |
 
     Scenario: CCW and CW roundabouts with overlaps
         Given the node map
@@ -787,12 +785,13 @@ Feature: Basic Roundabout
             | kg    | tertiary |            |
             | hl    | tertiary |            |
 
+        # the turn angles here are quite strange, so we do get uturns for exiting
         When I route I should get
-            | from | to | route    | turns                           | distance |
-            | e    | f  | ed,af,af | depart,roundabout-exit-1,arrive | 80.1m    |
-            | f    | e  | af,ed,ed | depart,roundabout-exit-1,arrive | 120.1m   |
-            | k    | l  | kg,hl,hl | depart,roundabout-exit-1,arrive | 80.1m    |
-            | l    | k  | hl,kg,kg | depart,roundabout-exit-1,arrive | 120.1m   |
+            | from | to | route       | turns                                                 | distance |
+            | e    | f  | ed,af,af,af | depart,roundabout-exit-1,exit roundabout left,arrive  | 80.1m    |
+            | f    | e  | af,ed,ed,ed | depart,roundabout-exit-1,exit roundabout uturn,arrive | 120.1m   |
+            | k    | l  | kg,hl,hl,hl | depart,roundabout-exit-1,exit roundabout right,arrive | 80.1m    |
+            | l    | k  | hl,kg,kg,kg | depart,roundabout-exit-1,exit roundabout uturn,arrive | 120.1m   |
 
     @4030 @4075
     Scenario: Service roundabout with service exits
@@ -811,11 +810,11 @@ Feature: Basic Roundabout
             | bh    | service  |            |
 
         When I route I should get
-            | from | to | route       | turns                           |
-            |    1 | e  | abcda,ce,ce | depart,roundabout-exit-1,arrive |
-            |    1 | f  | abcda,df,df | depart,roundabout-exit-2,arrive |
-            |    1 | g  | abcda,ag,ag | depart,roundabout-exit-3,arrive |
-            |    1 | h  | abcda,bh,bh | depart,roundabout-exit-4,arrive |
+            | from | to | route       | turns                                   |
+            |    1 | e  | abcda,ce,ce | depart,exit roundabout straight,arrive  |
+            |    1 | f  | abcda,df,df | depart,exit roundabout right,arrive     |
+            |    1 | g  | abcda,ag,ag | depart,exit roundabout straight,arrive  |
+            |    1 | h  | abcda,bh,bh | depart,exit roundabout right,arrive     |
 
     Scenario: Collapsing a sliproad step after roundabouts
         Given the node map
@@ -843,6 +842,6 @@ Feature: Basic Roundabout
 
 
         When I route I should get
-            | from | to | route                | turns                                 | distance |
-            | e    | k  | ebds,ufghl,jhik,jhik | depart,rstur-exit-2,turn right,arrive | 189.1m   |
-            | 1    | k  | ebds,ufghl,jhik,jhik | depart,rstur-exit-2,turn right,arrive | 159.1m   |
+            | from | to | route                      | turns                                                   | distance |
+            | e    | k  | ebds,ufghl,ufghl,jhik,jhik | depart,rstur-exit-2,exit rotary right,turn right,arrive | 189.1m   |
+            | 1    | k  | ebds,ufghl,ufghl,jhik,jhik | depart,rstur-exit-2,exit rotary right,turn right,arrive | 159.1m   |

features/guidance/turn-angles.feature

@@ -248,8 +248,8 @@ Feature: Simple Turns
             | bcdefghijklmnob | residential | road | 1     | yes    | roundabout |
 
        When I route I should get
-            | waypoints | route               | turns                                         | intersections                                                            |
-            | a,p       | road,road,road      | depart,roundabout turn straight exit-1,arrive | true:90;true:165 false:270 false:345,true:90 false:180 true:345;true:270 |
+            | waypoints | route          | turns                                         | intersections                                                            |
+            | a,p       | road,road,road | depart,roundabout turn straight exit-1,arrive | true:90;true:165 false:270 false:345,true:90 false:180 true:345;true:270 |
 
     Scenario: Splitting Road with many lanes
         Given the node map
@@ -280,6 +280,35 @@ Feature: Simple Turns
             | a,d       | road,road | depart,arrive |
             | e,a       | road,road | depart,arrive |
 
+    Scenario: Splitting Road with many lanes; same as above makes sure len(turn:lanes) work as expected
+        Given the node map
+            """
+                              f - - - - - - - - - - - - - - - - - - - - e
+                             '
+                            '
+                           '
+                          '
+                         '
+            a - - - - - b
+                         '
+                          '
+                           '
+                            '
+                             '
+                              c - - - - - - - - - - - - - - - - - - - - d
+            """
+
+        And the ways
+            | nodes | highway | name | turn:lanes               | oneway |
+            | ab    | primary | road | left\|left\|right\|right | no     |
+            | bcd   | primary | road | through\|through         | yes    |
+            | efb   | primary | road | through\|through         | yes    |
+
+        When I route I should get
+            | waypoints | route     | turns         |
+            | a,d       | road,road | depart,arrive |
+            | e,a       | road,road | depart,arrive |
+
     @todo
     # currently the intersections don't match up do to the `merging` process.
     # The intermediate intersection is technically no-turn at all, since the road continues.
@@ -809,14 +838,14 @@ Feature: Simple Turns
 
         When I route I should get
             | waypoints | route               | turns                    | intersections                                         |
-            | a,g       | Perle,Heide,Heide   | depart,turn right,arrive | true:90;true:90 true:180 false:270 true:345;true:18   |
-            | a,k       | Perle,Friede,Friede | depart,turn left,arrive  | true:90;true:90 true:180 false:270 true:345;true:153  |
-            | a,e       | Perle,Perle         | depart,arrive            | true:90,true:90 true:180 false:270 true:345;true:270  |
-            | e,k       | Perle,Friede,Friede | depart,turn right,arrive | true:270;false:90 true:180 true:270 true:345;true:153 |
-            | e,g       | Perle,Heide,Heide   | depart,turn left,arrive  | true:270;false:90 true:180 true:270 true:345;true:18  |
-            | h,k       | Heide,Friede        | depart,arrive            | true:16,true:90 true:180 true:270 true:345;true:153   |
-            | h,e       | Heide,Perle,Perle   | depart,turn right,arrive | true:16;true:90 true:180 true:270 true:345;true:270   |
-            | h,a       | Heide,Perle,Perle   | depart,turn left,arrive  | true:16;true:90 true:180 true:270 true:345;true:90    |
+            | a,g       | Perle,Heide,Heide   | depart,turn right,arrive | true:90;true:90 true:195 false:270 true:345;true:18   |
+            | a,k       | Perle,Friede,Friede | depart,turn left,arrive  | true:90;true:90 true:195 false:270 true:345;true:153  |
+            | a,e       | Perle,Perle         | depart,arrive            | true:90,true:90 true:195 false:270 true:345;true:270  |
+            | e,k       | Perle,Friede,Friede | depart,turn right,arrive | true:270;false:90 true:195 true:270 true:345;true:153 |
+            | e,g       | Perle,Heide,Heide   | depart,turn left,arrive  | true:270;false:90 true:195 true:270 true:345;true:18  |
+            | h,k       | Heide,Friede        | depart,arrive            | true:16,true:90 true:195 true:270 true:345;true:153   |
+            | h,e       | Heide,Perle,Perle   | depart,turn right,arrive | true:16;true:90 true:195 true:270 true:345;true:270   |
+            | h,a       | Heide,Perle,Perle   | depart,turn left,arrive  | true:16;true:90 true:195 true:270 true:345;true:90    |
 
     #http://www.openstreetmap.org/#map=19/52.53293/13.32956
     Scenario: Curved Exit from Curved Road
@@ -1006,8 +1035,8 @@ Feature: Simple Turns
             | waypoints | route               | turns                          |
             | a,e       | Heide,Heide,Heide   | depart,continue uturn,arrive   |
             | a,g       | Heide,Fenn,Fenn     | depart,turn right,arrive       |
-            | a,h       | Heide,Friede,Friede | depart,turn slight left,arrive |
-            | i,e       | Perle,Heide,Heide   | depart,turn right,arrive       |
+            | a,h       | Heide,Friede,Friede | depart,turn left,arrive        |
+            | i,e       | Perle,Heide,Heide   | depart,turn sharp right,arrive |
             | i,h       | Perle,Friede,Friede | depart,turn left,arrive        |
 
     #http://www.openstreetmap.org/#map=19/52.48630/13.36017
@@ -1189,7 +1218,7 @@ Feature: Simple Turns
 
         When I route I should get
             | waypoints | route             | turns                           |
-            | a,c       | rose,trift        | depart,arrive                   |
+            | a,c       | rose,trift,trift  | depart,turn slight left,arrive  |
             | a,k       | rose,muhle,muhle  | depart,turn slight right,arrive |
             | d,f       | trift,rose        | depart,arrive                   |
             | d,k       | trift,muhle,muhle | depart,turn sharp left,arrive   |
@@ -1317,11 +1346,11 @@ Feature: Simple Turns
 
     #https://github.com/Project-OSRM/osrm-backend/pull/3469#issuecomment-270806580
     Scenario: Oszillating Lower Priority Road
-		#Given the node map
-	#		"""
-	#		a -db    c
+        #Given the node map
+    #       """
+    #       a -db    c
     #           f
-    #   	"""
+    #       """
         Given the node locations
             | node | lat                | lon                | #          |
             | a    | 1.0                | 1.0                |            |

features/guidance/turn-lanes.feature

@@ -835,9 +835,9 @@ Feature: Turn Lane Guidance
             | cf    | secondary | bottom |                    |
 
         When I route I should get
-            | waypoints | turns                                   | route               | lanes                        |
-            | a,d       | depart,continue right,turn right,arrive | road,road,road,road | ,straight:false right:true,, |
-            | d,a       | depart,continue left,turn left,arrive   | road,road,road,road | ,left:true straight:false,,  |
+            | waypoints | turns                                       | route               | lanes                        |
+            | a,d       | depart,continue right,continue right,arrive | road,road,road,road | ,straight:false right:true,, |
+            | d,a       | depart,continue left,continue left,arrive   | road,road,road,road | ,left:true straight:false,,  |
 
     @simple
     Scenario: Merge Lanes Onto Freeway

features/guidance/turn.feature

@@ -788,9 +788,9 @@ Feature: Simple Turns
             | bg    | primary | yes    |
 
         When I route I should get
-            | waypoints | route     | turns                          |
-            | a,d       | abc,bd,bd | depart,turn sharp right,arrive |
-            | a,f       | abc,bf,bf | depart,turn right,arrive       |
+            | waypoints | route     | turns                           |
+            | a,d       | abc,bd,bd | depart,turn right,arrive        |
+            | a,f       | abc,bf,bf | depart,turn slight right,arrive |
 
     Scenario: Right Turn Assignment Three Conflicting Turns with invalid - 3
         Given the node map
@@ -1349,3 +1349,24 @@ Feature: Simple Turns
        When I route I should get
             | waypoints | route    | turns                   |
             | a,d       | ab,dc,dc | depart,turn left,arrive |
+
+
+    # https://www.openstreetmap.org/node/1332083066
+    Scenario: Turns ordering must respect initial bearings
+        Given the node map
+            """
+            a . be .
+                  \ c.
+                 d/    .f . g
+            """
+
+        And the ways
+            | nodes | highway | oneway |
+            | ab    | primary | yes    |
+            | bcd   | primary | yes    |
+            | befg  | primary | yes    |
+
+       When I route I should get
+            | waypoints | route        | turns                           |
+            | a,d       | ab,bcd,bcd   | depart,fork slight right,arrive |
+            | a,g       | ab,befg,befg | depart,fork slight left,arrive  |

features/options/contract/files.feature

@@ -18,5 +18,5 @@ Feature: osrm-contract command line options: files
     Scenario: osrm-contract - Missing input file
         When I try to run "osrm-contract over-the-rainbow.osrm"
         And stderr should contain "over-the-rainbow.osrm"
-        And stderr should contain "not found"
+        And stderr should contain "Missing/Broken"
         And it should exit with an error

features/options/contract/help.feature

@@ -8,6 +8,7 @@ Feature: osrm-contract command line options: help
         And stdout should contain "Options:"
         And stdout should contain "--version"
         And stdout should contain "--help"
+        And stdout should contain "--verbosity"
         And stdout should contain "Configuration:"
         And stdout should contain "--threads"
         And stdout should contain "--core"
@@ -22,6 +23,7 @@ Feature: osrm-contract command line options: help
         And stdout should contain "Options:"
         And stdout should contain "--version"
         And stdout should contain "--help"
+        And stdout should contain "--verbosity"
         And stdout should contain "Configuration:"
         And stdout should contain "--threads"
         And stdout should contain "--core"
@@ -36,6 +38,7 @@ Feature: osrm-contract command line options: help
         And stdout should contain "Options:"
         And stdout should contain "--version"
         And stdout should contain "--help"
+        And stdout should contain "--verbosity"
         And stdout should contain "Configuration:"
         And stdout should contain "--threads"
         And stdout should contain "--core"

features/options/contract/version.feature

@@ -8,7 +8,7 @@ Feature: osrm-contract command line options: version
         Given the profile "testbot"
 
     Scenario: osrm-contract - Version, short
-        When I run "osrm-contract --v"
+        When I run "osrm-contract -v"
         Then stderr should be empty
         And stdout should contain 1 line
         And stdout should contain /(v\d{1,2}\.\d{1,2}\.\d{1,2}|\w*-\d+-\w+)/

features/options/customize/files.feature

@@ -19,5 +19,5 @@ Feature: osrm-contract command line options: files
     Scenario: osrm-customize - Missing input file
         When I try to run "osrm-customize over-the-rainbow.osrm"
         And stderr should contain "over-the-rainbow.osrm"
-        And stderr should contain "not found"
+        And stderr should contain "Missing/Broken"
         And it should exit with an error

features/options/customize/help.feature

@@ -8,6 +8,7 @@ Feature: osrm-customize command line options: help
         And stdout should contain "Options:"
         And stdout should contain "--version"
         And stdout should contain "--help"
+        And stdout should contain "--verbosity"
         And stdout should contain "Configuration:"
         And stdout should contain "--threads"
         And it should exit with an error
@@ -19,6 +20,7 @@ Feature: osrm-customize command line options: help
         And stdout should contain "Options:"
         And stdout should contain "--version"
         And stdout should contain "--help"
+        And stdout should contain "--verbosity"
         And stdout should contain "Configuration:"
         And stdout should contain "--threads"
         And it should exit successfully
@@ -30,6 +32,7 @@ Feature: osrm-customize command line options: help
         And stdout should contain "Options:"
         And stdout should contain "--version"
         And stdout should contain "--help"
+        And stdout should contain "--verbosity"
         And stdout should contain "Configuration:"
         And stdout should contain "--threads"
         And it should exit successfully

features/options/customize/version.feature

@@ -5,7 +5,7 @@ Feature: osrm-customize command line options: version
         Given the profile "testbot"
 
     Scenario: osrm-customize - Version, short
-        When I run "osrm-customize --v"
+        When I run "osrm-customize -v"
         Then stderr should be empty
         And stdout should contain 1 line
         And stdout should contain /(v\d{1,2}\.\d{1,2}\.\d{1,2}|\w*-\d+-\w+)/

features/options/extract/help.feature

@@ -11,6 +11,7 @@ Feature: osrm-extract command line options: help
         And stdout should contain "Options:"
         And stdout should contain "--version"
         And stdout should contain "--help"
+        And stdout should contain "--verbosity"
         And stdout should contain "Configuration:"
         And stdout should contain "--profile"
         And stdout should contain "--threads"
@@ -24,6 +25,7 @@ Feature: osrm-extract command line options: help
         And stdout should contain "Options:"
         And stdout should contain "--version"
         And stdout should contain "--help"
+        And stdout should contain "--verbosity"
         And stdout should contain "Configuration:"
         And stdout should contain "--profile"
         And stdout should contain "--threads"
@@ -37,6 +39,7 @@ Feature: osrm-extract command line options: help
         And stdout should contain "Options:"
         And stdout should contain "--version"
         And stdout should contain "--help"
+        And stdout should contain "--verbosity"
         And stdout should contain "Configuration:"
         And stdout should contain "--profile"
         And stdout should contain "--threads"

features/options/extract/verbosity.feature

@@ -0,0 +1,32 @@
+@extract
+Feature: osrm-extract must be silent with NONE
+
+    Background:
+        Given the node map
+            """
+            a b
+            """
+        And the ways
+            | nodes |
+            | ab    |
+        And the data has been saved to disk
+
+    Scenario: osrm-extract - Passing base file with verbosity NONE
+        Given the profile file
+        """
+        functions = require('testbot')
+
+        function way_function(profile, way, result)
+          result.forward_mode = mode.driving
+          result.forward_speed = 1
+        end
+
+        functions.process_way = way_function
+        return functions
+        """
+        When I run "osrm-extract --profile {profile_file} {osm_file} --verbosity NONE"
+        Then it should exit successfully
+        And stdout should not contain "[info]"
+        And stdout should not contain "[error]"
+        And stdout should not contain "10%"
+        And stderr should be empty

features/options/extract/version.feature

@@ -8,7 +8,7 @@ Feature: osrm-extract command line options: version
         Given the profile "testbot"
     
     Scenario: osrm-extract - Version, short
-        When I run "osrm-extract --v"
+        When I run "osrm-extract -v"
         Then stderr should be empty
         And stdout should contain 1 line
         And stdout should contain /(v\d{1,2}\.\d{1,2}\.\d{1,2}|\w*-\d+-\w+)/

features/options/partition/help.feature

@@ -8,6 +8,7 @@ Feature: osrm-partition command line options: help
         And stdout should contain "Options:"
         And stdout should contain "--version"
         And stdout should contain "--help"
+        And stdout should contain "--verbosity"
         And stdout should contain "Configuration:"
         And stdout should contain "--threads"
         And stdout should contain "--balance"
@@ -24,6 +25,7 @@ Feature: osrm-partition command line options: help
         And stdout should contain "Options:"
         And stdout should contain "--version"
         And stdout should contain "--help"
+        And stdout should contain "--verbosity"
         And stdout should contain "Configuration:"
         And stdout should contain "--threads"
         And stdout should contain "--balance"
@@ -40,6 +42,7 @@ Feature: osrm-partition command line options: help
         And stdout should contain "Options:"
         And stdout should contain "--version"
         And stdout should contain "--help"
+        And stdout should contain "--verbosity"
         And stdout should contain "Configuration:"
         And stdout should contain "--threads"
         And stdout should contain "--balance"

features/options/partition/version.feature

@@ -5,7 +5,7 @@ Feature: osrm-partition command line options: version
         Given the profile "testbot"
 
     Scenario: osrm-partition - Version, short
-        When I run "osrm-partition --v"
+        When I run "osrm-partition -v"
         Then stderr should be empty
         And stdout should contain 1 line
         And stdout should contain /(v\d{1,2}\.\d{1,2}\.\d{1,2}|\w*-\d+-\w+)/

features/options/profiles/invalid_version.feature

@@ -24,7 +24,7 @@ Feature: Invalid profile API versions
     Scenario: Profile API version too high
         Given the profile file
           """
-          api_version = 3
+          api_version = 4
           """
         And the node map
           """

features/options/profiles/version3.feature

@@ -0,0 +1,119 @@
+Feature: Profile API version 3
+
+    Background:
+        Given a grid size of 100 meters
+
+    Scenario: Basic profile function calls and property values
+        Given the profile file
+            """
+            api_version = 3
+
+            Set = require('lib/set')
+            Sequence = require('lib/sequence')
+            Handlers = require("lib/way_handlers")
+            find_access_tag = require("lib/access").find_access_tag
+            limit = require("lib/maxspeed").limit
+
+
+            function setup()
+              return {
+                properties = {
+                  max_speed_for_map_matching      = 180/3.6,
+                  use_turn_restrictions           = true,
+                  continue_straight_at_waypoint   = true,
+                  weight_name                     = 'test_version2',
+                  weight_precision                = 2
+                }
+              }
+            end
+
+            function process_node(profile, node, result, relations)
+              print ('process_node ' .. node:id())
+            end
+
+            function process_way(profile, way, result, relations)
+              result.name = way:get_value_by_key('name')
+              result.weight = 10
+              result.forward_mode = mode.driving
+              result.backward_mode = mode.driving
+              result.forward_speed = 36
+              result.backward_speed = 36
+
+              for _, r in ipairs(relations) do 
+                for k, v in pairs(r) do 
+                  print('data_' .. k .. '_value_' .. v)
+                end 
+              end
+              print ('process_way ' .. way:id() .. ' ' .. result.name)
+            end
+
+            function process_relation(profile, relation, result)
+              local t = relation:get_value_by_key("type")
+              if t == "route" then
+                for _, m in ipairs(relation:members()) do
+                  if m:role() == "north" then
+                    result[m]['direction'] = 'north'
+                    print('direction_north')
+                  end
+                end
+
+                print('route_relation')
+              end
+
+              print ('process_relation ' .. relation:id())
+            end
+
+            function process_turn (profile, turn)
+              print('process_turn', turn.angle, turn.turn_type, turn.direction_modifier, turn.has_traffic_light)
+              turn.weight = turn.angle == 0 and 0 or 4.2
+              turn.duration = turn.weight
+            end
+
+            function process_segment (profile, segment)
+                print ('process_segment ' .. segment.source.lon .. ' ' .. segment.source.lat)
+            end
+
+            return {
+              setup = setup,
+              process_node = process_node,
+              process_way = process_way,
+              process_relation = process_relation,
+              process_segment = process_segment,
+              process_turn = process_turn
+            }
+            """
+        And the node map
+            """
+               a
+              bcd
+               e
+            """
+        And the ways
+            | nodes  |
+            | ac     |
+            | cb     |
+            | cd     |
+            | ce     |
+
+        And the relations
+            | type        | way:north | route |
+            | route       | ac        | road  |
+
+        And the data has been saved to disk
+
+        When I run "osrm-extract --profile {profile_file} {osm_file}"
+        Then it should exit successfully
+        And stdout should contain "process_relation"
+        And stdout should contain "route_relation"
+        And stdout should contain "direction_north"
+        And stdout should contain "data_direction_value_north"
+        And stdout should contain "process_node"
+        And stdout should contain "process_way"
+        And stdout should contain "process_turn"
+        And stdout should contain "process_segment"
+
+        When I route I should get
+           | from | to | route    | time  |
+           | a    | b  | ac,cb,cb | 19.2s |
+           | a    | d  | ac,cd,cd | 19.2s |
+           | a    | e  | ac,ce    | 20s   |

features/options/routed/help.feature

@@ -11,6 +11,7 @@ Feature: osrm-routed command line options: help
         And stdout should contain "Options:"
         And stdout should contain "--version"
         And stdout should contain "--help"
+        And stdout should contain "--verbosity"
         And stdout should contain "--trial"
         And stdout should contain "Configuration:"
         And stdout should contain "--ip"
@@ -30,6 +31,7 @@ Feature: osrm-routed command line options: help
         And stdout should contain "Options:"
         And stdout should contain "--version"
         And stdout should contain "--help"
+        And stdout should contain "--verbosity"
         And stdout should contain "--trial"
         And stdout should contain "Configuration:"
         And stdout should contain "--ip"
@@ -49,6 +51,7 @@ Feature: osrm-routed command line options: help
         And stdout should contain "Options:"
         And stdout should contain "--version"
         And stdout should contain "--help"
+        And stdout should contain "--verbosity"
         And stdout should contain "--trial"
         And stdout should contain "Configuration:"
         And stdout should contain "--ip"

features/options/routed/version.feature

@@ -8,7 +8,7 @@ Feature: osrm-routed command line options: version
         Given the profile "testbot"
     
     Scenario: osrm-routed - Version, short
-        When I run "osrm-routed --v"
+        When I run "osrm-routed -v"
         Then stderr should be empty
         And stdout should contain 1 line
         And stdout should contain /(v\d{1,2}\.\d{1,2}\.\d{1,2}|\w*-\d+-\w+)/

features/step_definitions/distance_matrix.js

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

features/testbot/alternative_loop.feature

@@ -31,7 +31,10 @@ Feature: Alternative route
             | 5    | 6  | dc,ca,ab,bd,dc,dc |             |
             | 7    | 8  | ca,ab,bd,dc,ca,ca |             |
 
-    @4111
+    # This test case does not work in a platform independent way
+    # since it depends on a specific CH structure that is only
+    # present on linux it seems.
+    @4111 @todo
     Scenario: Alternative Loop Paths with single node path
         Given the node map
             """

features/testbot/approaches.feature

@@ -167,7 +167,7 @@ Feature: Approach parameter
             | s    | e  | unrestricted curb |       |
 
 
-    Scenario: UTurn test, router can found a route because he can use the roundabout
+    Scenario: UTurn test, router can find a route because he can use the roundabout
         Given the node map
             """
                              h

features/testbot/bearing_param.feature

@@ -67,8 +67,8 @@ Feature: Bearing parameter
             | from | to | bearings | route       | bearing                    |
             | 0    | b  | 10 10    | bc,bc       | 0->0,0->0                  |
             | 0    | b  | 90 90    | ab,ab       | 0->90,90->0                |
-            | 0    | b  | 170 170  | da,da       | 0->0,0->0                  |
-            | 0    | b  | 189 189  | da,da       | 0->0,0->0                  |
+            | 0    | b  | 170 170  | da,da       | 0->180,180->0              |
+            | 0    | b  | 189 189  | da,da       | 0->180,180->0              |
             | 0    | 1  | 90 270   | ab,cd,cd    | 0->90,90->0,270->0         |
             | 1    | 2  | 10 10    | bc,bc       | 0->0,0->0                  |
             | 1    | 2  | 90 90    | ab,cd,ab,ab | 0->90,90->0,270->180,90->0 |
@@ -108,12 +108,12 @@ Feature: Bearing parameter
             | ha    | yes    | ring |
 
         When I route I should get
-            | from | to | bearings | route        | bearing               |
-            | 0    | q  | 0 90     | ia,ring,ring | 0->0,0->90,90->0      |
-            | 0    | a  | 45 90    | jb,ring,ring | 0->45,45->180,90->0   |
-            | 0    | q  | 90 90    | kc,ring,ring | 0->90,90->180,90->0   |
-            | 0    | a  | 135 90   | ld,ring,ring | 0->135,135->270,90->0 |
-            | 0    | a  | 180 90   | me,ring,ring | 0->180,180->270,90->0 |
-            | 0    | a  | 225 90   | nf,ring,ring | 0->225,225->0,90->0   |
-            | 0    | a  | 270 90   | og,ring,ring | 0->270,270->0,90->0   |
-            | 0    | a  | 315 90   | ph,ring,ring | 0->315,315->90,90->0  |
+            | from | to | bearings | route                  | bearing                             |
+            | 0    | q  | 0 90     | ia,ring,ring,ring,ring | 0->0,0->90,180->270,270->0,90->0    |
+            | 0    | a  | 45 90    | jb,ring,ring,ring,ring | 0->45,45->180,180->270,270->0,90->0 |
+            | 0    | q  | 90 90    | kc,ring,ring,ring      | 0->90,90->180,270->0,90->0          |
+            | 0    | a  | 135 90   | ld,ring,ring,ring      | 0->135,135->270,270->0,90->0        |
+            | 0    | a  | 180 90   | me,ring,ring,ring      | 0->180,180->270,270->0,90->0        |
+            | 0    | a  | 225 90   | nf,ring,ring           | 0->225,225->0,90->0                 |
+            | 0    | a  | 270 90   | og,ring,ring           | 0->270,270->0,90->0                 |
+            | 0    | a  | 315 90   | ph,ring,ring           | 0->315,315->90,90->0                |

features/testbot/datastore.feature

@@ -1,35 +0,0 @@
-@routing @datastore @testbot
-Feature: Temporary tests related to osrm-datastore
-
-    Background:
-        Given the profile "testbot"
-
-    Scenario: Scenario ab
-        Given the node map
-            """
-            a b
-            """
-
-        And the ways
-            | nodes |
-            | ab    |
-
-        When I route I should get
-            | from | to | route |
-            | a    | b  | ab,ab |
-            | b    | a  | ab,ab |
-
-    Scenario: Scenaria xy
-        Given the node map
-            """
-            x y
-            """
-
-        And the ways
-            | nodes |
-            | xy    |
-
-        When I route I should get
-            | from | to | route |
-            | x    | y  | xy,xy |
-            | y    | x  | xy,xy |

features/testbot/distance.feature

@@ -226,23 +226,3 @@ Feature: Distance calculation
             | x    | v  | xv,xv | 424m +-1 |
             | x    | w  | xw,xw | 360m +-1 |
             | x    | y  | xy,xy | 316m +-1 |
-
-    @maze
-    Scenario: Distance of a maze of short segments
-        Given a grid size of 7 meters
-        Given the node map
-            """
-            a b s t
-            d c r q
-            e f o p
-            h g n m
-            i j k l
-            """
-
-        And the ways
-            | nodes                |
-            | abcdefghijklmnopqrst |
-
-        When I route I should get
-            | from | to | route                                     | distance |
-            | a    | t  | abcdefghijklmnopqrst,abcdefghijklmnopqrst | 133m +-1 |

features/testbot/distance_matrix.feature

@@ -41,6 +41,17 @@ Feature: Basic Distance Matrix
             | c | 30 | 20 | 0  | 30 |
             | d | 60 | 50 | 30 | 0  |
 
+        When I request a travel time matrix I should get
+            |   | a  | b  | c  | d  |
+            | a | 0  | 10 | 30 | 60 |
+
+        When I request a travel time matrix I should get
+            |   |  a |
+            | a |  0 |
+            | b | 10 |
+            | c | 30 |
+            | d | 60 |
+
     Scenario: Testbot - Travel time matrix with fuzzy match
         Given the node map
             """
@@ -132,6 +143,13 @@ Feature: Basic Distance Matrix
             |   | a | b  | e  | f  |
             | a | 0 | 10 | 20 | 30 |
 
+        When I request a travel time matrix I should get
+            |   |  a |
+            | a |  0 |
+            | b | 10 |
+            | e | 20 |
+            | f | 30 |
+
      Scenario: Testbot - Travel time 3x2 matrix
         Given the node map
             """
@@ -308,3 +326,52 @@ Feature: Basic Distance Matrix
           | 6 |   7 |   6 |  10 |   9 |    1 |   0 | 3.9 | 2.9 |
           | 7 | 3.1 | 2.1 | 6.1 | 5.1 |  9.1 | 8.1 |   0 |  11 |
           | 8 | 4.1 | 3.1 | 7.1 | 6.1 | 10.1 | 9.1 |   1 | 0   |
+
+
+    Scenario: Testbot - Travel time matrix with ties
+        Given the profile file
+        """
+        local functions = require('testbot')
+        functions.process_segment = function(profile, segment)
+          segment.weight = 1
+          segment.duration = 1
+        end
+        functions.process_turn = function(profile, turn)
+          if turn.angle >= 0 then
+            turn.duration = 16
+          else
+            turn.duration = 4
+          end
+          turn.weight = 0
+        end
+        return functions
+        """
+        And the node map
+            """
+            a     b
+
+            c     d
+            """
+
+        And the ways
+          | nodes |
+          | ab    |
+          | ac    |
+          | bd    |
+          | dc    |
+
+
+        When I route I should get
+          | from | to | route | distance | time | weight |
+          | a    | c  | ac,ac | 200m     | 5s   |      5 |
+
+        When I request a travel time matrix I should get
+          |   | a | b | c |  d |
+          | a | 0 | 1 | 5 | 10 |
+
+        When I request a travel time matrix I should get
+          |   |  a |
+          | a |  0 |
+          | b |  1 |
+          | c | 15 |
+          | d | 10 |

features/testbot/duration.feature

@@ -21,12 +21,12 @@ Feature: Durations
             | ef    | primary | 01:02:03 |
 
         When I route I should get
-            | from | to | route | distance | time       |
-            | a    | b  | ab,ab | 100m +-1 | 60s +-1    |
-            | b    | c  | bc,bc | 200m +-1 | 600s +-1   |
-            | c    | d  | cd,cd | 300m +-1 | 3600s +-1  |
-            | d    | e  | de,de | 141m +-2 | 36000s +-1 |
-            | e    | f  | ef,ef | 224m +-2 | 3723s +-1  |
+            | from | to | route | time       |
+            | a    | b  | ab,ab | 60s +-1    |
+            | b    | c  | bc,bc | 600s +-1   |
+            | c    | d  | cd,cd | 3600s +-1  |
+            | d    | e  | de,de | 36000s +-1 |
+            | e    | f  | ef,ef | 3723s +-1  |
 
     @todo
     Scenario: Partial duration of ways
@@ -40,7 +40,7 @@ Feature: Durations
             | abc   | primary | 0:01     |
 
         When I route I should get
-            | from | to | route   | distance | time    |
-            | a    | c  | abc,abc | 300m +-1 | 60s +-1 |
-            | a    | b  | ab,ab   | 100m +-1 | 20s +-1 |
-            | b    | c  | bc,bc   | 200m +-1 | 40s +-1 |
+            | from | to | route   | time    |
+            | a    | c  | abc,abc | 60s +-1 |
+            | a    | b  | ab,ab   | 20s +-1 |
+            | b    | c  | bc,bc   | 40s +-1 |

features/testbot/exclude.feature

@@ -0,0 +1,99 @@
+@routing @testbot @exclude
+Feature: Testbot - Exclude flags
+    Background:
+        Given the profile "testbot"
+        Given the node map
+            """
+            a....b-----c-$-$-d
+                 $     $     :
+                 e.$.$.f.....g
+            """
+
+        And the ways
+            | nodes | highway  | toll | #                                                                        |
+            | ab    | primary  |      | always drivable                                                          |
+            | bc    | motorway |      | not drivable for exclude=motorway and exclude=motorway,toll              |
+            | be    | primary  | yes  | not drivable for exclude=toll and exclude=motorway,toll                  |
+            | ef    | primary  | yes  | not drivable for exclude=toll and exclude=motorway,toll                  |
+            | fc    | primary  | yes  | not drivable for exclude=toll and exclude=motorway,toll                  |
+            | cd    | motorway | yes  | not drivable for exclude=motorway exclude=toll and exclude=motorway,toll |
+            | fg    | primary  |      | always drivable                                                          |
+            | gd    | primary  |      | always drivable                                                          |
+
+    Scenario: Testbot - exclude nothing
+        When I route I should get
+            | from | to | route          |
+            | a    | d  | ab,bc,cd,cd    |
+            | a    | g  | ab,be,ef,fg,fg |
+            | a    | c  | ab,bc,bc       |
+            | a    | f  | ab,be,ef,ef    |
+
+        When I match I should get
+            | trace | matchings | duration |
+            | ad    | ad        | 115      |
+
+        When I request a travel time matrix I should get
+            |   | a   | d   |
+            | a | 0   | 115 |
+            | d | 115 | 0   |
+
+    Scenario: Testbot - exclude motorway
+        Given the query options
+            | exclude  | motorway        |
+
+        When I route I should get
+            | from | to | route             |
+            | a    | d  | ab,be,ef,fg,gd,gd |
+            | a    | g  | ab,be,ef,fg,fg    |
+            | a    | c  | ab,be,ef,fc,fc    |
+            | a    | f  | ab,be,ef,ef       |
+
+        When I match I should get
+            | trace | matchings | duration |
+            | ad    | ad        | 125      |
+
+        When I request a travel time matrix I should get
+            |   | a   | d  |
+            | a | 0   | 125 |
+            | d | 125 | 0  |
+
+    Scenario: Testbot - exclude toll
+        Given the query options
+            | exclude | toll |
+
+        When I route I should get
+            | from | to | route    |
+            | a    | d  |          |
+            | a    | g  |          |
+            | a    | c  | ab,bc,bc |
+            | a    | f  |          |
+            | f    | d  | fg,gd,gd |
+
+    Scenario: Testbot - exclude motorway and toll
+        Given the query options
+            | exclude | motorway,toll |
+
+        When I route I should get
+            | from | to | route    |
+            | a    | d  |          |
+            | a    | g  |          |
+            | a    | c  |          |
+            | a    | f  |          |
+            | f    | d  | fg,gd,gd |
+
+    Scenario: Testbot - exclude with unsupported exclude combination
+        Given the query options
+            | exclude | TwoWords2 |
+
+        When I route I should get
+            | from | to | status | message   |
+            | a    | d  | 400    | Exclude flag combination is not supported. |
+
+    Scenario: Testbot - exclude with invalid exclude class name
+        Given the query options
+            | exclude | foo |
+
+        When I route I should get
+            | from | to | status | message   |
+            | a    | d  | 400    | Exclude flag combination is not supported. |
+

features/testbot/oneway.feature

@@ -5,51 +5,6 @@ Feature: Testbot - oneways
         Given the profile "testbot"
         Given a grid size of 250 meters
 
-    Scenario: Routing on a oneway roundabout
-        Given the node map
-        """
-                v
-        x   d c
-          e     b
-          f     a
-            g h   y
-          z
-        """
-
-        And the ways
-            | nodes | oneway |
-            | ab    | yes    |
-            | bc    | yes    |
-            | cd    | yes    |
-            | de    | yes    |
-            | ef    | yes    |
-            | fg    | yes    |
-            | gh    | yes    |
-            | ha    | yes    |
-            | vx    | yes    |
-            | vy    | yes    |
-            | yz    | yes    |
-            | xe    | yes    |
-
-        When I route I should get
-            | from | to | route                   |
-            | a    | b  | ab,ab                   |
-            | b    | c  | bc,bc                   |
-            | c    | d  | cd,cd                   |
-            | d    | e  | de,de                   |
-            | e    | f  | ef,ef                   |
-            | f    | g  | fg,fg                   |
-            | g    | h  | gh,gh                   |
-            | h    | a  | ha,ha                   |
-            | b    | a  | bc,cd,de,ef,fg,gh,ha,ha |
-            | c    | b  | cd,de,ef,fg,gh,ha,ab,ab |
-            | d    | c  | de,ef,fg,gh,ha,ab,bc,bc |
-            | e    | d  | ef,fg,gh,ha,ab,bc,cd,cd |
-            | f    | e  | fg,gh,ha,ab,bc,cd,de,de |
-            | g    | f  | gh,ha,ab,bc,cd,de,ef,ef |
-            | h    | g  | ha,ab,bc,cd,de,ef,fg,fg |
-            | a    | h  | ab,bc,cd,de,ef,fg,gh,gh |
-
     Scenario: Testbot - Simple oneway
         Then routability should be
             | highway | foot | oneway | forw | backw |
@@ -60,27 +15,6 @@ Feature: Testbot - oneways
             | highway | foot | oneway | forw | backw |
             | primary | no   | -1     |      | x     |
 
-    Scenario: Testbot - Around the Block
-        Given the node map
-            """
-              a b
-            e d c f
-            """
-
-        And the ways
-            | nodes | oneway | foot |
-            | ab    | yes    | no   |
-            | bc    |        | no   |
-            | cd    |        | no   |
-            | da    |        | no   |
-            | de    |        | no   |
-            | cf    |        | no   |
-
-        When I route I should get
-            | from | to | route       |
-            | a    | b  | ab,ab       |
-            | b    | a  | bc,cd,da,da |
-
     Scenario: Testbot - Handle various oneway tag values
         Then routability should be
             | foot | oneway   | forw | backw |
@@ -93,19 +27,3 @@ Feature: Testbot - oneways
             | no   | true     | x    |       |
             | no   | 1        | x    |       |
             | no   | -1       |      | x     |
-
-    Scenario: Testbot - Two consecutive oneways
-        Given the node map
-            """
-            a b c
-            """
-
-        And the ways
-            | nodes | oneway |
-            | ab    | yes    |
-            | bc    | yes    |
-
-
-        When I route I should get
-            | from | to | route    |
-            | a    | c  | ab,bc,bc |

features/testbot/penalty.feature

@@ -26,6 +26,33 @@ Feature: Penalties
             | a    | c  | abc,abc | 20s +-1 | 200m +-1 |
             | d    | f  | def,def | 27s +-1 | 200m +-1 |
 
+    # Penalties not on the phantom nodes
+    Scenario: Traffic signals should incur a delay, without changing distance
+        Given the node map
+            """
+            a b c d e
+            f g h i j
+            """
+
+        And the nodes
+            | node | highway         |
+            | c    | traffic_signals |
+
+        And the ways
+            | nodes |
+            | ab    |
+            | bcd   |
+            | de    |
+            | fg    |
+            | ghi   |
+            | ij    |
+
+        When I route I should get
+            | from | to | route     | time    | distance |
+            | a    | e  | ab,bcd,de | 47s +-1 | 400m +-1 |
+            | f    | j  | fg,ghi,ij | 40s +-1 | 400m +-1 |
+
+
     Scenario: Signal penalty should not depend on way type
         Given the node map
             """
@@ -72,55 +99,35 @@ Feature: Penalties
             | from | to | route       | time    |
             | a    | e  | abcde,abcde | 61s +-1 |
 
-        @todo
-        Scenario: Signal penalty should not depend on way type
-            Given the node map
-                """
-                a b c
-                d e f
-                g h i
-                """
+    @todo
+    Scenario: Signal penalty should not depend on way type
+        Given the node map
+            """
+            a b c
+            d e f
+            g h i
+            """
 
-            And the nodes
-                | node | highway         |
-                | b    | traffic_signals |
-                | e    | traffic_signals |
-                | h    | traffic_signals |
+        And the nodes
+            | node | highway         |
+            | b    | traffic_signals |
+            | e    | traffic_signals |
+            | h    | traffic_signals |
 
-            And the ways
-                | nodes | highway   |
-                | abc   | primary   |
-                | def   | secondary |
-                | ghi   | tertiary  |
+        And the ways
+            | nodes | highway   |
+            | abc   | primary   |
+            | def   | secondary |
+            | ghi   | tertiary  |
 
-            When I route I should get
-                | from | to | route   | time    |
-                | a    | b  | abc,abc | 10s +-1 |
-                | a    | c  | abc,abc | 27s +-1 |
-                | d    | e  | def,def | 20s +-1 |
-                | d    | f  | def,def | 47s +-1 |
-                | g    | h  | ghi,ghi | 30s +-1 |
-                | g    | i  | ghi,ghi | 67s +-1 |
-
-        Scenario: Passing multiple traffic signals should incur a accumulated delay
-            Given the node map
-                """
-                a b c d e
-                """
-
-            And the nodes
-                | node | highway         |
-                | b    | traffic_signals |
-                | c    | traffic_signals |
-                | d    | traffic_signals |
-
-            And the ways
-                | nodes |
-                | abcde |
-
-            When I route I should get
-                | from | to | route       | time    |
-                | a    | e  | abcde,abcde | 61s +-1 |
+        When I route I should get
+            | from | to | route   | time    |
+            | a    | b  | abc,abc | 10s +-1 |
+            | a    | c  | abc,abc | 27s +-1 |
+            | d    | e  | def,def | 20s +-1 |
+            | d    | f  | def,def | 47s +-1 |
+            | g    | h  | ghi,ghi | 30s +-1 |
+            | g    | i  | ghi,ghi | 67s +-1 |
 
     @todo
     Scenario: Starting or ending at a traffic signal should not incur a delay

features/testbot/traffic_speeds.feature

@@ -167,4 +167,3 @@ Feature: Traffic - speeds
         And the data has been extracted
         When I try to run "osrm-contract --segment-speed-file {speeds_file} {processed_file}"
         And it should exit successfully
-

features/testbot/weight.feature

@@ -379,3 +379,36 @@ Feature: Weight tests
             | a,d       | abcd,abcd  | 59.9m    | 6.996,0       | 7s,0s    |
             | a,e       | abcd,ce,ce | 60.1m    | 6.005,2.002,0 | 6s,2s,0s |
             | d,e       | abcd,ce,ce | 39.9m    | 1.991,2.002,0 | 2s,2s,0s |
+
+    @traffic @speed
+    Scenario: Updating speeds without affecting weights.
+        Given the profile file "testbot" initialized with
+        """
+        profile.properties.weight_precision = 3
+        """
+
+        And the node map
+            """
+            a-----------b
+             \         /
+                c----d
+            """
+        And the ways
+            | nodes | highway       | maxspeed |
+            | ab    | living_street | 5        |
+            | acdb  | motorway      | 100      |
+
+        # Note the comma on the last column - this indicates 'keep existing weight value'
+        And the speed file
+            """
+            1,2,100,
+            1,3,5,,junk
+            3,4,5,,
+            4,2,5,
+            """
+        And the contract extra arguments "--segment-speed-file {speeds_file}"
+        And the customize extra arguments "--segment-speed-file {speeds_file}"
+
+        When I route I should get
+            | waypoints | route      | distance | weights       | times    |
+            | a,b       | acdb,acdb  | 78.3m    | 11.744,0      | 56.4s,0s  |

include/contractor/contract_excludable_graph.hpp

@@ -0,0 +1,87 @@
+#ifndef OSRM_CONTRACTOR_CONTRACT_EXCLUDABLE_GRAPH_HPP
+#define OSRM_CONTRACTOR_CONTRACT_EXCLUDABLE_GRAPH_HPP
+
+#include "contractor/contracted_edge_container.hpp"
+#include "contractor/contractor_graph.hpp"
+#include "contractor/graph_contractor.hpp"
+#include "contractor/graph_contractor_adaptors.hpp"
+#include "contractor/query_graph.hpp"
+
+namespace osrm
+{
+namespace contractor
+{
+
+using GraphFilterAndCore =
+    std::tuple<QueryGraph, std::vector<std::vector<bool>>, std::vector<std::vector<bool>>>;
+
+inline auto contractExcludableGraph(ContractorGraph contractor_graph_,
+                                    std::vector<EdgeWeight> node_weights,
+                                    const std::vector<std::vector<bool>> &filters,
+                                    const float core_factor = 1.0)
+{
+    auto num_nodes = contractor_graph_.GetNumberOfNodes();
+    ContractedEdgeContainer edge_container;
+    ContractorGraph shared_core_graph;
+    std::vector<bool> is_shared_core;
+    {
+        ContractorGraph contractor_graph = std::move(contractor_graph_);
+        std::vector<bool> always_allowed(num_nodes, true);
+        for (const auto &filter : filters)
+        {
+            for (const auto node : util::irange<NodeID>(0, num_nodes))
+            {
+                always_allowed[node] = always_allowed[node] && filter[node];
+            }
+        }
+
+        // By not contracting all contractable nodes we avoid creating
+        // a very dense core. This increases the overall graph sizes a little bit
+        // but increases the final CH quality and contraction speed.
+        constexpr float BASE_CORE = 0.9;
+        is_shared_core = contractGraph(contractor_graph,
+                                       std::move(always_allowed),
+                                       node_weights,
+                                       std::min<float>(BASE_CORE, core_factor));
+
+        // Add all non-core edges to container
+        {
+            auto non_core_edges = toEdges<QueryEdge>(contractor_graph);
+            auto new_end =
+                std::remove_if(non_core_edges.begin(), non_core_edges.end(), [&](const auto &edge) {
+                    return is_shared_core[edge.source] && is_shared_core[edge.target];
+                });
+            non_core_edges.resize(new_end - non_core_edges.begin());
+            edge_container.Insert(std::move(non_core_edges));
+        }
+
+        // Extract core graph for further contraction
+        shared_core_graph = contractor_graph.Filter(
+            [&is_shared_core](const NodeID node) { return is_shared_core[node]; });
+    }
+
+    std::vector<std::vector<bool>> cores;
+    for (const auto &filter : filters)
+    {
+        auto filtered_core_graph =
+            shared_core_graph.Filter([&filter](const NodeID node) { return filter[node]; });
+
+        auto core = contractGraph(
+            filtered_core_graph, is_shared_core, is_shared_core, node_weights, core_factor);
+        if (core_factor == 1.0)
+        {
+            core.clear();
+        }
+        cores.push_back(std::move(core));
+
+        edge_container.Merge(toEdges<QueryEdge>(std::move(filtered_core_graph)));
+    }
+
+    return GraphFilterAndCore{QueryGraph{num_nodes, std::move(edge_container.edges)},
+                              edge_container.MakeEdgeFilters(),
+                              std::move(cores)};
+}
+}
+}
+
+#endif

include/contractor/contracted_edge_container.hpp

@@ -0,0 +1,153 @@
+#ifndef OSRM_CONTRACTOR_CONTRACTED_EDGE_CONTAINER_HPP
+#define OSRM_CONTRACTOR_CONTRACTED_EDGE_CONTAINER_HPP
+
+#include "contractor/query_edge.hpp"
+#include "util/deallocating_vector.hpp"
+
+#include <climits>
+
+namespace osrm
+{
+namespace contractor
+{
+
+struct ContractedEdgeContainer
+{
+  private:
+    using MergedFlags = std::uint8_t;
+    static constexpr auto ALL_FLAGS = 0xFF;
+
+    static bool mergeCompare(const QueryEdge &lhs, const QueryEdge &rhs)
+    {
+        return std::tie(lhs.source,
+                        lhs.target,
+                        lhs.data.shortcut,
+                        lhs.data.turn_id,
+                        lhs.data.weight,
+                        lhs.data.duration,
+                        lhs.data.forward,
+                        lhs.data.backward) < std::tie(rhs.source,
+                                                      rhs.target,
+                                                      rhs.data.shortcut,
+                                                      rhs.data.turn_id,
+                                                      rhs.data.weight,
+                                                      rhs.data.duration,
+                                                      rhs.data.forward,
+                                                      rhs.data.backward);
+    }
+
+    static bool mergable(const QueryEdge &lhs, const QueryEdge &rhs)
+    {
+        // only true if both are equal
+        return !mergeCompare(lhs, rhs) && !mergeCompare(rhs, lhs);
+    }
+
+  public:
+    void Insert(util::DeallocatingVector<QueryEdge> new_edges)
+    {
+        BOOST_ASSERT(edges.size() == 0);
+        BOOST_ASSERT(flags.empty());
+
+        edges = std::move(new_edges);
+        flags.resize(edges.size(), ALL_FLAGS);
+    }
+
+    void Merge(util::DeallocatingVector<QueryEdge> new_edges)
+    {
+        BOOST_ASSERT(index < sizeof(MergedFlags) * CHAR_BIT);
+
+        const MergedFlags flag = 1 << index++;
+
+        std::vector<MergedFlags> merged_flags;
+        merged_flags.reserve(flags.size() * 1.1);
+        util::DeallocatingVector<QueryEdge> merged_edges;
+        merged_edges.reserve(edges.size() * 1.1);
+
+        auto flags_iter = flags.begin();
+        // destructive iterators, this is single-pass only
+        // FIXME using dbegin() dend() will result in segfaults.
+        auto edges_iter = edges.dbegin();
+        auto edges_end = edges.dend();
+        auto new_edges_iter = new_edges.dbegin();
+        auto new_edges_end = new_edges.dend();
+
+        while (edges_iter != edges_end && new_edges_iter != new_edges_end)
+        {
+            while (edges_iter != edges_end && mergeCompare(*edges_iter, *new_edges_iter))
+            {
+                merged_edges.push_back(*edges_iter);
+                merged_flags.push_back(*flags_iter);
+                edges_iter++;
+                flags_iter++;
+            }
+
+            if (edges_iter == edges_end)
+            {
+                break;
+            }
+
+            while (new_edges_iter != new_edges_end && mergeCompare(*new_edges_iter, *edges_iter))
+            {
+                merged_edges.push_back(*new_edges_iter);
+                merged_flags.push_back(flag);
+                new_edges_iter++;
+            }
+
+            if (new_edges_iter == new_edges_end)
+            {
+                break;
+            }
+
+            while (edges_iter != edges_end && new_edges_iter != new_edges_end &&
+                   mergable(*edges_iter, *new_edges_iter))
+            {
+                merged_edges.push_back(*edges_iter);
+                merged_flags.push_back(*flags_iter | flag);
+
+                edges_iter++;
+                flags_iter++;
+                new_edges_iter++;
+            }
+        }
+
+        while (edges_iter != edges_end)
+        {
+            BOOST_ASSERT(new_edges_iter == new_edges_end);
+            merged_edges.push_back(*edges_iter++);
+            merged_flags.push_back(*flags_iter++);
+        }
+
+        while (new_edges_iter != new_edges_end)
+        {
+            BOOST_ASSERT(edges_iter == edges_end);
+            merged_edges.push_back(*new_edges_iter++);
+            merged_flags.push_back(flag);
+        }
+
+        flags = std::move(merged_flags);
+        edges = std::move(merged_edges);
+    }
+
+    auto MakeEdgeFilters() const
+    {
+        std::vector<std::vector<bool>> filters(index);
+        for (const auto flag_index : util::irange<std::size_t>(0, index))
+        {
+            MergedFlags mask = 1 << flag_index;
+            for (const auto flag : flags)
+            {
+                filters[flag_index].push_back(flag & mask);
+            }
+        }
+
+        return filters;
+    }
+
+    std::size_t index = 0;
+    std::vector<MergedFlags> flags;
+    util::DeallocatingVector<QueryEdge> edges;
+};
+}
+}
+
+#endif

include/contractor/contractor_config.hpp

@@ -43,12 +43,9 @@ namespace contractor
 struct ContractorConfig final : storage::IOConfig
 {
     ContractorConfig()
-        : IOConfig(
-              {
-                  ".osrm",
-              },
-              {},
-              {".osrm.level", ".osrm.core", ".osrm.hsgr", ".osrm.enw"}),
+        : IOConfig({".osrm.ebg", ".osrm.ebg_nodes", ".osrm.properties"},
+                   {},
+                   {".osrm.level", ".osrm.core", ".osrm.hsgr", ".osrm.enw"}),
           requested_num_threads(0)
     {
     }

include/contractor/contractor_dijkstra.hpp

@@ -1,50 +0,0 @@
-#ifndef OSRM_CONTRACTOR_DIJKSTRA_HPP
-#define OSRM_CONTRACTOR_DIJKSTRA_HPP
-
-#include "contractor/contractor_graph.hpp"
-#include "contractor/contractor_heap.hpp"
-#include "util/typedefs.hpp"
-
-#include <cstddef>
-
-namespace osrm
-{
-namespace contractor
-{
-
-// allow access to the heap itself, add Dijkstra functionality on top
-class ContractorDijkstra
-{
-  public:
-    ContractorDijkstra(std::size_t heap_size);
-
-    // search the graph up
-    void Run(const unsigned number_of_targets,
-             const int node_limit,
-             const int weight_limit,
-             const NodeID forbidden_node,
-             const ContractorGraph &graph);
-
-    // adaption of the heap interface
-    void Clear();
-    bool WasInserted(const NodeID node) const;
-    void Insert(const NodeID node,
-                const ContractorHeap::WeightType weight,
-                const ContractorHeap::DataType &data);
-
-    // cannot be const due to node-hash access in the binary heap :(
-    ContractorHeap::WeightType GetKey(const NodeID node);
-
-  private:
-    void RelaxNode(const NodeID node,
-                   const int node_weight,
-                   const NodeID forbidden_node,
-                   const ContractorGraph &graph);
-
-    ContractorHeap heap;
-};
-
-} // namespace contractor
-} // namespace osrm
-
-#endif // OSRM_CONTRACTOR_DIJKSTRA_HPP

include/contractor/contractor_graph.hpp

@@ -12,8 +12,7 @@ namespace contractor
 struct ContractorEdgeData
 {
     ContractorEdgeData()
-        : weight(0), duration(0), id(0), originalEdges(0), shortcut(0), forward(0), backward(0),
-          is_original_via_node_ID(false)
+        : weight(0), duration(0), id(0), originalEdges(0), shortcut(0), forward(0), backward(0)
     {
     }
     ContractorEdgeData(EdgeWeight weight,
@@ -24,18 +23,17 @@ struct ContractorEdgeData
                        bool forward,
                        bool backward)
         : weight(weight), duration(duration), id(id),
-          originalEdges(std::min((1u << 28) - 1u, original_edges)), shortcut(shortcut),
-          forward(forward), backward(backward), is_original_via_node_ID(false)
+          originalEdges(std::min((1u << 29) - 1u, original_edges)), shortcut(shortcut),
+          forward(forward), backward(backward)
     {
     }
     EdgeWeight weight;
     EdgeWeight duration;
     unsigned id;
-    unsigned originalEdges : 28;
+    unsigned originalEdges : 29;
     bool shortcut : 1;
     bool forward : 1;
     bool backward : 1;
-    bool is_original_via_node_ID : 1;
 };
 
 using ContractorGraph = util::DynamicGraph<ContractorEdgeData>;

include/contractor/contractor_search.hpp

@@ -0,0 +1,26 @@
+#ifndef OSRM_CONTRACTOR_SEARCH_HPP
+#define OSRM_CONTRACTOR_SEARCH_HPP
+
+#include "contractor/contractor_graph.hpp"
+#include "contractor/contractor_heap.hpp"
+
+#include "util/typedefs.hpp"
+
+#include <cstddef>
+
+namespace osrm
+{
+namespace contractor
+{
+
+void search(ContractorHeap &heap,
+            const ContractorGraph &graph,
+            const unsigned number_of_targets,
+            const int node_limit,
+            const EdgeWeight weight_limit,
+            const NodeID forbidden_node);
+
+} // namespace contractor
+} // namespace osrm
+
+#endif // OSRM_CONTRACTOR_DIJKSTRA_HPP

include/contractor/files.hpp

@@ -16,54 +16,85 @@ namespace files
 {
 // reads .osrm.core
 template <typename CoreVectorT>
-void readCoreMarker(const boost::filesystem::path &path, CoreVectorT &is_core_node)
+void readCoreMarker(const boost::filesystem::path &path, std::vector<CoreVectorT> &cores)
 {
     static_assert(util::is_view_or_vector<bool, CoreVectorT>::value,
-                  "is_core_node must be a vector");
+                  "cores must be a vector of boolean vectors");
     storage::io::FileReader reader(path, storage::io::FileReader::VerifyFingerprint);
 
-    storage::serialization::read(reader, is_core_node);
+    auto num_cores = reader.ReadElementCount64();
+    cores.resize(num_cores);
+    for (const auto index : util::irange<std::size_t>(0, num_cores))
+    {
+        storage::serialization::read(reader, cores[index]);
+    }
 }
 
 // writes .osrm.core
 template <typename CoreVectorT>
-void writeCoreMarker(const boost::filesystem::path &path, const CoreVectorT &is_core_node)
+void writeCoreMarker(const boost::filesystem::path &path, const std::vector<CoreVectorT> &cores)
 {
     static_assert(util::is_view_or_vector<bool, CoreVectorT>::value,
-                  "is_core_node must be a vector");
+                  "cores must be a vector of boolean vectors");
     storage::io::FileWriter writer(path, storage::io::FileWriter::GenerateFingerprint);
 
-    storage::serialization::write(writer, is_core_node);
+    writer.WriteElementCount64(cores.size());
+    for (const auto &core : cores)
+    {
+        storage::serialization::write(writer, core);
+    }
 }
 
 // reads .osrm.hsgr file
-template <typename QueryGraphT>
-inline void readGraph(const boost::filesystem::path &path, unsigned &checksum, QueryGraphT &graph)
+template <typename QueryGraphT, typename EdgeFilterT>
+inline void readGraph(const boost::filesystem::path &path,
+                      unsigned &checksum,
+                      QueryGraphT &graph,
+                      std::vector<EdgeFilterT> &edge_filter)
 {
     static_assert(std::is_same<QueryGraphView, QueryGraphT>::value ||
                       std::is_same<QueryGraph, QueryGraphT>::value,
                   "graph must be of type QueryGraph<>");
+    static_assert(std::is_same<EdgeFilterT, std::vector<bool>>::value ||
+                      std::is_same<EdgeFilterT, util::vector_view<bool>>::value,
+                  "edge_filter must be a container of vector<bool> or vector_view<bool>");
 
     const auto fingerprint = storage::io::FileReader::VerifyFingerprint;
     storage::io::FileReader reader{path, fingerprint};
 
     reader.ReadInto(checksum);
     util::serialization::read(reader, graph);
+    auto count = reader.ReadElementCount64();
+    edge_filter.resize(count);
+    for (const auto index : util::irange<std::size_t>(0, count))
+    {
+        storage::serialization::read(reader, edge_filter[index]);
+    }
 }
 
 // writes .osrm.hsgr file
-template <typename QueryGraphT>
-inline void
-writeGraph(const boost::filesystem::path &path, unsigned checksum, const QueryGraphT &graph)
+template <typename QueryGraphT, typename EdgeFilterT>
+inline void writeGraph(const boost::filesystem::path &path,
+                       unsigned checksum,
+                       const QueryGraphT &graph,
+                       const std::vector<EdgeFilterT> &edge_filter)
 {
     static_assert(std::is_same<QueryGraphView, QueryGraphT>::value ||
                       std::is_same<QueryGraph, QueryGraphT>::value,
                   "graph must be of type QueryGraph<>");
+    static_assert(std::is_same<EdgeFilterT, std::vector<bool>>::value ||
+                      std::is_same<EdgeFilterT, util::vector_view<bool>>::value,
+                  "edge_filter must be a container of vector<bool> or vector_view<bool>");
     const auto fingerprint = storage::io::FileWriter::GenerateFingerprint;
     storage::io::FileWriter writer{path, fingerprint};
 
     writer.WriteOne(checksum);
     util::serialization::write(writer, graph);
+    writer.WriteElementCount64(edge_filter.size());
+    for (const auto &filter : edge_filter)
+    {
+        storage::serialization::write(writer, filter);
+    }
 }
 
 // reads .levels file

include/contractor/graph_contractor.hpp

@@ -1,427 +1,41 @@
 #ifndef OSRM_CONTRACTOR_GRAPH_CONTRACTOR_HPP
 #define OSRM_CONTRACTOR_GRAPH_CONTRACTOR_HPP
 
-#include "contractor/contractor_dijkstra.hpp"
 #include "contractor/contractor_graph.hpp"
-#include "contractor/query_edge.hpp"
-#include "util/deallocating_vector.hpp"
-#include "util/integer_range.hpp"
-#include "util/log.hpp"
-#include "util/percent.hpp"
-#include "util/timing_util.hpp"
-#include "util/typedefs.hpp"
-#include "util/xor_fast_hash.hpp"
 
-#include <boost/assert.hpp>
+#include "util/filtered_graph.hpp"
 
-#include <tbb/enumerable_thread_specific.h>
-#include <tbb/parallel_for.h>
-#include <tbb/parallel_sort.h>
-
-#include <algorithm>
-#include <limits>
-#include <memory>
+#include <tuple>
 #include <vector>
 
-#if USE_STXXL_LIBRARY
-#include <stxxl/vector>
-#endif
-
 namespace osrm
 {
 namespace contractor
 {
 
-class GraphContractor
+std::vector<bool> contractGraph(ContractorGraph &graph,
+                                std::vector<bool> node_is_uncontracted,
+                                std::vector<bool> node_is_contractable,
+                                std::vector<EdgeWeight> node_weights,
+                                double core_factor = 1.0);
+
+// Overload for contracting all nodes
+inline auto contractGraph(ContractorGraph &graph,
+                          std::vector<EdgeWeight> node_weights,
+                          double core_factor = 1.0)
 {
-  private:
-#if USE_STXXL_LIBRARY
-    template <typename T> using ExternalVector = stxxl::vector<T>;
-#else
-    template <typename T> using ExternalVector = std::vector<T>;
-#endif
+    return contractGraph(graph, {}, {}, std::move(node_weights), core_factor);
+}
 
-    struct ContractorThreadData
-    {
-        ContractorDijkstra dijkstra;
-        std::vector<ContractorEdge> inserted_edges;
-        std::vector<NodeID> neighbours;
-        explicit ContractorThreadData(NodeID nodes) : dijkstra(nodes) {}
-    };
-
-    using NodeDepth = int;
-
-    struct ContractionStats
-    {
-        int edges_deleted_count;
-        int edges_added_count;
-        int original_edges_deleted_count;
-        int original_edges_added_count;
-        ContractionStats()
-            : edges_deleted_count(0), edges_added_count(0), original_edges_deleted_count(0),
-              original_edges_added_count(0)
-        {
-        }
-    };
-
-    struct RemainingNodeData
-    {
-        RemainingNodeData() : id(0), is_independent(false) {}
-        NodeID id : 31;
-        bool is_independent : 1;
-    };
-
-    struct ThreadDataContainer
-    {
-        explicit ThreadDataContainer(int number_of_nodes) : number_of_nodes(number_of_nodes) {}
-
-        inline ContractorThreadData *GetThreadData()
-        {
-            bool exists = false;
-            auto &ref = data.local(exists);
-            if (!exists)
-            {
-                // ref = std::make_shared<ContractorThreadData>(number_of_nodes);
-                ref = std::make_shared<ContractorThreadData>(4000);
-            }
-
-            return ref.get();
-        }
-
-        int number_of_nodes;
-        using EnumerableThreadData =
-            tbb::enumerable_thread_specific<std::shared_ptr<ContractorThreadData>>;
-        EnumerableThreadData data;
-    };
-
-  public:
-    GraphContractor(int nodes, std::vector<ContractorEdge> input_edge_list);
-
-    GraphContractor(int nodes,
-                    std::vector<ContractorEdge> edges,
-                    std::vector<float> node_levels_,
-                    std::vector<EdgeWeight> node_weights_);
-
-    /* Flush all data from the contraction to disc and reorder stuff for better locality */
-    void FlushDataAndRebuildContractorGraph(ThreadDataContainer &thread_data_list,
-                                            std::vector<RemainingNodeData> &remaining_nodes,
-                                            std::vector<float> &node_priorities);
-
-    void Run(double core_factor = 1.0);
-
-    std::vector<bool> GetCoreMarker();
-
-    std::vector<float> GetNodeLevels();
-
-    template <class Edge> inline util::DeallocatingVector<Edge> GetEdges()
-    {
-        util::DeallocatingVector<Edge> edges;
-
-        util::UnbufferedLog log;
-        log << "Getting edges of minimized graph ";
-        util::Percent p(log, contractor_graph->GetNumberOfNodes());
-        const NodeID number_of_nodes = contractor_graph->GetNumberOfNodes();
-        if (contractor_graph->GetNumberOfNodes())
-        {
-            Edge new_edge;
-            for (const auto node : util::irange(0u, number_of_nodes))
-            {
-                p.PrintStatus(node);
-                for (auto edge : contractor_graph->GetAdjacentEdgeRange(node))
-                {
-                    const NodeID target = contractor_graph->GetTarget(edge);
-                    const ContractorGraph::EdgeData &data = contractor_graph->GetEdgeData(edge);
-                    if (!orig_node_id_from_new_node_id_map.empty())
-                    {
-                        new_edge.source = orig_node_id_from_new_node_id_map[node];
-                        new_edge.target = orig_node_id_from_new_node_id_map[target];
-                    }
-                    else
-                    {
-                        new_edge.source = node;
-                        new_edge.target = target;
-                    }
-                    BOOST_ASSERT_MSG(SPECIAL_NODEID != new_edge.source, "Source id invalid");
-                    BOOST_ASSERT_MSG(SPECIAL_NODEID != new_edge.target, "Target id invalid");
-                    new_edge.data.weight = data.weight;
-                    new_edge.data.duration = data.duration;
-                    new_edge.data.shortcut = data.shortcut;
-                    if (!data.is_original_via_node_ID && !orig_node_id_from_new_node_id_map.empty())
-                    {
-                        // tranlate the _node id_ of the shortcutted node
-                        new_edge.data.turn_id = orig_node_id_from_new_node_id_map[data.id];
-                    }
-                    else
-                    {
-                        new_edge.data.turn_id = data.id;
-                    }
-                    BOOST_ASSERT_MSG(new_edge.data.turn_id != INT_MAX, // 2^31
-                                     "edge id invalid");
-                    new_edge.data.forward = data.forward;
-                    new_edge.data.backward = data.backward;
-                    edges.push_back(new_edge);
-                }
-            }
-        }
-        contractor_graph.reset();
-        orig_node_id_from_new_node_id_map.clear();
-        orig_node_id_from_new_node_id_map.shrink_to_fit();
-
-        BOOST_ASSERT(0 == orig_node_id_from_new_node_id_map.capacity());
-
-        edges.append(external_edge_list.begin(), external_edge_list.end());
-        external_edge_list.clear();
-
-        // sort and remove duplicates
-        tbb::parallel_sort(edges.begin(), edges.end());
-        auto new_end = std::unique(edges.begin(), edges.end());
-        edges.resize(new_end - edges.begin());
-
-        return edges;
-    }
-
-  private:
-    float EvaluateNodePriority(ContractorThreadData *const data,
-                               const NodeDepth node_depth,
-                               const NodeID node);
-
-    template <bool RUNSIMULATION>
-    bool
-    ContractNode(ContractorThreadData *data, const NodeID node, ContractionStats *stats = nullptr)
-    {
-        auto &dijkstra = data->dijkstra;
-        std::size_t inserted_edges_size = data->inserted_edges.size();
-        std::vector<ContractorEdge> &inserted_edges = data->inserted_edges;
-        constexpr bool SHORTCUT_ARC = true;
-        constexpr bool FORWARD_DIRECTION_ENABLED = true;
-        constexpr bool FORWARD_DIRECTION_DISABLED = false;
-        constexpr bool REVERSE_DIRECTION_ENABLED = true;
-        constexpr bool REVERSE_DIRECTION_DISABLED = false;
-
-        for (auto in_edge : contractor_graph->GetAdjacentEdgeRange(node))
-        {
-            const ContractorEdgeData &in_data = contractor_graph->GetEdgeData(in_edge);
-            const NodeID source = contractor_graph->GetTarget(in_edge);
-            if (source == node)
-                continue;
-
-            if (RUNSIMULATION)
-            {
-                BOOST_ASSERT(stats != nullptr);
-                ++stats->edges_deleted_count;
-                stats->original_edges_deleted_count += in_data.originalEdges;
-            }
-            if (!in_data.backward)
-            {
-                continue;
-            }
-
-            dijkstra.Clear();
-            dijkstra.Insert(source, 0, ContractorHeapData{});
-            EdgeWeight max_weight = 0;
-            unsigned number_of_targets = 0;
-
-            for (auto out_edge : contractor_graph->GetAdjacentEdgeRange(node))
-            {
-                const ContractorEdgeData &out_data = contractor_graph->GetEdgeData(out_edge);
-                if (!out_data.forward)
-                {
-                    continue;
-                }
-                const NodeID target = contractor_graph->GetTarget(out_edge);
-                if (node == target)
-                {
-                    continue;
-                }
-
-                const EdgeWeight path_weight = in_data.weight + out_data.weight;
-                if (target == source)
-                {
-                    if (path_weight < node_weights[node])
-                    {
-                        if (RUNSIMULATION)
-                        {
-                            // make sure to prune better, but keep inserting this loop if it should
-                            // still be the best
-                            // CAREFUL: This only works due to the independent node-setting. This
-                            // guarantees that source is not connected to another node that is
-                            // contracted
-                            node_weights[source] = path_weight + 1;
-                            BOOST_ASSERT(stats != nullptr);
-                            stats->edges_added_count += 2;
-                            stats->original_edges_added_count +=
-                                2 * (out_data.originalEdges + in_data.originalEdges);
-                        }
-                        else
-                        {
-                            // CAREFUL: This only works due to the independent node-setting. This
-                            // guarantees that source is not connected to another node that is
-                            // contracted
-                            node_weights[source] = path_weight; // make sure to prune better
-                            inserted_edges.emplace_back(source,
-                                                        target,
-                                                        path_weight,
-                                                        in_data.duration + out_data.duration,
-                                                        out_data.originalEdges +
-                                                            in_data.originalEdges,
-                                                        node,
-                                                        SHORTCUT_ARC,
-                                                        FORWARD_DIRECTION_ENABLED,
-                                                        REVERSE_DIRECTION_DISABLED);
-
-                            inserted_edges.emplace_back(target,
-                                                        source,
-                                                        path_weight,
-                                                        in_data.duration + out_data.duration,
-                                                        out_data.originalEdges +
-                                                            in_data.originalEdges,
-                                                        node,
-                                                        SHORTCUT_ARC,
-                                                        FORWARD_DIRECTION_DISABLED,
-                                                        REVERSE_DIRECTION_ENABLED);
-                        }
-                    }
-                    continue;
-                }
-                max_weight = std::max(max_weight, path_weight);
-                if (!dijkstra.WasInserted(target))
-                {
-                    dijkstra.Insert(target, INVALID_EDGE_WEIGHT, ContractorHeapData{0, true});
-                    ++number_of_targets;
-                }
-            }
-
-            if (RUNSIMULATION)
-            {
-                const int constexpr SIMULATION_SEARCH_SPACE_SIZE = 1000;
-                dijkstra.Run(number_of_targets,
-                             SIMULATION_SEARCH_SPACE_SIZE,
-                             max_weight,
-                             node,
-                             *contractor_graph);
-            }
-            else
-            {
-                const int constexpr FULL_SEARCH_SPACE_SIZE = 2000;
-                dijkstra.Run(
-                    number_of_targets, FULL_SEARCH_SPACE_SIZE, max_weight, node, *contractor_graph);
-            }
-            for (auto out_edge : contractor_graph->GetAdjacentEdgeRange(node))
-            {
-                const ContractorEdgeData &out_data = contractor_graph->GetEdgeData(out_edge);
-                if (!out_data.forward)
-                {
-                    continue;
-                }
-                const NodeID target = contractor_graph->GetTarget(out_edge);
-                if (target == node)
-                    continue;
-
-                const EdgeWeight path_weight = in_data.weight + out_data.weight;
-                const EdgeWeight weight = dijkstra.GetKey(target);
-                if (path_weight < weight)
-                {
-                    if (RUNSIMULATION)
-                    {
-                        BOOST_ASSERT(stats != nullptr);
-                        stats->edges_added_count += 2;
-                        stats->original_edges_added_count +=
-                            2 * (out_data.originalEdges + in_data.originalEdges);
-                    }
-                    else
-                    {
-                        inserted_edges.emplace_back(source,
-                                                    target,
-                                                    path_weight,
-                                                    in_data.duration + out_data.duration,
-                                                    out_data.originalEdges + in_data.originalEdges,
-                                                    node,
-                                                    SHORTCUT_ARC,
-                                                    FORWARD_DIRECTION_ENABLED,
-                                                    REVERSE_DIRECTION_DISABLED);
-
-                        inserted_edges.emplace_back(target,
-                                                    source,
-                                                    path_weight,
-                                                    in_data.duration + out_data.duration,
-                                                    out_data.originalEdges + in_data.originalEdges,
-                                                    node,
-                                                    SHORTCUT_ARC,
-                                                    FORWARD_DIRECTION_DISABLED,
-                                                    REVERSE_DIRECTION_ENABLED);
-                    }
-                }
-            }
-        }
-        // Check For One-Way Streets to decide on the creation of self-loops
-
-        if (!RUNSIMULATION)
-        {
-            std::size_t iend = inserted_edges.size();
-            for (std::size_t i = inserted_edges_size; i < iend; ++i)
-            {
-                bool found = false;
-                for (std::size_t other = i + 1; other < iend; ++other)
-                {
-                    if (inserted_edges[other].source != inserted_edges[i].source)
-                    {
-                        continue;
-                    }
-                    if (inserted_edges[other].target != inserted_edges[i].target)
-                    {
-                        continue;
-                    }
-                    if (inserted_edges[other].data.weight != inserted_edges[i].data.weight)
-                    {
-                        continue;
-                    }
-                    if (inserted_edges[other].data.shortcut != inserted_edges[i].data.shortcut)
-                    {
-                        continue;
-                    }
-                    inserted_edges[other].data.forward |= inserted_edges[i].data.forward;
-                    inserted_edges[other].data.backward |= inserted_edges[i].data.backward;
-                    found = true;
-                    break;
-                }
-                if (!found)
-                {
-                    inserted_edges[inserted_edges_size++] = inserted_edges[i];
-                }
-            }
-            inserted_edges.resize(inserted_edges_size);
-        }
-        return true;
-    }
-
-    void DeleteIncomingEdges(ContractorThreadData *data, const NodeID node);
-
-    bool UpdateNodeNeighbours(std::vector<float> &priorities,
-                              std::vector<NodeDepth> &node_depth,
-                              ContractorThreadData *const data,
-                              const NodeID node);
-
-    bool IsNodeIndependent(const std::vector<float> &priorities,
-                           ContractorThreadData *const data,
-                           NodeID node) const;
-
-    // This bias function takes up 22 assembly instructions in total on X86
-    bool Bias(const NodeID a, const NodeID b) const;
-
-    std::shared_ptr<ContractorGraph> contractor_graph;
-    ExternalVector<QueryEdge> external_edge_list;
-    std::vector<NodeID> orig_node_id_from_new_node_id_map;
-    std::vector<float> node_levels;
-
-    // A list of weights for every node in the graph.
-    // The weight represents the cost for a u-turn on the segment in the base-graph in addition to
-    // its traversal.
-    // During contraction, self-loops are checked against this node weight to ensure that necessary
-    // self-loops are added.
-    std::vector<EdgeWeight> node_weights;
-    std::vector<bool> is_core_node;
-    util::XORFastHash<> fast_hash;
-};
+// Overload no contracted nodes
+inline auto contractGraph(ContractorGraph &graph,
+                          std::vector<bool> node_is_contractable,
+                          std::vector<EdgeWeight> node_weights,
+                          double core_factor = 1.0)
+{
+    return contractGraph(
+        graph, {}, std::move(node_is_contractable), std::move(node_weights), core_factor);
+}
 
 } // namespace contractor
 } // namespace osrm

include/contractor/graph_contractor_adaptors.hpp

@@ -3,6 +3,9 @@
 
 #include "contractor/contractor_graph.hpp"
 #include "util/log.hpp"
+#include "util/percent.hpp"
+
+#include <tbb/parallel_sort.h>
 
 #include <vector>
 
@@ -13,7 +16,7 @@ namespace contractor
 
 // Make sure to move in the input edge list!
 template <typename InputEdgeContainer>
-std::vector<ContractorEdge> adaptToContractorInput(InputEdgeContainer input_edge_list)
+ContractorGraph toContractorGraph(NodeID number_of_nodes, InputEdgeContainer input_edge_list)
 {
     std::vector<ContractorEdge> edges;
     edges.reserve(input_edge_list.size() * 2);
@@ -52,9 +55,115 @@ std::vector<ContractorEdge> adaptToContractorInput(InputEdgeContainer input_edge
                            false,
                            input_edge.data.backward ? true : false,
                            input_edge.data.forward ? true : false);
+    };
+    tbb::parallel_sort(edges.begin(), edges.end());
+
+    NodeID edge = 0;
+    for (NodeID i = 0; i < edges.size();)
+    {
+        const NodeID source = edges[i].source;
+        const NodeID target = edges[i].target;
+        const NodeID id = edges[i].data.id;
+        // remove eigenloops
+        if (source == target)
+        {
+            ++i;
+            continue;
+        }
+        ContractorEdge forward_edge;
+        ContractorEdge reverse_edge;
+        forward_edge.source = reverse_edge.source = source;
+        forward_edge.target = reverse_edge.target = target;
+        forward_edge.data.forward = reverse_edge.data.backward = true;
+        forward_edge.data.backward = reverse_edge.data.forward = false;
+        forward_edge.data.shortcut = reverse_edge.data.shortcut = false;
+        forward_edge.data.id = reverse_edge.data.id = id;
+        forward_edge.data.originalEdges = reverse_edge.data.originalEdges = 1;
+        forward_edge.data.weight = reverse_edge.data.weight = INVALID_EDGE_WEIGHT;
+        forward_edge.data.duration = reverse_edge.data.duration = MAXIMAL_EDGE_DURATION;
+        // remove parallel edges
+        while (i < edges.size() && edges[i].source == source && edges[i].target == target)
+        {
+            if (edges[i].data.forward)
+            {
+                forward_edge.data.weight = std::min(edges[i].data.weight, forward_edge.data.weight);
+                forward_edge.data.duration =
+                    std::min(edges[i].data.duration, forward_edge.data.duration);
+            }
+            if (edges[i].data.backward)
+            {
+                reverse_edge.data.weight = std::min(edges[i].data.weight, reverse_edge.data.weight);
+                reverse_edge.data.duration =
+                    std::min(edges[i].data.duration, reverse_edge.data.duration);
+            }
+            ++i;
+        }
+        // merge edges (s,t) and (t,s) into bidirectional edge
+        if (forward_edge.data.weight == reverse_edge.data.weight)
+        {
+            if ((int)forward_edge.data.weight != INVALID_EDGE_WEIGHT)
+            {
+                forward_edge.data.backward = true;
+                edges[edge++] = forward_edge;
+            }
+        }
+        else
+        { // insert seperate edges
+            if (((int)forward_edge.data.weight) != INVALID_EDGE_WEIGHT)
+            {
+                edges[edge++] = forward_edge;
+            }
+            if ((int)reverse_edge.data.weight != INVALID_EDGE_WEIGHT)
+            {
+                edges[edge++] = reverse_edge;
+            }
+        }
     }
-    // FIXME not sure if we need this
-    edges.shrink_to_fit();
+    util::Log() << "merged " << edges.size() - edge << " edges out of " << edges.size();
+    edges.resize(edge);
+
+    return ContractorGraph{number_of_nodes, edges};
+}
+
+template <class Edge, typename GraphT> inline util::DeallocatingVector<Edge> toEdges(GraphT graph)
+{
+    util::DeallocatingVector<Edge> edges;
+
+    util::UnbufferedLog log;
+    log << "Getting edges of minimized graph ";
+    util::Percent p(log, graph.GetNumberOfNodes());
+    const NodeID number_of_nodes = graph.GetNumberOfNodes();
+    if (graph.GetNumberOfNodes())
+    {
+        Edge new_edge;
+        for (const auto node : util::irange(0u, number_of_nodes))
+        {
+            p.PrintStatus(node);
+            for (auto edge : graph.GetAdjacentEdgeRange(node))
+            {
+                const NodeID target = graph.GetTarget(edge);
+                const ContractorGraph::EdgeData &data = graph.GetEdgeData(edge);
+                new_edge.source = node;
+                new_edge.target = target;
+                BOOST_ASSERT_MSG(SPECIAL_NODEID != new_edge.target, "Target id invalid");
+                new_edge.data.weight = data.weight;
+                new_edge.data.duration = data.duration;
+                new_edge.data.shortcut = data.shortcut;
+                new_edge.data.turn_id = data.id;
+                BOOST_ASSERT_MSG(new_edge.data.turn_id != INT_MAX, // 2^31
+                                 "edge id invalid");
+                new_edge.data.forward = data.forward;
+                new_edge.data.backward = data.backward;
+                edges.push_back(new_edge);
+            }
+        }
+    }
+
+    // sort and remove duplicates
+    tbb::parallel_sort(edges.begin(), edges.end());
+    auto new_end = std::unique(edges.begin(), edges.end());
+    edges.resize(new_end - edges.begin());
+
     return edges;
 }
 

include/contractor/query_edge.hpp

@@ -21,6 +21,17 @@ struct QueryEdge
         {
         }
 
+        EdgeData(const NodeID turn_id,
+                 const bool shortcut,
+                 const EdgeWeight weight,
+                 const EdgeWeight duration,
+                 const bool forward,
+                 const bool backward)
+            : turn_id(turn_id), shortcut(shortcut), weight(weight), duration(duration),
+              forward(forward), backward(backward)
+        {
+        }
+
         template <class OtherT> EdgeData(const OtherT &other)
         {
             weight = other.weight;

include/customizer/cell_customizer.hpp

@@ -31,16 +31,33 @@ class CellCustomizer
     CellCustomizer(const partition::MultiLevelPartition &partition) : partition(partition) {}
 
     template <typename GraphT>
-    void Customize(
-        const GraphT &graph, Heap &heap, partition::CellStorage &cells, LevelID level, CellID id)
+    void Customize(const GraphT &graph,
+                   Heap &heap,
+                   const partition::CellStorage &cells,
+                   const std::vector<bool> &allowed_nodes,
+                   CellMetric &metric,
+                   LevelID level,
+                   CellID id) const
     {
-        auto cell = cells.GetCell(level, id);
+        auto cell = cells.GetCell(metric, level, id);
         auto destinations = cell.GetDestinationNodes();
 
         // for each source do forward search
         for (auto source : cell.GetSourceNodes())
         {
-            std::unordered_set<NodeID> destinations_set(destinations.begin(), destinations.end());
+            if (!allowed_nodes[source])
+            {
+                continue;
+            }
+
+            std::unordered_set<NodeID> destinations_set;
+            for (const auto destination : destinations)
+            {
+                if (allowed_nodes[destination])
+                {
+                    destinations_set.insert(destination);
+                }
+            }
             heap.Clear();
             heap.Insert(source, 0, {false, 0});
 
@@ -51,10 +68,7 @@ class CellCustomizer
                 const EdgeWeight weight = heap.GetKey(node);
                 const EdgeDuration duration = heap.GetData(node).duration;
 
-                if (level == 1)
-                    RelaxNode<true>(graph, cells, heap, level, node, weight, duration);
-                else
-                    RelaxNode<false>(graph, cells, heap, level, node, weight, duration);
+                RelaxNode(graph, cells, allowed_nodes, metric, heap, level, node, weight, duration);
 
                 destinations_set.erase(node);
             }
@@ -80,7 +94,11 @@ class CellCustomizer
         }
     }
 
-    template <typename GraphT> void Customize(const GraphT &graph, partition::CellStorage &cells)
+    template <typename GraphT>
+    void Customize(const GraphT &graph,
+                   const partition::CellStorage &cells,
+                   const std::vector<bool> &allowed_nodes,
+                   CellMetric &metric) const
     {
         Heap heap_exemplar(graph.GetNumberOfNodes());
         HeapPtr heaps(heap_exemplar);
@@ -92,22 +110,26 @@ class CellCustomizer
                                   auto &heap = heaps.local();
                                   for (auto id = range.begin(), end = range.end(); id != end; ++id)
                                   {
-                                      Customize(graph, heap, cells, level, id);
+                                      Customize(
+                                          graph, heap, cells, allowed_nodes, metric, level, id);
                                   }
                               });
         }
     }
 
   private:
-    template <bool first_level, typename GraphT>
+    template <typename GraphT>
     void RelaxNode(const GraphT &graph,
                    const partition::CellStorage &cells,
+                   const std::vector<bool> &allowed_nodes,
+                   const CellMetric &metric,
                    Heap &heap,
                    LevelID level,
                    NodeID node,
                    EdgeWeight weight,
                    EdgeDuration duration) const
     {
+        auto first_level = level == 1;
         BOOST_ASSERT(heap.WasInserted(node));
 
         if (!first_level)
@@ -123,7 +145,7 @@ class CellCustomizer
             {
                 // Relax sub-cell nodes
                 auto subcell_id = partition.GetCell(level - 1, node);
-                auto subcell = cells.GetCell(level - 1, subcell_id);
+                auto subcell = cells.GetCell(metric, level - 1, subcell_id);
                 auto subcell_destination = subcell.GetDestinationNodes().begin();
                 auto subcell_duration = subcell.GetOutDuration(node).begin();
                 for (auto subcell_weight : subcell.GetOutWeight(node))
@@ -131,15 +153,22 @@ class CellCustomizer
                     if (subcell_weight != INVALID_EDGE_WEIGHT)
                     {
                         const NodeID to = *subcell_destination;
+                        if (!allowed_nodes[to])
+                        {
+                            continue;
+                        }
+
                         const EdgeWeight to_weight = weight + subcell_weight;
+                        const EdgeDuration to_duration = duration + *subcell_duration;
                         if (!heap.WasInserted(to))
                         {
-                            heap.Insert(to, to_weight, {true, duration + *subcell_duration});
+                            heap.Insert(to, to_weight, {true, to_duration});
                         }
-                        else if (to_weight < heap.GetKey(to))
+                        else if (std::tie(to_weight, to_duration) <
+                                 std::tie(heap.GetKey(to), heap.GetData(to).duration))
                         {
                             heap.DecreaseKey(to, to_weight);
-                            heap.GetData(to) = {true, duration + *subcell_duration};
+                            heap.GetData(to) = {true, to_duration};
                         }
                     }
 
@@ -153,20 +182,27 @@ class CellCustomizer
         for (auto edge : graph.GetInternalEdgeRange(level, node))
         {
             const NodeID to = graph.GetTarget(edge);
+            if (!allowed_nodes[to])
+            {
+                continue;
+            }
+
             const auto &data = graph.GetEdgeData(edge);
             if (data.forward &&
                 (first_level ||
                  partition.GetCell(level - 1, node) != partition.GetCell(level - 1, to)))
             {
                 const EdgeWeight to_weight = weight + data.weight;
+                const EdgeDuration to_duration = duration + data.duration;
                 if (!heap.WasInserted(to))
                 {
                     heap.Insert(to, to_weight, {false, duration + data.duration});
                 }
-                else if (to_weight < heap.GetKey(to))
+                else if (std::tie(to_weight, to_duration) <
+                         std::tie(heap.GetKey(to), heap.GetData(to).duration))
                 {
                     heap.DecreaseKey(to, to_weight);
-                    heap.GetData(to) = {false, duration + data.duration};
+                    heap.GetData(to) = {false, to_duration};
                 }
             }
         }

include/customizer/cell_metric.hpp

@@ -0,0 +1,31 @@
+#ifndef OSRM_CUSTOMIZER_CELL_METRIC_HPP
+#define OSRM_CUSTOMIZER_CELL_METRIC_HPP
+
+#include "storage/io_fwd.hpp"
+#include "storage/shared_memory_ownership.hpp"
+
+#include "util/typedefs.hpp"
+#include "util/vector_view.hpp"
+
+namespace osrm
+{
+namespace customizer
+{
+namespace detail
+{
+// Encapsulated one metric to make it easily replacable in CelLStorage
+template <storage::Ownership Ownership> struct CellMetricImpl
+{
+    template <typename T> using Vector = util::ViewOrVector<T, Ownership>;
+
+    Vector<EdgeWeight> weights;
+    Vector<EdgeDuration> durations;
+};
+}
+
+using CellMetric = detail::CellMetricImpl<storage::Ownership::Container>;
+using CellMetricView = detail::CellMetricImpl<storage::Ownership::View>;
+}
+}
+
+#endif

include/customizer/customizer_config.hpp

@@ -17,12 +17,13 @@ namespace customizer
 struct CustomizationConfig final : storage::IOConfig
 {
     CustomizationConfig()
-        : IOConfig(
-              {
-                  ".osrm",
-              },
-              {},
-              {".osrm.ebg", ".osrm.partition", ".osrm.cells", ".osrm.mldgr"}),
+        : IOConfig({".osrm.ebg",
+                    ".osrm.partition",
+                    ".osrm.cells",
+                    ".osrm.ebg_nodes",
+                    ".osrm.properties"},
+                   {},
+                   {".osrm.cell_metrics", ".osrm.mldgr"}),
           requested_num_threads(0)
     {
     }

include/customizer/files.hpp

@@ -0,0 +1,59 @@
+#ifndef OSRM_CUSTOMIZER_FILES_HPP
+#define OSRM_CUSTOMIZER_FILES_HPP
+
+#include "customizer/serialization.hpp"
+
+#include "storage/io.hpp"
+
+#include "util/integer_range.hpp"
+
+namespace osrm
+{
+namespace customizer
+{
+namespace files
+{
+
+// reads .osrm.cell_metrics file
+template <typename CellMetricT>
+inline void readCellMetrics(const boost::filesystem::path &path, std::vector<CellMetricT> &metrics)
+{
+    static_assert(std::is_same<CellMetricView, CellMetricT>::value ||
+                      std::is_same<CellMetric, CellMetricT>::value,
+                  "");
+
+    const auto fingerprint = storage::io::FileReader::VerifyFingerprint;
+    storage::io::FileReader reader{path, fingerprint};
+
+    auto num_metrics = reader.ReadElementCount64();
+    metrics.resize(num_metrics);
+
+    for (auto &metric : metrics)
+    {
+        serialization::read(reader, metric);
+    }
+}
+
+// writes .osrm.cell_metrics file
+template <typename CellMetricT>
+inline void writeCellMetrics(const boost::filesystem::path &path,
+                             const std::vector<CellMetricT> &metrics)
+{
+    static_assert(std::is_same<CellMetricView, CellMetricT>::value ||
+                      std::is_same<CellMetric, CellMetricT>::value,
+                  "");
+
+    const auto fingerprint = storage::io::FileWriter::GenerateFingerprint;
+    storage::io::FileWriter writer{path, fingerprint};
+
+    writer.WriteElementCount64(metrics.size());
+    for (const auto &metric : metrics)
+    {
+        serialization::write(writer, metric);
+    }
+}
+}
+}
+}
+
+#endif