[skip ci] Rephrased the API docs in terms of adding new types

Missing two commits in StaticRTree changes

.gitignore

@@ -80,6 +80,7 @@ stxxl.errlog
 /test/profile.lua
 /test/cache
 /test/speeds.csv
+/test/penalties.csv
 /test/data/monaco.*
 node_modules
 

.travis.yml

@@ -1,7 +1,7 @@
-#language: cpp
-# This makes travis use the thin image which boots faster
-language: generic
+language: cpp
 
+git:
+  depth: 10
 
 # sudo:required is needed for trusty images
 sudo: required
@@ -13,101 +13,109 @@ notifications:
 branches:
   only:
     - master
-    - develop
+
+cache:
+  ccache: true
+  apt: true
+
+env:
+  global:
+   - CCACHE_TEMPDIR=/tmp/.ccache-temp
+   - CCACHE_COMPRESS=1
+   - JOBS=4
 
 matrix:
   fast_finish: true
 
+  # We override the compiler names here to yield better ccache behavior, which uses this as key
   include:
 
     # Debug Builds
     - os: linux
-      compiler: gcc
+      compiler: "gcc-5-debug"
       addons: &gcc5
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'pip']
-      env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Debug' COVERAGE=ON
+          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
+      env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Debug'
 
     - os: linux
-      compiler: gcc
+      compiler: "gcc-4.8-debug"
       addons: &gcc48
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+          packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
       env: CCOMPILER='gcc-4.8' CXXCOMPILER='g++-4.8' BUILD_TYPE='Debug'
 
     - os: linux
-      compiler: clang
+      compiler: "clang-3.8-debug"
       addons: &clang38
         apt:
           sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
-          packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+          packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
       env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Debug' RUN_CLANG_FORMAT=ON
 
     - os: osx
       osx_image: xcode7.3
       compiler: clang
-      env: CCOMPILER='clang' CXXCOMPILER='clang++' BUILD_TYPE='Debug'
+      env: CCOMPILER='clang' CXXCOMPILER='clang++' BUILD_TYPE='Debug' JOBS=1 CUCUMBER_TIMEOUT=60000
 
     # Release Builds
     - os: linux
-      compiler: gcc
+      compiler: "gcc-5-release"
       addons: &gcc5
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
       env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release'
 
-    - os: linux
-      compiler: gcc
-      addons: &gcc48
-        apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
-      env: CCOMPILER='gcc-4.8' CXXCOMPILER='g++-4.8' BUILD_TYPE='Release'
+      # Disabled because of CI slowness
+      #- os: linux
+      #- compiler: gcc
+      #- addons: &gcc48
+      #-   apt:
+      #-     sources: ['ubuntu-toolchain-r-test']
+      #-     packages: ['g++-4.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      #- env: CCOMPILER='gcc-4.8' CXXCOMPILER='g++-4.8' BUILD_TYPE='Release'
 
-    - os: linux
-      compiler: clang
-      addons: &clang38
-        apt:
-          sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
-          packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
-      env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Release'
+      # Disabled because of CI slowness
+      #- os: linux
+      #- compiler: clang
+      #- addons: &clang38
+      #-   apt:
+      #-     sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
+      #-     packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      #- env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Release'
 
-    - os: osx
-      osx_image: xcode7.3
-      compiler: clang
-      env: CCOMPILER='clang' CXXCOMPILER='clang++' BUILD_TYPE='Release'
+      # Disabled because of CI slowness
+      #- os: osx
+      #- osx_image: xcode7.3
+      #- compiler: clang
+      #- env: CCOMPILER='clang' CXXCOMPILER='clang++' BUILD_TYPE='Release'
 
     # Shared Library
     - os: linux
-      compiler: gcc
+      compiler: "gcc-5-release-shared"
       addons: &gcc5
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+          packages: ['g++-5', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev', 'ccache']
       env: CCOMPILER='gcc-5' CXXCOMPILER='g++-5' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
 
-    - os: linux
-      compiler: clang
-      addons: &clang38
-        apt:
-          sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
-          packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
-      env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
+      # Disabled because CI slowness
+      #- os: linux
+      #- compiler: clang
+      #- addons: &clang38
+      #-   apt:
+      #-     sources: ['llvm-toolchain-precise-3.8', 'ubuntu-toolchain-r-test']
+      #-     packages: ['clang-3.8', 'libbz2-dev', 'libstxxl-dev', 'libstxxl1', 'libxml2-dev', 'libzip-dev', 'lua5.1', 'liblua5.1-0-dev', 'libtbb-dev', 'libgdal-dev', 'libluabind-dev', 'libboost-all-dev']
+      #- env: CCOMPILER='clang-3.8' CXXCOMPILER='clang++-3.8' BUILD_TYPE='Release' BUILD_SHARED_LIBS=ON
 
 before_install:
   - source ./scripts/install_node.sh 4
-
-install:
   - npm install
   - DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
   - mkdir -p ${DEPS_DIR} && cd ${DEPS_DIR}
-  - |
-    if [[ -n "${COVERAGE}" ]]; then
-      pip install --user cpp-coveralls
-    fi
   - |
     if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
       CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.1-Linux-x86_64.tar.gz"
@@ -115,10 +123,10 @@ install:
       export PATH=${DEPS_DIR}/cmake/bin:${PATH}
     elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
       # implicit deps, but seem to be installed by default with recent images: libxml2 GDAL boost
-      brew install cmake libzip libstxxl lua51 luabind tbb md5sha1sum
+      brew install cmake libzip libstxxl lua51 luabind tbb md5sha1sum ccache
     fi
 
-before_script:
+install:
   - cd ${TRAVIS_BUILD_DIR}
   - |
     if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
@@ -126,41 +134,45 @@ before_script:
     fi
   - mkdir build && pushd build
   - export CC=${CCOMPILER} CXX=${CXXCOMPILER}
-  - export OSRM_PORT=5000 OSRM_TIMEOUT=6000
-  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DCOVERAGE=${COVERAGE:-OFF} -DBUILD_TOOLS=1 -DENABLE_CCACHE=0
-
-script:
-  - make --jobs=2
-  - make tests --jobs=2
-  - make benchmarks
+  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DCOVERAGE=${COVERAGE:-OFF} -DBUILD_TOOLS=1 -DENABLE_CCACHE=ON
+  - echo "travis_fold:start:MAKE"
+  - make --jobs=${JOBS}
+  - make tests --jobs=${JOBS}
+  - make benchmarks --jobs=${JOBS}
+  - echo "travis_fold:end:MAKE"
+  - ccache -s
   - sudo make install
   - |
     if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
       sudo ldconfig
     fi
-  - echo "travis_fold:start:UNIT_TESTS"
+  - popd
+  - mkdir example/build && pushd example/build
+  - cmake ..
+  - make
+  - popd
+
+script:
+  - echo "travis_fold:start:BENCHMARK"
+  - make -C test/data benchmark
+  - echo "travis_fold:end:BENCHMARK"
+  - ./example/build/osrm-example test/data/monaco.osrm
+  # All tests assume to be run from the build directory
+  - pushd build
+  - ./unit_tests/library-tests ../test/data/monaco.osrm
   - ./unit_tests/extractor-tests
   - ./unit_tests/engine-tests
   - ./unit_tests/util-tests
   - ./unit_tests/server-tests
-  - echo "travis_fold:end:UNIT_TESTS"
   - popd
-  - echo "travis_fold:start:CUCUMBER"
   - npm test
-  - echo "travis_fold:end:CUCUMBER"
-  - echo "travis_fold:start:BENCHMARK"
-  - make -C test/data benchmark
-  - echo "travis_fold:end:BENCHMARK"
-  - ./build/unit_tests/library-tests test/data/monaco.osrm
-  - mkdir example/build && pushd example/build
-  - cmake ..
-  - make
-  - ./osrm-example ../../test/data/monaco.osrm
-  - popd
 
 after_success:
   - |
-    if [ -n "$RUN_CLANG_FORMAT" ]; then
+    if [ -n "${RUN_CLANG_FORMAT}" ]; then
       ./scripts/format.sh || true # we don't want to fail just yet
     fi
-  - coveralls --build-root build --exclude unit_tests --exclude third_party --exclude node_modules --gcov-options '\-lp'
+  - |
+    if [ -n "${COVERAGE}" ]; then
+      coveralls --build-root build --exclude unit_tests --exclude third_party --exclude node_modules --gcov-options '\-lp'
+    fi

CHANGELOG.md

@@ -1,3 +1,35 @@
+# 5.1.0
+   Changes with regard to 5.0.0
+
+   - API:
+     - added StepManeuver type `roundabout turn`. The type indicates a small roundabout that is treated as an intersection
+        (turn right at the roundabout for first exit, go straight at the roundabout...)
+     - added StepManeuver type `on ramp` and `off ramp` to distinguish between ramps that enter and exit a highway.
+     - reduced new name instructions for trivial changes
+     - combined multiple turns into a single instruction at segregated roads`
+
+   - Profile Changes:
+    - introduced a suffix_list / get_name_suffix_list to specify name suffices to be suppressed in name change announcements
+    - street names are now consistently assembled for the car, bike and walk profile as: "Name (Ref)" as in "Berlin (A5)"
+    - new `car.lua` dependency `lib/destination.lua`
+    - register a way's .nodes() function for use in the profile's way_function.
+
+   - Infrastructure
+    - BREAKING: reordered internal instruction types. This breaks the **data format**
+    - BREAKING: Changed the on-disk encoding of the StaticRTree for better performance. This breaks the **data format**
+
+   - Fixes:
+    - Issue #2310: post-processing for local paths, fixes #2310
+    - Issue #2309: local path looping, fixes #2309
+    - Issue #2356: Make hint values optional
+    - Issue #2349: Segmentation fault in some requests
+    - Issue #2335: map matching was using shortest path with uturns disabled
+    - Issue #2193: Fix syntax error position indicators in parameters queries
+    - Fix search with u-turn
+    - PhantomNode packing in MSVC now the same on other platforms
+    - Summary is now not malformed when including unnamed roads
+    - Emit new-name on when changing fron unanmed road to named road
+
 # 5.0.0
    Changes with regard 5.0.0 RC2:
    - API:

CMakeLists.txt

@@ -8,7 +8,7 @@ endif()
 
 project(OSRM C CXX)
 set(OSRM_VERSION_MAJOR 5)
-set(OSRM_VERSION_MINOR 0)
+set(OSRM_VERSION_MINOR 1)
 set(OSRM_VERSION_PATCH 0)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -25,8 +25,8 @@ else()
   message(WARNING "Building on a 32 bit system is unsupported")
 endif()
 
-if(WIN32 AND MSVC_VERSION LESS 1800)
-  message(FATAL_ERROR "Building with Microsoft compiler needs Visual Studio 2013 or later (Express version works too)")
+if(WIN32 AND MSVC_VERSION LESS 1900)
+  message(FATAL_ERROR "Building with Microsoft compiler needs Latest Visual Studio 2015 (Community or better)")
 endif()
 
 option(ENABLE_CCACHE "Speed up incremental rebuilds via ccache" ON)
@@ -140,6 +140,7 @@ if (COVERAGE)
   if (NOT CMAKE_BUILD_TYPE MATCHES "Debug")
     message(ERROR "COVERAGE=ON only make sense with a Debug build")
   endif()
+  message(INFO "Enabling coverage")
   set(MAYBE_COVERAGE_LIBRARIES "gcov")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs")
 endif()

README.md

@@ -4,13 +4,11 @@ The Open Source Routing Machine is a high performance routing engine written in
 
 ## Current build status
 
-| build config |  branch | status |
-|:-------------|:--------|:------------|
-| Linux        | master  | [![Build Status](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=master)](https://travis-ci.org/Project-OSRM/osrm-backend) |
-| Linux        | develop | [![Build Status](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=develop)](https://travis-ci.org/Project-OSRM/osrm-backend) |
-| Windows      | master/develop | [![Build status](https://ci.appveyor.com/api/projects/status/4iuo3s9gxprmcjjh)](https://ci.appveyor.com/project/DennisOSRM/osrm-backend) |
-| LUAbind fork | master  | [![Build Status](https://travis-ci.org/DennisOSRM/luabind.png?branch=master)](https://travis-ci.org/DennisOSRM/luabind) |
-| Coverage     | develop | [![Coverage Status](https://coveralls.io/repos/github/Project-OSRM/osrm-backend/badge.svg?branch=develop)](https://coveralls.io/github/Project-OSRM/osrm-backend?branch=develop) |
+| build config | status |
+|:-------------|:-------|
+| Linux        | [![Build Status](https://travis-ci.org/Project-OSRM/osrm-backend.png?branch=master)](https://travis-ci.org/Project-OSRM/osrm-backend) |
+| Windows      | [![Build status](https://ci.appveyor.com/api/projects/status/4iuo3s9gxprmcjjh)](https://ci.appveyor.com/project/DennisOSRM/osrm-backend) |
+| Coverage     | [![Coverage Status](https://coveralls.io/repos/github/Project-OSRM/osrm-backend/badge.svg?branch=master)](https://coveralls.io/github/Project-OSRM/osrm-backend?branch=master) |
 
 ## Building
 
@@ -20,7 +18,46 @@ To quickly try OSRM use our [free and daily updated online service](http://map.p
 
 ## Documentation
 
-See the Wiki's [server API documentation](https://github.com/Project-OSRM/osrm-backend/wiki/Server-api) as well as the [library API documentation](https://github.com/Project-OSRM/osrm-backend/wiki/Library-api)
+### Full documentation
+
+- [osrm-routed HTTP API documentation](docs/http.md)
+- [libosrm API documentation](docs/libosrm.md)
+
+### Quick start
+
+Building OSRM assuming all dependencies are installed:
+
+```
+mkdir -p build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release
+cmake --build .
+sudo cmake --build . --target install
+```
+
+Loading preparing a dataset and starting the server:
+
+```
+osrm-extract data.osm.pbf -p profiles/car.lua
+osrm-contract data.osrm
+osrm-routed data.osrm
+```
+
+Running a query on your local server:
+
+```
+curl http://127.0.0.1:5000/13.388860,52.517037;13.385983,52.496891?steps=true&alternatives=true
+```
+
+### Running a request against the Demo Server
+
+First read the [API usage policy](https://github.com/Project-OSRM/osrm-backend/wiki/Api-usage-policy).
+
+Then run simple query with instructions and alternatives on Berlin:
+
+```
+curl https://router.project-osrm.org/13.388860,52.517037;13.385983,52.496891?steps=true&alternatives=true
+```
 
 ## References in publications
 

appveyor-build.bat

@@ -129,7 +129,7 @@ ECHO running server-tests.exe ...
 unit_tests\%Configuration%\server-tests.exe
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
-IF NOT "%APPVEYOR_REPO_BRANCH%"=="develop" GOTO DONE
+IF NOT "%APPVEYOR_REPO_BRANCH%"=="master" GOTO DONE
 ECHO ========= CREATING PACKAGES ==========
 
 CD %PROJECT_DIR%\build\%Configuration%

appveyor.yml

@@ -28,7 +28,6 @@ artifacts:
 branches:
   only:
     - master
-    - develop
 
 deploy:
   provider: FTP

docs/http.md

@@ -0,0 +1,509 @@
+## HTTP API
+
+`osrm-routed` supports only `GET` requests of the form. If you your response size
+exceeds the limits of a simple URL encoding, consider using our [NodeJS bindings](https://github.com/Project-OSRM/node-osrm)
+or using the [C++ library directly](libosrm.md).
+
+### Request
+
+```
+http://{server}/{service}/{version}/{profile}/{coordinates}[.{format}]?option=value&option=value
+```
+
+- `server`: location of the server. Example: `127.0.0.1:5000` (default)
+- `service`: Name of the service to be used. Support are the following services:
+  
+    | Service     |           Description                                     |
+    |-------------|-----------------------------------------------------------|
+    | [`route`](#service-route)     | shortest path between given coordinates                   |
+    | [`nearest`](#service-nearest)   | returns the nearest street segment for a given coordinate |
+    | [`table`](#service-table)     | computes distance tables for given coordinates            |
+    | [`match`](#service-match)     | matches given coordinates to the road network             |
+    | [`trip`](#service-trip)      | Compute the shortest round trip between given coordinates |
+    | [`tile`](#service-tile)      | Return vector tiles containing debugging info             |
+  
+- `version`: Version of the protocol implemented by the service.
+- `profile`: Mode of transportation, is determined by the profile that is used to prepare the data
+- `coordinates`: String of format `{longitude},{latitude};{longitude},{latitude}[;{longitude},{latitude} ...]` or `polyline({polyline})`.
+- `format`: Only `json` is supportest at the moment. This parameter is optional and defaults to `json`.
+
+Passing any `option=value` is optional. `polyline` follows Google's polyline format with precision 5 and can be generated using [this package](https://www.npmjs.com/package/polyline).
+To pass parameters to each location some options support an array like encoding:
+
+```
+{option}={element};{element}[;{element} ... ]
+```
+
+The number of elements must match exactly the number of locations. If you don't want to pass a value but instead use the default you can pass an empty `element`.
+
+Example: 2nd location use the default value for `option`:
+
+```
+{option}={element};;{element}
+```
+
+## General options
+
+| Option     | Values                                                 | Description                                      |
+|------------|--------------------------------------------------------|--------------------------------------------------|
+|bearings    |`{bearing};{bearing}[;{bearing} ...]`                   |Limits the search to segments with given bearing in degrees towards true north in clockwise direction. |
+|radiuses    |`{radius};{radius}[;{radius} ...]`                      |Limits the search to given radius in meters.      |
+|hints       |`{hint};{hint}[;{hint} ...]`                            |Hint to derive position in street network.        |
+
+Where the elements follow the following format:
+
+| Element    | Values                                                 |
+|------------|--------------------------------------------------------|
+|bearing     |`{value},{range}` `integer 0 .. 360,integer 0 .. 180`  |
+|radius      |`double >= 0` or `unlimited` (default)                  |
+|hint        |Base64 `string`                                         |
+
+#### Examples
+
+Query on Berlin with three coordinates:
+
+```
+http://router.project-osrm.org/route/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219?overview=false
+```
+
+Using polyline:
+
+```
+http://router.project-osrm.org/route/v1/driving/polyline(ofp_Ik_vpAilAyu@te@g`E)?overview=false
+```
+
+### Response
+
+Every response object has a `code` field.
+
+```json
+{
+"code": {code},
+"message": {message}
+}
+```
+
+Where `code` is on one of the strings below or service dependent:
+
+| Type              | Description                                                                      |
+|-------------------|----------------------------------------------------------------------------------|
+| `Ok`              | Request could be processed as expected.                                          |
+| `InvalidUrl`      | URL string is invalid.                                                           |
+| `InvalidService`  | Service name is invalid.                                                         |
+| `InvalidVersion`  | Version is not found.                                                            |
+| `InvalidOptions`  | Options are invalid.                                                             |
+| `NoSegment`       | One of the supplied input coordinates could not snap to street segment.          |
+| `TooBig`          | The request size violates one of the service specific request size restrictions. |
+
+`message` is a **optional** human-readable error message. All other status types are service dependent.
+
+In case of an error the HTTP status code will be `400`. Otherwise the HTTP status code will be `200` and `code` will be `Ok`.
+
+## Service `nearest`
+
+Snaps a coordinate to the street network and returns the nearest n matches.
+
+### Request
+
+```
+http://{server}/nearest/v1/{profile}/{coordinates}.json?number={number}
+```
+
+Where `coordinates` only supports a single `{longitude},{latitude}` entry.
+
+In addition to the [general options](#general-options) the following options are supported for this service:
+
+|Option      |Values                        |Description                                         |
+|------------|------------------------------|----------------------------------------------------|
+|number      |`integer >= 1` (default `1`)  |Number of nearest segments that should be returned. |
+
+### Response
+
+- `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
+- `waypoints` array of `Waypoint` objects sorted by distance to the input coordinate. Each object has at least the following additional properties:
+  - `distance`: Distance in meters to the supplied input coordinate.
+
+### Examples
+
+Querying nearest three snapped locations of `13.388860,52.517037` with a bearing between `20° - 340°`.
+
+```
+http://router.project-osrm.org/nearest/v1/driving/13.388860,52.517037?number=3&bearings=0,20
+```
+
+## Service `route`
+
+### Request
+
+```
+http://{server}/route/v1/{profile}/{coordinates}?alternatives={true|false}&steps={true|false}&geometries={polyline|geojson}&overview={full|simplified|false}
+```
+
+In addition to the [general options](#general-options) the following options are supported for this service:
+
+|Option      |Values                                    |Description                                                                    |
+|------------|------------------------------------------|-------------------------------------------------------------------------------|
+|alternatives|`true`, `false` (default)                 |Search for alternative routes and return as well.\*                            |
+|steps       |`true`, `false` (default)                 |Return route steps for each route leg                                          |
+|geometries  |`polyline` (default), `geojson`           |Returned route geometry format (influences overview and per step)             |
+|overview    |`simplified` (default), `full`, `false`   |Add overview geometry either full, simplified according to highest zoom level it could be display on, or not at all.|
+|continue_straight |`default` (default), `true`, `false`|Forces the route to keep going straight at waypoints and don't do a uturn even if it would be faster. Default value depends on the profile. |
+
+\* Please note that even if an alternative route is requested, a result cannot be guaranteed.
+
+### Response
+
+- `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
+- `waypoints`: Array of `Waypoint` objects representing all waypoints in order:
+- `routes`: An array of `Route` objects, ordered by descending recommendation rank.
+
+In case of error the following `code`s are supported in addition to the general ones:
+
+| Type              | Description     |
+|-------------------|-----------------|
+| `NoRoute`        | No route found. |
+
+All other fields might be undefined.
+
+## Service `table`
+### Request
+```
+http://{server}/table/v1/{profile}/{coordinates}?{sources}=[{elem}...];&destinations=[{elem}...]`
+```
+
+This computes duration tables for the given locations. Allows for both symmetric and asymmetric tables.
+
+### Coordinates
+
+In addition to the [general options](#general-options) the following options are supported for this service:
+
+|Option      |Values                                            |Description                                  |
+|------------|--------------------------------------------------|---------------------------------------------|
+|sources     |`{index};{index}[;{index} ...]` or `all` (default)|Use location with given index as source.     |
+|destinations|`{index};{index}[;{index} ...]` or `all` (default)|Use location with given index as destination.|
+
+Unlike other array encoded options, the length of `sources` and `destinations` can be **smaller or equal**
+to number of input locations;
+
+Example:
+
+```
+sources=0;5;7&destinations=5;1;4;2;3;6
+```
+
+|Element     |Values                       |
+|------------|-----------------------------|
+|index       |`0 <= integer < #locations`  |
+
+### Response
+
+- `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
+- `durations` array of arrays that stores the matrix in row-major order. `durations[i][j]` gives the travel time from
+  the i-th waypoint to the j-th waypoint. Values are given in seconds.
+- `sources` array of `Waypoint` objects describing all sources in order
+- `destinations` array of `Waypoint` objects describing all destinations in order
+
+In case of error the following `code`s are supported in addition to the general ones:
+
+| Type              | Description     |
+|-------------------|-----------------|
+| `NoTable`        | No route found. |
+
+All other fields might be undefined.
+
+#### Examples
+
+Returns a `3x3` matrix:
+```
+http://router.project-osrm.org/table/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219
+```
+
+Returns a `1x3` matrix:
+```
+http://router.project-osrm.org/table/v1/driving/13.388860,52.517037;13.397634,52.529407;13.428555,52.523219?sources=0
+```
+
+Returns a asymmetric 3x2 matrix with from the polyline encoded locations `qikdcB}~dpXkkHz`:
+```
+http://router.project-osrm.org/table/v1/driving/qikdcB}~dpXkkHz?sources=0;1;3&destinations=2;4
+```
+
+## Service `match`
+
+Map matching matches given GPS points to the road network in the most plausible way.
+Please note the request might result multiple sub-traces. Large jumps in the timestamps (>60s) or improbable transitions lead to trace splits if a complete matching could not be found.
+The algorithm might not be able to match all points. Outliers are removed if they can not be matched successfully.
+
+### Request
+
+```
+http://{server}/match/v1/{profile}/{coordinates}?steps={true|false}&geometries={polyline|geojson}&overview={simplified|full|false}
+```
+
+In addition to the [general options](#general-options) the following options are supported for this service:
+
+
+|Option      |Values                                          |Description                                                                               |
+|------------|------------------------------------------------|------------------------------------------------------------------------------------------|
+|steps       |`true`, `false` (default)                       |Return route steps for each route                                                         |
+|geometries  |`polyline` (default), `geojson`                 |Returned route geometry format (influences overview and per step)                        |
+|overview    |`simplified` (default), `full`, `false`         |Add overview geometry either full, simplified according to highest zoom level it could be display on, or not at all.|
+|timestamps  |`{timestamp};{timestamp}[;{timestamp} ...]`     |Timestamp of the input location.                                                          |
+|radiuses    |`{radius};{radius}[;{radius} ...]`              |Standard deviation of GPS precision used for map matching. If applicable use GPS accuracy.|
+
+|Parameter   |Values                        |
+|------------|------------------------------|
+|timestamp   |`integer` UNIX-like timestamp |
+|radius      |`double >= 0` (default 5m)    |
+
+### Response
+- `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
+- `tracepoints`: Array of `Ẁaypoint` objects representing all points of the trace in order.
+  If the trace point was ommited by map matching because it is an outlier, the entry will be `null`.
+  Each `Waypoint` object has the following additional properties:
+  - `matchings_index`: Index to the `Route` object in `matchings` the sub-trace was matched to.
+  - `waypoint_index`: Index of the waypoint inside the matched route.
+- `matchings`: An array of `Route` objects that assemble the trace. Each `Route` object has the following additional properties:
+  - `confidence`: Confidence of the matching. `float` value between 0 and 1. 1 is very confident that the matching is correct.
+
+In case of error the following `code`s are supported in addition to the general ones:
+
+| Type              | Description         |
+|-------------------|---------------------|
+| `NoMatch`         | No matchings found. |
+
+All other fields might be undefined.
+
+## Service `trip`
+
+The trip plugin solves the Traveling Salesman Problem using a greedy heuristic (farthest-insertion algorithm).
+The returned path does not have to be the shortest path, as TSP is NP-hard it is only an approximation.
+Note that if the input coordinates can not be joined by a single trip (e.g. the coordinates are on several disconnected islands)
+multiple trips for each connected component are returned.
+
+### Request
+
+```
+http://{server}/trip/v1/{profile}/{coordinates}?steps={true|false}&geometries={polyline|geojson}&overview={simplified|full|false}
+```
+
+In addition to the [general options](#general-options) the following options are supported for this service:
+
+|Option      |Values                                          |Description                                                                |
+|------------|------------------------------------------------|---------------------------------------------------------------------------|
+|steps       |`true`, `false` (default)                       |Return route instructions for each trip                                    |
+|geometries  |`polyline` (default), `geojson`                 |Returned route geometry format (influences overview and per step)         |
+|overview    |`simplified` (default), `full`, `false`         |Add overview geometry either full, simplified according to highest zoom level it could be display on, or not at all.|
+
+### Response
+
+- `code` if the request was successful `Ok` otherwise see the service dependent and general status codes.
+- `waypoints`: Array of `Waypoint` objects representing all waypoints in input order. Each `Waypoint` object has the following additional properties:
+  - `trips_index`: Index to `trips` of the sub-trip the point was matched to.
+  - `waypoint_index`: Index of the point in the trip.
+- `trips`: An array of `Route` objects that assemble the trace.
+
+In case of error the following `code`s are supported in addition to the general ones:
+
+| Type              | Description         |
+|-------------------|---------------------|
+| `NoTrips`        | No trips found.     |
+
+All other fields might be undefined.
+
+## Result objects
+
+### Route
+
+Represents a route through (potentially multiple) waypoints.
+
+#### Properties
+
+- `distance`: The distance traveled by the route, in `float` meters.
+- `duration`: The estimated travel time, in `float` number of seconds.
+- `geometry`: The whole geometry of the route value depending on `overview` parameter, format depending on the `geometries` parameter. See `RouteStep`'s `geometry` field for a parameter documentation.
+  
+  | overview   | Description                 |
+  |------------|-----------------------------|
+  | simplified | Geometry is simplified according to the highest zoom level it can still be displayed on full. |
+  | full       | Geometry is not simplified. |
+  | false      | Geometry is not added.      |
+  
+- `legs`: The legs between the given waypoints, an array of `RouteLeg` objects.
+
+#### Example
+
+Three input coordinates, `geometry=geojson`, `steps=false`:
+
+```json
+{
+  "distance": 90.0,
+  "duration": 300.0,
+  "geometry": {"type": "LineString", "coordinates": [[120., 10.], [120.1, 10.], [120.2, 10.], [120.3, 10.]]},
+  "legs": [
+    {
+      "distance": 30.0,
+      "duration": 100.0,
+      "steps": []
+    },
+    {
+      "distance": 60.0,
+      "duration": 200.0,
+      "steps": []
+    }
+  ]
+}
+```
+
+### RouteLeg
+
+Represents a route between two waypoints.
+
+#### Properties
+
+- `distance`: The distance traveled by this route leg, in `float` meters.
+- `duration`: The estimated travel time, in `float` number of seconds.
+- `summary`: Summary of the route taken as `string`. Depends on the `steps` parameter:
+   
+   | steps        |                                                                       |
+   |--------------|-----------------------------------------------------------------------|
+   | true         | Names of the two major roads used. Can be empty if route is too short.|
+   | false        | empty `string`                                                        |
+
+- `steps`: Depends on the `steps` parameter.
+   
+   | steps        |                                                                       |
+   |--------------|-----------------------------------------------------------------------|
+   | true         | array of `RouteStep` objects describing the turn-by-turn instructions |
+   | false        | empty array                                                           |
+
+#### Example
+
+With `steps=false`:
+
+```json
+{
+  "distance": 30.0,
+  "duration": 100.0,
+  "steps": []
+}
+```
+
+### RouteStep
+
+A step consists of a maneuver such as a turn or merge, followed
+by a distance of travel along a single way to the subsequent
+step.
+
+#### Properties
+
+- `distance`: The distance of travel from the maneuver to the subsequent step, in `float` meters.
+- `duration`: The estimated travel time, in `float` number of seconds.
+- `geometry`: The unsimplified geometry of the route segment, depending on the `geometries` parameter.
+  
+  | geometries |                                                                    |
+  |------------|--------------------------------------------------------------------|
+  | polyline   | [polyline](https://www.npmjs.com/package/polyline) with precision 5 in [latitude,longitude] encoding |
+  | geojson    | [GeoJSON `LineString`](http://geojson.org/geojson-spec.html#linestring) or [GeoJSON `Point`](http://geojson.org/geojson-spec.html#point) if it is only one coordinate (not wrapped by a GeoJSON feature)|
+  
+- `name`: The name of the way along which travel proceeds.
+- `mode`: A string signifying the mode of transportation.
+- `maneuver`: A `StepManeuver` object representing the maneuver.
+
+#### Example
+
+### StepManeuver
+
+#### Properties
+
+- `location`: A `[longitude, latitude]` pair describing the location of the turn.
+- `bearing_before`: The clockwise angle from true north to the
+  direction of travel immediately before the maneuver.
+- `bearing_after`: The clockwise angle from true north to the
+  direction of travel immediately after the maneuver.
+- `type` A string indicating the type of maneuver. **new identifiers might be introduced without API change**
+   Types  unknown to the client should be handled like the `turn` type, the existance of correct `modifier` values is guranteed.
+  
+  | `type`            | Description                                                  |
+  |-------------------|--------------------------------------------------------------|
+  | turn              | a basic turn into direction of the `modifier`                |
+  | new name          | no turn is taken, but the road name changes. The Road can take a turn itself, following `modifier`                  |
+  | depart            | indicates the departure of the leg                           |
+  | arrive            | indicates the destination of the leg                         |
+  | merge             | merge onto a street (e.g. getting on the highway from a ramp, the `modifier specifies the direction of the merge`) |
+  | ramp              | **Deprecated**. Replaced by `on_ramp` and `off_ramp`.        |
+  | on ramp           | take a ramp to enter a highway (direction given my `modifier`) |
+  | off ramp          | take a ramp to exit a highway (direction given my `modifier`)  |
+  | fork              | take the left/right side at a fork depending on `modifier`   |
+  | end of road       | road ends in a T intersection turn in direction of `modifier`|
+  | continue          | Turn in direction of `modifier` to stay on the same road     |
+  | roundabout        | traverse roundabout, has additional field `exit` with NR if the roundabout is left. `the modifier specifies the direction of entering the roundabout` |
+  | rotary            | a larger version of a roundabout, can offer `rotary_name` in addition to the `exit` parameter.  |
+  | roundabout turn   | Describes a turn at a small roundabout that should be treated as normal turn. The `modifier` indicates the turn direciton. Example instruction: `At the roundabout turn left`. |
+  | notification      | not an actual turn but a change in the driving conditions. For example the travel mode.  If the road takes a turn itself, the `modifier` describes the direction |
+
+  Please note that even though there are `new name` and `notification` instructions, the `mode` and `name` can change
+  between all instructions. They only offer a fallback in case nothing else is to report.
+
+
+- `modifier` An optional `string` indicating the direction change of the maneuver.
+
+  | `modifier`        | Description                               |
+  |-------------------|-------------------------------------------|
+  | uturn             | indicates  reversal of direction          |
+  | sharp right       | a sharp right turn                        |
+  | right             | a normal turn to the right                |
+  | slight right      | a slight turn to the right                |
+  | straight          | no relevant change in direction           |
+  | slight left       | a slight turn to the left                 |
+  | left              | a normal turn to the left                 |
+  | sharp left        | a sharp turn to the left                  |
+
+ The list of turns without a modifier is limited to: `depart/arrive`. If the source/target location is close enough to the `depart/arrive` location, no modifier will be given.
+  
+  The meaning depends on the `type` field.
+    
+  | `type`                 | Description                                                                                                               |
+  |------------------------|---------------------------------------------------------------------------------------------------------------------------|
+  | `turn`                 | `modifier` indicates the change in direction accomplished through the turn                                                |
+  | `depart`/`arrive`      | `modifier` indicates the position of departure point and arrival point in relation to the current direction of travel      |
+ 
+
+- `exit` An optional `integer` indicating number of the exit to take. The field exists for the following `type` field:
+  
+  | `type`                 | Description                                                                                                               |
+  |------------------------|---------------------------------------------------------------------------------------------------------------------------|
+  | `roundabout`           | Number of the roundabout exit to take. If exit is `undefined` the destination is on the roundabout.                       |
+  | `turn` or `end of road`| Indicates the number of intersections passed until the turn. Example instruction: `at the fourth intersection, turn left` |
+  
+
+New properties (potentially depending on `type`) may be introduced in the future without an API version change.
+
+### Waypoint
+
+Object used to describe waypoint on a route.
+
+#### Properties
+
+- `name` Name of the street the coordinate snapped to
+- `location` Array that contains the `[longitude, latitude]` pair of the snapped coordinate
+- `hint` Unique internal identifier of the segment (ephemeral, not constant over data updates)
+   This can be used on subsequent request to significantly speed up the query and to connect multiple services.
+   E.g. you can use the `hint` value obtained by the `nearest` query as `hint` values for `route` inputs.
+
+## Service `tile`
+
+This generates [Mapbox Vector Tiles](https://www.mapbox.com/developers/vector-tiles/) that can be viewed with a vector-tile capable slippy-map viewer.  The tiles contain road geometries and metadata that can be used to examine the routing graph.  The tiles are generated directly from the data in-memory, so are in sync with actual routing results, and let you examine which roads are actually routable, and what weights they have applied.
+
+### Request
+```
+http://{server}/tile/v1/{profile}/tile({x},{y},{zoom}).mvt
+```
+
+The `x`, `y`, and `zoom` values are the same as described at https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames, and are supported by vector tile viewers like [Mapbox GL JS](https://www.mapbox.com/mapbox-gl-js/api/).
+
+### Response
+
+The response object is either a binary encoded blob with a `Content-Type` of `application/x-protobuf`, or a `404` error.  Note that OSRM is hard-coded to only return tiles from zoom level 12 and higher (to avoid accidentally returning extremely large vector tiles).
+
+Vector tiles contain just a single layer named `speeds`.  Within that layer, features can have `speed` (int) and `is_small` (boolean) attributes.

docs/libosrm.md

@@ -0,0 +1,26 @@
+OSRM can be used as a library (libosrm) via C++ instead of using it through the HTTP interface and `osrm-routed`. This allows for fine-tuning OSRM and has much less overhead. Here is a quick introduction into how to use `libosrm` in the upcoming v5 release.
+
+Take a look at the example code that lives in the [example directory](https://github.com/Project-OSRM/osrm-backend/tree/master/example). Here is all you ever wanted to know about `libosrm`, that is a short description of what the types do and where to find documentation on it:
+
+- [`EngineConfig`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/engine_config.hpp) - for initializing an OSRM instance we can configure certain properties and constraints. E.g. the storage config is the base path such as `france.osm.osrm` from which we derive and load `france.osm.osrm.*` auxiliary files. This also lets you set constraints such as the maximum number of locations allowed for specific services.
+
+- [`OSRM`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/osrm/osrm.hpp) - this is the main Routing Machine type with functions such as `Route` and `Table`. You initialize it with a `EngineConfig`. It does all the heavy lifting for you. Each function takes its own parameters, e.g. the `Route` function takes `RouteParameters`, and a out-reference to a JSON result that gets filled. The return value is a `Status`, indicating error or success.
+
+- [`Status`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/status.hpp) - this is a type wrapping `Error` or `Ok` for indicating error or success, respectively.
+
+- [`TableParameters`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/api/table_parameters.hpp) - this is an example of parameter types the Routing Machine functions expect. In this case `Table` expects its own parameters as `TableParameters`. You can see it wrapping two vectors, sources and destinations --- these are indices into your coordinates for the table service to construct a matrix from (empty sources or destinations means: use all of them). If you ask yourself where coordinates come from, you can see `TableParameters` inheriting from `BaseParameters`.
+
+- [`BaseParameter`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/engine/api/base_parameters.hpp) - this most importantly holds coordinates (and a few other optional properties that you don't need for basic usage); the specific parameter types inherit from `BaseParameters` to get these member attributes. That means your `TableParameters` type has `coordinates`, `sources` and `destination` member attributes (and a few other that we ignore for now).
+
+- [`Coordinate`](https://github.com/Project-OSRM/osrm-backend/blob/master/include/util/coordinate.hpp) - this is a wrapper around a (longitude, latitude) pair. We really don't care about (lon,lat) vs (lat, lon) but we don't want you to accidentally mix them up, so both latitude and longitude are strictly typed wrappers around integers (fixed notation such as `13423240`) and floating points (floating notation such as `13.42324`).
+
+- [Parameters for other services](https://github.com/Project-OSRM/osrm-backend/tree/master/include/engine/api) - here are all other `*Parameters` you need for other Routing Machine services.
+
+- [JSON](https://github.com/Project-OSRM/osrm-backend/blob/master/include/util/json_container.hpp) - this is a sum type resembling JSON. The Routing Machine service functions take a out-ref to a JSON result and fill it accordingly. It is currently implemented using [mapbox/variant](https://github.com/mapbox/variant) which is similar to [Boost.Variant](http://www.boost.org/doc/libs/1_55_0/doc/html/variant.html) (Boost documentation is great). There are two ways to work with this sum type: either provide a visitor that acts on each type on visitation or use the `get` function in case you're sure about the structure. The JSON structure is written down in the [[v5 server API|Server-API-v5,-current]].
+
+------------------------------------------------------------------------------------------------------------------
+
+To summarize:
+ - create an `OSRM` instance initialized with a `EngineConfig`
+ - call the service function on the `OSRM` object providing service specific `*Parameters`
+ - check the return code and use the JSON result

docs/profiles.md

@@ -0,0 +1,34 @@
+OSRM supports "profiles". Configurations representing different routing behaviours for (typically) different transport modes. A profile describes whether or not we route along a particular type of way, or over a particular node in the OpenStreetMap data, and also how quickly we'll be travelling when we do. This feeds into the way the routing graph is created and thus influences the output routes.
+
+## Available profiles
+
+Out-of-the-box OSRM comes with several different profiles, including car, bicycle and foot.
+
+Profile configuration files have a 'lua' extension, and are found under the 'profiles' subdirectory.
+Alternatively commands will take a lua profile specified with an explicit -p param, for example:
+
+`osrm-extract -p ../profiles/car.lua planet-latest.osm.pbf`
+
+And then **you will need to extract and contract again** (A change to the profile will typically affect the extract step as well as the contract step. See [Processing Flow](https://github.com/Project-OSRM/osrm-backend/wiki/Processing-Flow))
+
+## lua scripts?
+
+Profiles are not just configuration files. They are scripts written in the "lua" scripting language ( http://www.lua.org )  The reason for this, is that OpenStreetMap data is not sufficiently straightforward, to simply define tag mappings. Lua scripting offers a powerful way of coping with the complexity of different node,way,relation,tag combinations found within OpenStreetMap data.
+
+## Basic structure of a profile
+
+You can understand these lua scripts enough to make interesting modifications, without needing to get to grips with how they work completely.
+
+Towards the top of the file, a profile (such as [car.lua](../profiles/car.lua)) will typically define various configurations as global variables. A lot of these are look-up hashes of one sort or another.
+
+As you scroll down the file you'll see local variables, and then local functions, and finally...
+
+`way_function` and `node_function` are the important functions which are called when extracting OpenStreetMap data with `osrm-extract`.
+
+## way_function
+
+Given an OpenStreetMap way, the way_function will either return nothing (meaning we are not going to route over this way at all), or it will set up a result hash to be returned. The most important thing it will do is set the value of `result.forward_speed` and `result.backward_speed` as a suitable integer value representing the speed for traversing the way.
+
+All other calculations stem from that, including the returned timings in driving directions, but also, less directly, it feeds into the actual routing decisions the engine will take (a way with a slow traversal speed, may be less favoured than a way with fast traversal speed, but it depends how long it is, and... what it connects to in the rest of the network graph)
+
+Using the power of the scripting language you wouldn't typically see something as simple as a `result.forward_speed = 20` line within the way_function. Instead a way_function will examine the tagging (e.g. `way:get_value_by_key("highway")` and many others), process this information in various ways, calling other local functions, referencing the global variables and look-up hashes, before arriving at the result.

docs/releasing.md

@@ -0,0 +1,50 @@
+# Releasing a new OSRM version
+
+Do decide if this is a major or minor version bump use: http://semver.org/
+
+What we guarantee on major version changes:
+
+- Breaking changes will be in the changelog
+- If we break an HTTP API we bump the version
+
+What we guarantee on minor version changes:
+
+- HTTP API does not include breaking changes
+- C++ library API does not include breaking changes
+- node-osrm API does not include breaking changes
+
+What we DO NOT guarantee on minor version changes:
+
+- file format comp ability. Breakage will be listed in the changelog.
+- new turn types and fields may be introduced. How to handle this see [the HTTP API docs](http.md).
+
+What we guarantee on patch version changes:
+
+- HTTP API does not include breaking changes
+- C++ library API does not include breaking changes
+- node-osrm API does not include breaking changes
+- full file format compatibility
+
+## Major or Minor release x.y
+
+1. Make sure all tests are passing (e.g. Travis CI gives you a :thumbs_up:)
+2. Make sure `CHANGELOG.md` is up to date.
+3. Make sure the OSRM version in `CMakeLists.txt` is up to date
+4. Use an annotated tag to mark the release: `git tag vx.y.0 -a` Body of the tag description should be the changelog entries.
+5. Push tags and commits: `git push; git push --tags`
+6. Branch of the `vx.y.0` tag to create a release branch `x.y`:
+   `git branch x.y. vx.y.0; git push -u x.y:origin/x.y`
+7. Modify `.travis.yml` to allow builds for the `x.y` branch.
+8. Write a mailing-list post to osrm-talk@openstreetmap.org to announce the release
+
+## Patch release x.y.z
+
+1. Check out the appropriate release branch x.y
+2. Make sure all fixes are listed in the changelog and included in the branch
+3. Make sure all tests are passing (e.g. Travis CI gives you a :thumbs_up:)
+4. Make sure the OSRM version in `CMakeLists.txt` is up to date
+5. Use an annotated tag to mark the release: `git tag vx.y.z -a` Body of the tag description should be the changelog entries.
+6. Push tags and commits: `git push; git push --tags`
+7. Proceede with the `node-osrm` release as outlined in the repository.
+8. Write a mailing-list post to osrm-talk@openstreetmap.org to announce the release
+

example/CMakeLists.txt

@@ -19,8 +19,8 @@ else()
   message(WARNING "Building on a 32 bit system is unsupported")
 endif()
 
-if(WIN32 AND MSVC_VERSION LESS 1800)
-  message(FATAL_ERROR "Building with Microsoft compiler needs Visual Studio 2013 or later (Express version works too)")
+if(WIN32 AND MSVC_VERSION LESS 1900)
+  message(FATAL_ERROR "Building with Microsoft compiler needs Latest Visual Studio 2015 (Community or better)")
 endif()
 
 add_executable(osrm-example example.cpp)

features/bicycle/area.feature

@@ -4,7 +4,7 @@ Feature: Bike - Squares and other areas
     Background:
         Given the profile "bicycle"
 
-    @square @mokob @2154
+    @square
     Scenario: Bike - Route along edge of a squares
         Given the node map
             | x |   |
@@ -50,7 +50,7 @@ Feature: Bike - Squares and other areas
             | d    | a  | xa,xa |
             | a    | d  | xa,xa |
 
-    @parking @mokob @2154
+    @parking
     Scenario: Bike - parking areas
         Given the node map
             | e |   |   | f |
@@ -78,7 +78,7 @@ Feature: Bike - Squares and other areas
             | a    | d  | abcda,abcda    |
 
 
-    @train @platform @mokob @2154
+    @train @platform
     Scenario: Bike - railway platforms
         Given the node map
             | x | a | b | y |

features/bicycle/names.feature

@@ -10,13 +10,13 @@ Feature: Bike - Street names in instructions
             |   | c |
 
         And the ways
-            | nodes | name     |
-            | ab    | My Way   |
-            | bc    | Your Way |
+            | nodes | name     | ref |
+            | ab    | My Way   | A6  |
+            | bc    | Your Way | A7  |
 
         When I route I should get
-            | from | to | route                    |
-            | a    | c  | My Way,Your Way,Your Way |
+            | from | to | route                                   |
+            | a    | c  | My Way (A6),Your Way (A7),Your Way (A7) |
 
     @unnamed
     Scenario: Bike - Use way type to describe unnamed ways

features/bicycle/ref.feature

@@ -14,7 +14,7 @@ Feature: Bike - Way ref
 
         When I route I should get
             | from | to | route                               |
-            | a    | b  | Utopia Drive / E7,Utopia Drive / E7 |
+            | a    | b  | Utopia Drive (E7),Utopia Drive (E7) |
 
     Scenario: Bike - Way with only ref
         Given the node map

features/car/advisory.feature

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

features/car/traffic_speeds.feature

@@ -31,7 +31,7 @@ Feature: Traffic - speeds
         4,1,27
         """
 
-    Scenario: Weighting not based on raster sources
+    Scenario: Weighting based on speed file
         Given the profile "testbot"
         Given the extract extra arguments "--generate-edge-lookup"
         Given the contract extra arguments "--segment-speed-file speeds.csv"

features/car/traffic_turn_penalties.feature

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

features/foot/names.feature

@@ -10,13 +10,13 @@ Feature: Foot - Street names in instructions
             |   | c |
 
         And the ways
-            | nodes | name     |
-            | ab    | My Way   |
-            | bc    | Your Way |
+            | nodes | name     | ref |
+            | ab    | My Way   | A6  |
+            | bc    | Your Way | B7  |
 
         When I route I should get
-            | from | to | route                    |
-            | a    | c  | My Way,Your Way,Your Way |
+            | from | to | route                                   |
+            | a    | c  | My Way (A6),Your Way (B7),Your Way (B7) |
 
     @unnamed
     Scenario: Foot - Use way type to describe unnamed ways

features/foot/ref.feature

@@ -14,7 +14,7 @@ Feature: Foot - Way ref
 
         When I route I should get
             | from | to | route                               |
-            | a    | b  | Utopia Drive / E7,Utopia Drive / E7 |
+            | a    | b  | Utopia Drive (E7),Utopia Drive (E7) |
 
     Scenario: Foot - Way with only ref
         Given the node map

features/guidance/bridges_and_tunnels.feature

@@ -0,0 +1,120 @@
+@routing @car @bridge @tunnel @guidance
+Feature: Car - Guidance - Bridges and Tunnels
+    Background:
+        Given the profile "car"
+        And a grid size of 100 meters
+
+    Scenario: Simple Bridge
+        Given the node map
+            | a | b | c | d |
+
+        And the ways
+            | nodes | highway | bridge | name               |
+            | ab    | primary |        | Hauptstraße        |
+            | bc    | primary | yes    | Hauptstraßenbrücke |
+            | cd    | primary |        | Hauptstraße        |
+
+        When I route I should get
+            | from | to | route                   | turns         |
+            | a    | d  | Hauptstraße,Hauptstraße | depart,arrive |
+
+    Scenario: Bridge with Immediate Turn
+        Given the node map
+            |   |   |   | d |
+            | a |   | b | c |
+            |   |   |   | e |
+
+        And the ways
+            | nodes | highway | bridge | name               |
+            | ab    | primary |        | Hauptstraße        |
+            | bc    | primary | yes    | Hauptstraßenbrücke |
+            | dce   | primary |        | Nebenstraße        |
+
+        When I route I should get
+            | from | to | route                                      | turns                           |
+            | a    | d  | Hauptstraße,Nebenstraße,Nebenstraße        | depart,end of road left,arrive  |
+            | a    | e  | Hauptstraße,Nebenstraße,Nebenstraße        | depart,end of road right,arrive |
+            | e    | a  | Nebenstraße,Hauptstraßenbrücke,Hauptstraße | depart,turn left,arrive         |
+            | d    | a  | Nebenstraße,Hauptstraßenbrücke,Hauptstraße | depart,turn right,arrive        |
+
+    Scenario: Bridge with Immediate Turn Front and Back
+        Given the node map
+            | f |   |   | d |
+            | a |   | b | c |
+            | g |   |   | e |
+
+        And the ways
+            | nodes | highway | bridge | name               |
+            | ab    | primary |        | Hauptstraße        |
+            | bc    | primary | yes    | Hauptstraßenbrücke |
+            | dce   | primary |        | Nebenstraße        |
+            | gaf   | primary |        | Anderestraße       |
+
+        When I route I should get
+            | from | to | route                                                    | turns                                      |
+            | f    | d  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn left,end of road left,arrive   |
+            | f    | e  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn left,end of road right,arrive  |
+            | g    | d  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn right,end of road left,arrive  |
+            | g    | e  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn right,end of road right,arrive |
+            | e    | f  | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn left,end of road right,arrive  |
+            | e    | g  | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn left,end of road left,arrive   |
+            | d    | f  | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn right,end of road right,arrive |
+            | d    | g  | Nebenstraße,Hauptstraßenbrücke,Anderestraße,Anderestraße | depart,turn right,end of road left,arrive  |
+
+    Scenario: Simple Tunnel
+        Given the node map
+            | a | b | c | d |
+
+        And the ways
+            | nodes | highway | tunnel | name               |
+            | ab    | primary |        | Hauptstraße        |
+            | bc    | primary | yes    | Hauptstraßentunnel |
+            | cd    | primary |        | Hauptstraße        |
+
+        When I route I should get
+            | from | to | route                   | turns         |
+            | a    | d  | Hauptstraße,Hauptstraße | depart,arrive |
+
+    Scenario: Tunnel with Immediate Turn
+        Given the node map
+            |   |   |   | d |
+            | a |   | b | c |
+            |   |   |   | e |
+
+        And the ways
+            | nodes | highway | tunnel | name               |
+            | ab    | primary |        | Hauptstraße        |
+            | bc    | primary | yes    | Hauptstraßentunnel |
+            | dce   | primary |        | Nebenstraße        |
+
+        When I route I should get
+            | from | to | route                                      | turns                           |
+            | a    | d  | Hauptstraße,Nebenstraße,Nebenstraße        | depart,end of road left,arrive  |
+            | a    | e  | Hauptstraße,Nebenstraße,Nebenstraße        | depart,end of road right,arrive |
+            | e    | a  | Nebenstraße,Hauptstraßentunnel,Hauptstraße | depart,turn left,arrive         |
+            | d    | a  | Nebenstraße,Hauptstraßentunnel,Hauptstraße | depart,turn right,arrive        |
+
+    Scenario: Tunnel with Immediate Turn Front and Back
+        Given the node map
+            | f |   |   | d |
+            | a |   | b | c |
+            | g |   |   | e |
+
+        And the ways
+            | nodes | highway | bridge | name               |
+            | ab    | primary |        | Hauptstraße        |
+            | bc    | primary | yes    | Hauptstraßentunnel |
+            | dce   | primary |        | Nebenstraße        |
+            | gaf   | primary |        | Anderestraße       |
+
+        When I route I should get
+            | from | to | route                                                    | turns                                      |
+            | f    | d  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn left,end of road left,arrive   |
+            | f    | e  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn left,end of road right,arrive  |
+            | g    | d  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn right,end of road left,arrive  |
+            | g    | e  | Anderestraße,Hauptstraße,Nebenstraße,Nebenstraße         | depart,turn right,end of road right,arrive |
+            | e    | f  | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn left,end of road right,arrive  |
+            | e    | g  | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn left,end of road left,arrive   |
+            | d    | f  | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn right,end of road right,arrive |
+            | d    | g  | Nebenstraße,Hauptstraßentunnel,Anderestraße,Anderestraße | depart,turn right,end of road left,arrive  |
+

features/guidance/collapse.feature

@@ -0,0 +1,347 @@
+@routing  @guidance @collapsing
+Feature: Collapse
+
+    Background:
+        Given the profile "car"
+        Given a grid size of 20 meters
+
+    Scenario: Segregated Intersection, Cross Belonging to Single Street
+        Given the node map
+            |   |   | i | l |   |   |
+            |   |   |   |   |   |   |
+            | d |   | c | b |   | a |
+            | e |   | f | g |   | h |
+            |   |   |   |   |   |   |
+            |   |   | j | k |   |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | ab    | primary | first  | yes    |
+            | bc    | primary | first  | yes    |
+            | cd    | primary | first  | yes    |
+            | ef    | primary | first  | yes    |
+            | fg    | primary | first  | yes    |
+            | gh    | primary | first  | yes    |
+            | ic    | primary | second | yes    |
+            | bl    | primary | second | yes    |
+            | kg    | primary | second | yes    |
+            | fj    | primary | second | yes    |
+            | cf    | primary | first  | yes    |
+            | gb    | primary | first  | yes    |
+
+       When I route I should get
+            | waypoints | route                | turns                        |
+            | a,l       | first,second,second  | depart,turn right,arrive     |
+            | a,d       | first,first          | depart,arrive                |
+            | a,j       | first,second,second  | depart,turn left,arrive      |
+            | a,h       | first,first,first    | depart,continue uturn,arrive |
+            | e,j       | first,second,second  | depart,turn right,arrive     |
+            | e,h       | first,first          | depart,arrive                |
+            | e,l       | first,second,second  | depart,turn left,arrive      |
+            | e,d       | first,first,first    | depart,continue uturn,arrive |
+            | k,h       | second,first,first   | depart,turn right,arrive     |
+            | k,l       | second,second        | depart,arrive                |
+            | k,d       | second,first,first   | depart,turn left,arrive      |
+            | k,j       | second,second,second | depart,continue uturn,arrive |
+            | i,d       | second,first,first   | depart,turn right,arrive     |
+            | i,j       | second,second        | depart,arrive                |
+            | i,h       | second,first,first   | depart,turn left,arrive      |
+            | i,l       | second,second,second | depart,continue uturn,arrive |
+
+    Scenario: Segregated Intersection, Cross Belonging to Correct Street
+        Given the node map
+            |   |   | i | l |   |   |
+            |   |   |   |   |   |   |
+            | d |   | c | b |   | a |
+            | e |   | f | g |   | h |
+            |   |   |   |   |   |   |
+            |   |   | j | k |   |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | ab    | primary | first  | yes    |
+            | bc    | primary | first  | yes    |
+            | cd    | primary | first  | yes    |
+            | ef    | primary | first  | yes    |
+            | fg    | primary | first  | yes    |
+            | gh    | primary | first  | yes    |
+            | ic    | primary | second | yes    |
+            | bl    | primary | second | yes    |
+            | kg    | primary | second | yes    |
+            | fj    | primary | second | yes    |
+            | cf    | primary | second | yes    |
+            | gb    | primary | second | yes    |
+
+       When I route I should get
+            | waypoints | route                | turns                        |
+            | a,l       | first,second,second  | depart,turn right,arrive     |
+            | a,d       | first,first          | depart,arrive                |
+            | a,j       | first,second,second  | depart,turn left,arrive      |
+            | a,h       | first,first,first    | depart,continue uturn,arrive |
+            | e,j       | first,second,second  | depart,turn right,arrive     |
+            | e,h       | first,first          | depart,arrive                |
+            | e,l       | first,second,second  | depart,turn left,arrive      |
+            | e,d       | first,first,first    | depart,continue uturn,arrive |
+            | k,h       | second,first,first   | depart,turn right,arrive     |
+            | k,l       | second,second        | depart,arrive                |
+            | k,d       | second,first,first   | depart,turn left,arrive      |
+            | k,j       | second,second,second | depart,continue uturn,arrive |
+            | i,d       | second,first,first   | depart,turn right,arrive     |
+            | i,j       | second,second        | depart,arrive                |
+            | i,h       | second,first,first   | depart,turn left,arrive      |
+            | i,l       | second,second,second | depart,continue uturn,arrive |
+
+    Scenario: Segregated Intersection, Cross Belonging to Mixed Streets
+        Given the node map
+            |   |   | i | l |   |   |
+            |   |   |   |   |   |   |
+            | d |   | c | b |   | a |
+            | e |   | f | g |   | h |
+            |   |   |   |   |   |   |
+            |   |   | j | k |   |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | ab    | primary | first  | yes    |
+            | bc    | primary | second | yes    |
+            | cd    | primary | first  | yes    |
+            | ef    | primary | first  | yes    |
+            | fg    | primary | first  | yes    |
+            | gh    | primary | first  | yes    |
+            | ic    | primary | second | yes    |
+            | bl    | primary | second | yes    |
+            | kg    | primary | second | yes    |
+            | fj    | primary | second | yes    |
+            | cf    | primary | second | yes    |
+            | gb    | primary | first  | yes    |
+
+       When I route I should get
+            | waypoints | route                | turns                        |
+            | a,l       | first,second,second  | depart,turn right,arrive     |
+            | a,d       | first,first          | depart,arrive                |
+            | a,j       | first,second,second  | depart,turn left,arrive      |
+            | a,h       | first,first,first    | depart,continue uturn,arrive |
+            | e,j       | first,second,second  | depart,turn right,arrive     |
+            | e,h       | first,first          | depart,arrive                |
+            | e,l       | first,second,second  | depart,turn left,arrive      |
+            | e,d       | first,first,first    | depart,continue uturn,arrive |
+            | k,h       | second,first,first   | depart,turn right,arrive     |
+            | k,l       | second,second        | depart,arrive                |
+            | k,d       | second,first,first   | depart,turn left,arrive      |
+            | k,j       | second,second,second | depart,continue uturn,arrive |
+            | i,d       | second,first,first   | depart,turn right,arrive     |
+            | i,j       | second,second        | depart,arrive                |
+            | i,h       | second,first,first   | depart,turn left,arrive      |
+            | i,l       | second,second,second | depart,continue uturn,arrive |
+
+    Scenario: Partly Segregated Intersection, Two Segregated Roads
+        Given the node map
+            |   | g |   | h |   |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            | c |   | b |   | a |
+            | d |   | e |   | f |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            |   | j |   | i |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | ab    | primary | first  | yes    |
+            | bc    | primary | first  | yes    |
+            | de    | primary | first  | yes    |
+            | ef    | primary | first  | yes    |
+            | be    | primary | first  | no     |
+            | gbh   | primary | second | yes    |
+            | iej   | primary | second | yes    |
+
+       When I route I should get
+            | waypoints | route                | turns                        |
+            | a,h       | first,second,second  | depart,turn right,arrive     |
+            | a,c       | first,first          | depart,arrive                |
+            | a,j       | first,second,second  | depart,turn left,arrive      |
+            | a,f       | first,first,first    | depart,continue uturn,arrive |
+            | d,j       | first,second,second  | depart,turn right,arrive     |
+            | d,f       | first,first          | depart,arrive                |
+            | d,h       | first,second,second  | depart,turn left,arrive      |
+            | d,c       | first,first,first    | depart,continue uturn,arrive |
+            | g,c       | second,first,first   | depart,turn right,arrive     |
+            | g,j       | second,second        | depart,arrive                |
+            | g,f       | second,first,first   | depart,turn left,arrive      |
+            | g,h       | second,second,second | depart,continue uturn,arrive |
+            | i,f       | second,first,first   | depart,turn right,arrive     |
+            | i,h       | second,second        | depart,arrive                |
+            | i,c       | second,first,first   | depart,turn left,arrive      |
+            | i,j       | second,second,second | depart,continue uturn,arrive |
+
+    Scenario: Partly Segregated Intersection, Two Segregated Roads, Intersection belongs to Second
+        Given the node map
+            |   | g |   | h |   |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            | c |   | b |   | a |
+            | d |   | e |   | f |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            |   | j |   | i |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | ab    | primary | first  | yes    |
+            | bc    | primary | first  | yes    |
+            | de    | primary | first  | yes    |
+            | ef    | primary | first  | yes    |
+            | be    | primary | second | no     |
+            | gbh   | primary | second | yes    |
+            | iej   | primary | second | yes    |
+
+       When I route I should get
+            | waypoints | route                | turns                        |
+            | a,h       | first,second,second  | depart,turn right,arrive     |
+            | a,c       | first,first          | depart,arrive                |
+            | a,j       | first,second,second  | depart,turn left,arrive      |
+            | a,f       | first,first,first    | depart,continue uturn,arrive |
+            | d,j       | first,second,second  | depart,turn right,arrive     |
+            | d,f       | first,first          | depart,arrive                |
+            | d,h       | first,second,second  | depart,turn left,arrive      |
+            | d,c       | first,first,first    | depart,continue uturn,arrive |
+            | g,c       | second,first,first   | depart,turn right,arrive     |
+            | g,j       | second,second        | depart,arrive                |
+            | g,f       | second,first,first   | depart,turn left,arrive      |
+            | g,h       | second,second,second | depart,continue uturn,arrive |
+            | i,f       | second,first,first   | depart,turn right,arrive     |
+            | i,h       | second,second        | depart,arrive                |
+            | i,c       | second,first,first   | depart,turn left,arrive      |
+            | i,j       | second,second,second | depart,continue uturn,arrive |
+
+    Scenario: Segregated Intersection, Cross Belonging to Mixed Streets - Slight Angles
+        Given the node map
+            |   |   | i | l |   |   |
+            |   |   |   |   |   | a |
+            |   |   | c | b |   | h |
+            | d |   | f | g |   |   |
+            | e |   |   |   |   |   |
+            |   |   | j | k |   |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | ab    | primary | first  | yes    |
+            | bc    | primary | second | yes    |
+            | cd    | primary | first  | yes    |
+            | ef    | primary | first  | yes    |
+            | fg    | primary | first  | yes    |
+            | gh    | primary | first  | yes    |
+            | ic    | primary | second | yes    |
+            | bl    | primary | second | yes    |
+            | kg    | primary | second | yes    |
+            | fj    | primary | second | yes    |
+            | cf    | primary | second | yes    |
+            | gb    | primary | first  | yes    |
+
+       When I route I should get
+            | waypoints | route                | turns                        |
+            | a,l       | first,second,second  | depart,turn right,arrive     |
+            | a,d       | first,first          | depart,arrive                |
+            | a,j       | first,second,second  | depart,turn left,arrive      |
+            | a,h       | first,first,first    | depart,continue uturn,arrive |
+            | e,j       | first,second,second  | depart,turn right,arrive     |
+            | e,h       | first,first          | depart,arrive                |
+            | e,l       | first,second,second  | depart,turn left,arrive      |
+            | e,d       | first,first,first    | depart,continue uturn,arrive |
+            | k,h       | second,first,first   | depart,turn right,arrive     |
+            | k,l       | second,second        | depart,arrive                |
+            | k,d       | second,first,first   | depart,turn left,arrive      |
+            | k,j       | second,second,second | depart,continue uturn,arrive |
+            | i,d       | second,first,first   | depart,turn right,arrive     |
+            | i,j       | second,second        | depart,arrive                |
+            | i,h       | second,first,first   | depart,turn left,arrive      |
+            | i,l       | second,second,second | depart,continue uturn,arrive |
+
+    Scenario: Segregated Intersection, Cross Belonging to Mixed Streets - Slight Angles (2)
+        Given the node map
+            |   |   | i | l |   |   |
+            |   |   |   |   |   |   |
+            |   |   | c | b |   |   |
+            | d |   | f | g |   | a |
+            | e |   |   |   |   | h |
+            |   |   | j | k |   |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | ab    | primary | first  | yes    |
+            | bc    | primary | second | yes    |
+            | cd    | primary | first  | yes    |
+            | ef    | primary | first  | yes    |
+            | fg    | primary | first  | yes    |
+            | gh    | primary | first  | yes    |
+            | ic    | primary | second | yes    |
+            | bl    | primary | second | yes    |
+            | kg    | primary | second | yes    |
+            | fj    | primary | second | yes    |
+            | cf    | primary | second | yes    |
+            | gb    | primary | first  | yes    |
+
+       When I route I should get
+            | waypoints | route                | turns                        |
+            | a,l       | first,second,second  | depart,turn right,arrive     |
+            | a,d       | first,first          | depart,arrive                |
+            | a,j       | first,second,second  | depart,turn left,arrive      |
+            | a,h       | first,first,first    | depart,continue uturn,arrive |
+            | e,j       | first,second,second  | depart,turn right,arrive     |
+            | e,h       | first,first          | depart,arrive                |
+            | e,l       | first,second,second  | depart,turn left,arrive      |
+            | e,d       | first,first,first    | depart,continue uturn,arrive |
+            | k,h       | second,first,first   | depart,turn right,arrive     |
+            | k,l       | second,second        | depart,arrive                |
+            | k,d       | second,first,first   | depart,turn left,arrive      |
+            | k,j       | second,second,second | depart,continue uturn,arrive |
+            | i,d       | second,first,first   | depart,turn right,arrive     |
+            | i,j       | second,second        | depart,arrive                |
+            | i,h       | second,first,first   | depart,turn left,arrive      |
+            | i,l       | second,second,second | depart,continue uturn,arrive |
+
+    Scenario: Entering a segregated road
+        Given the node map
+            |   | a | f |   |   |
+            |   |   |   |   | g |
+            |   | b | e |   |   |
+            |   |   |   |   |   |
+            |   |   |   |   |   |
+            | c | d |   |   |   |
+
+        And the ways
+            | nodes | highway | name   | oneway |
+            | abc   | primary | first  | yes    |
+            | def   | primary | first  | yes    |
+            | be    | primary | first  | no     |
+            | ge    | primary | second | no     |
+
+        When I route I should get
+            | waypoints | route               | turns                          |
+            | d,c       | first,first,first   | depart,continue uturn,arrive   |
+            | a,f       | first,first,first   | depart,continue uturn,arrive   |
+            | a,g       | first,second,second | depart,turn left,arrive        |
+            | d,g       | first,second,second | depart,turn right,arrive       |
+            | g,f       | second,first,first  | depart,turn right,arrive       |
+            | g,c       | second,first,first  | depart,end of road left,arrive |
+
+
+    Scenario: Do not collapse turning roads
+        Given the node map
+            |   |   | e |   |   |
+            |   |   | c |   | d |
+            | a |   | b | f |   |
+
+        And the ways
+            | nodes | highway | name   |
+            | ab    | primary | first  |
+            | bc    | primary | first  |
+            | cd    | primary | first  |
+            | ce    | primary | second |
+            | bf    | primary | third  |
+
+        When I route I should get
+            | waypoints | route                   | turns                                      |
+            | a,d       | first,first,first,first | depart,continue left,continue right,arrive |
+            | a,e       | first,second,second     | depart,turn left,arrive                    |
+            | a,f       | first,third,third       | depart,new name straight,arrive            |

features/guidance/destination-signs.feature

@@ -0,0 +1,41 @@
+@routing @guidance
+Feature: Destination Signs
+
+    Background:
+        Given the profile "car"
+
+    Scenario: Car - route name assembly with destination signs
+        Given the node map
+          | a | b |
+          | c | d |
+          | e | f |
+          | g | h |
+          | i | j |
+          | k | l |
+          | m | n |
+          | o | p |
+          | q | r |
+
+        And the ways
+          | nodes | name | ref | destination    | destination:ref | oneway | #                                    |
+          | ab    | AB   | E1  |                |                 | yes    |                                      |
+          | cd    | CD   |     | Berlin         |                 | yes    |                                      |
+          | ef    | EF   |     | Berlin         | A1              | yes    |                                      |
+          | gh    |      |     | Berlin         | A1              | yes    |                                      |
+          | ij    |      |     | Berlin         |                 | yes    |                                      |
+          | kl    | KL   | E1  | Berlin         | A1              | yes    |                                      |
+          | mn    | MN   |     | Berlin;Hamburg | A1;A2           | yes    |                                      |
+          | op    | OP   |     | Berlin;Hamburg | A1;A2           | no     | mis-tagged destination: not a oneway |
+          | qr    | QR   |     |                | A1;A2           | yes    |                                      |
+
+        When I route I should get
+          | from | to | route                                                     | #                         |
+          | a    | b  | AB (E1),AB (E1)                                           |                           |
+          | c    | d  | CD (Berlin),CD (Berlin)                                   |                           |
+          | e    | f  | EF (A1: Berlin),EF (A1: Berlin)                           |                           |
+          | g    | h  | ,                                                         |                           |
+          | i    | j  | ,                                                         |                           |
+          | k    | l  | KL (E1),KL (E1)                                           |                           |
+          | m    | n  | MN (A1, A2: Berlin, Hamburg),MN (A1, A2: Berlin, Hamburg) |                           |
+          | o    | p  | OP,OP                                                     | guard against mis-tagging |
+          | q    | r  | QR (A1, A2),QR (A1, A2)                                   |                           |

features/guidance/end-of-road.feature

@@ -117,7 +117,7 @@ Feature: End Of Road Instructions
             | bd     | motorway_link |
 
        When I route I should get
-            | waypoints | route    | turns                    |
-            | a,c       | ab,bc,bc | depart,ramp left,arrive  |
-            | a,d       | ab,bd,bd | depart,ramp right,arrive |
+            | waypoints | route    | turns                       |
+            | a,c       | ab,bc,bc | depart,on ramp left,arrive  |
+            | a,d       | ab,bd,bd | depart,on ramp right,arrive |
 

features/guidance/fork.feature

@@ -245,7 +245,6 @@ Feature: Fork Instructions
             | a,c       | abd,bc,bc | depart,turn slight left,arrive |
             | a,d       | abd,abd   | depart,arrive                  |
 
-    @pr2275 @bug
     Scenario: Tripple fork
         Given the node map
             |   |   |   |   |   |   |   |   | c |

features/guidance/motorway.feature

@@ -16,9 +16,9 @@ Feature: Motorway Guidance
             | bfg    | motorway_link |
 
        When I route I should get
-            | waypoints | route         | turns                           |
-            | a,e       | abcde,abcde   | depart,arrive                   |
-            | a,g       | abcde,bfg,bfg | depart,ramp slight right,arrive |
+            | waypoints | route         | turns                                |
+            | a,e       | abcde,abcde   | depart,arrive                        |
+            | a,g       | abcde,bfg,bfg | depart,off ramp slight right,arrive |
 
     Scenario: Ramp Exit Right Curved Right
         Given the node map
@@ -32,9 +32,9 @@ Feature: Motorway Guidance
             | bfg    | motorway_link |
 
        When I route I should get
-            | waypoints | route         | turns                    |
-            | a,e       | abcde,abcde   | depart,arrive            |
-            | a,g       | abcde,bfg,bfg | depart,ramp right,arrive |
+            | waypoints | route         | turns                         |
+            | a,e       | abcde,abcde   | depart,arrive                 |
+            | a,g       | abcde,bfg,bfg | depart,off ramp right,arrive |
 
     Scenario: Ramp Exit Right Curved Left
         Given the node map
@@ -49,9 +49,9 @@ Feature: Motorway Guidance
             | cfg    | motorway_link |
 
        When I route I should get
-            | waypoints | route         | turns                           |
-            | a,e       | abcde,abcde   | depart,arrive                   |
-            | a,g       | abcde,cfg,cfg | depart,ramp slight right,arrive |
+            | waypoints | route         | turns                                |
+            | a,e       | abcde,abcde   | depart,arrive                        |
+            | a,g       | abcde,cfg,cfg | depart,off ramp slight right,arrive |
 
 
     Scenario: Ramp Exit Left
@@ -65,9 +65,9 @@ Feature: Motorway Guidance
             | bfg    | motorway_link |
 
        When I route I should get
-            | waypoints | route         | turns                          |
-            | a,e       | abcde,abcde   | depart,arrive                  |
-            | a,g       | abcde,bfg,bfg | depart,ramp slight left,arrive |
+            | waypoints | route         | turns                               |
+            | a,e       | abcde,abcde   | depart,arrive                       |
+            | a,g       | abcde,bfg,bfg | depart,off ramp slight left,arrive |
 
     Scenario: Ramp Exit Left Curved Left
         Given the node map
@@ -81,9 +81,9 @@ Feature: Motorway Guidance
             | bfg    | motorway_link |
 
        When I route I should get
-            | waypoints | route         | turns                   |
-            | a,e       | abcde,abcde   | depart,arrive           |
-            | a,g       | abcde,bfg,bfg | depart,ramp left,arrive |
+            | waypoints | route         | turns                        |
+            | a,e       | abcde,abcde   | depart,arrive                |
+            | a,g       | abcde,bfg,bfg | depart,off ramp left,arrive |
 
     Scenario: Ramp Exit Left Curved Right
         Given the node map
@@ -97,9 +97,9 @@ Feature: Motorway Guidance
             | cfg    | motorway_link |
 
        When I route I should get
-            | waypoints | route         | turns                          |
-            | a,e       | abcde,abcde   | depart,arrive                  |
-            | a,g       | abcde,cfg,cfg | depart,ramp slight left,arrive |
+            | waypoints | route         | turns                               |
+            | a,e       | abcde,abcde   | depart,arrive                       |
+            | a,g       | abcde,cfg,cfg | depart,off ramp slight left,arrive |
 
     Scenario: On Ramp Right
         Given the node map
@@ -176,11 +176,11 @@ Feature: Motorway Guidance
             | chi    | motorway_link |
 
        When I route I should get
-            | waypoints | route           | turns                           |
-            | a,e       | abcde,abcde     | depart,arrive                   |
-            | f,e       | fgc,abcde,abcde | depart,merge slight left,arrive |
-            | a,i       | abcde,chi,chi   | depart,ramp slight right,arrive |
-            | f,i       | fgc,chi,chi     | depart,ramp right,arrive        |
+            | waypoints | route           | turns                                |
+            | a,e       | abcde,abcde     | depart,arrive                        |
+            | f,e       | fgc,abcde,abcde | depart,merge slight left,arrive      |
+            | a,i       | abcde,chi,chi   | depart,off ramp slight right,arrive |
+            | f,i       | fgc,chi,chi     | depart,off ramp right,arrive        |
 
     Scenario: On And Off Ramp Left
        Given the node map
@@ -194,11 +194,11 @@ Feature: Motorway Guidance
             | chi    | motorway_link |
 
        When I route I should get
-            | waypoints | route           | turns                            |
-            | a,e       | abcde,abcde     | depart,arrive                    |
-            | f,e       | fgc,abcde,abcde | depart,merge slight right,arrive |
-            | a,i       | abcde,chi,chi   | depart,ramp slight left,arrive   |
-            | f,i       | fgc,chi,chi     | depart,ramp left,arrive          |
+            | waypoints | route           | turns                               |
+            | a,e       | abcde,abcde     | depart,arrive                       |
+            | f,e       | fgc,abcde,abcde | depart,merge slight right,arrive    |
+            | a,i       | abcde,chi,chi   | depart,off ramp slight left,arrive |
+            | f,i       | fgc,chi,chi     | depart,off ramp left,arrive        |
 
     Scenario: Merging Motorways
         Given the node map

features/guidance/new-name.feature

@@ -133,3 +133,34 @@ Feature: New-Name Instructions
        When I route I should get
             | waypoints | route    | turns                               |
             | a,c       | ab,bc,bc | depart,new name slight right,arrive |
+
+    Scenario: Empty road names - Announce Change From, suppress Change To
+        Given the node map
+            | a |  | b |  | c |  | d |
+
+        And the ways
+            | nodes | name |
+            | ab    | ab   |
+            | bc    |      |
+            | cd    | cd   |
+
+        When I route I should get
+            | waypoints | route    | turns                           |
+            | a,d       | ab,cd,cd | depart,new name straight,arrive |
+            | a,c       | ab,      | depart,arrive                   |
+
+    Scenario: Empty road names - Loose name shortly
+        Given the node map
+            | a |  | b |  | c |  | d |  | e |
+
+        And the ways
+            | nodes | name      |
+            | ab    | name      |
+            | bc    | with-name |
+            | cd    |           |
+            | de    | with-name |
+
+        When I route I should get
+            | waypoints | route                    | turns                           |
+            | a,e       | name,with-name,with-name | depart,new name straight,arrive |
+            | b,e       | with-name,with-name      | depart,arrive                   |

features/guidance/ramp.feature

@@ -16,8 +16,8 @@ Feature: Ramp Guidance
             | bd    | motorway_link |
 
        When I route I should get
-            | waypoints | route     | turns                    |
-            | a,d       | abc,bd,bd | depart,ramp right,arrive |
+            | waypoints | route     | turns                          |
+            | a,d       | abc,bd,bd | depart,on ramp right,arrive |
 
     Scenario: Ramp On Through Street Left
         Given the node map
@@ -30,8 +30,8 @@ Feature: Ramp Guidance
             | bd    | motorway_link |
 
        When I route I should get
-            | waypoints | route     | turns                   |
-            | a,d       | abc,bd,bd | depart,ramp left,arrive |
+            | waypoints | route     | turns                         |
+            | a,d       | abc,bd,bd | depart,on ramp left,arrive |
 
     Scenario: Ramp On Through Street Left and Right
         Given the node map
@@ -46,9 +46,9 @@ Feature: Ramp Guidance
             | bd    | motorway_link |
 
        When I route I should get
-            | waypoints | route     | turns                    |
-            | a,d       | abc,bd,bd | depart,ramp right,arrive |
-            | a,e       | abc,be,be | depart,ramp left,arrive  |
+            | waypoints | route     | turns                          |
+            | a,d       | abc,bd,bd | depart,on ramp right,arrive |
+            | a,e       | abc,be,be | depart,on ramp left,arrive  |
 
     Scenario: Ramp On Three Way Intersection Right
         Given the node map
@@ -62,8 +62,8 @@ Feature: Ramp Guidance
             | bd    | motorway_link |
 
        When I route I should get
-            | waypoints | route    | turns                    |
-            | a,d       | ab,bd,bd | depart,ramp right,arrive |
+            | waypoints | route    | turns                          |
+            | a,d       | ab,bd,bd | depart,on ramp right,arrive |
 
     Scenario: Ramp On Three Way Intersection Right
         Given the node map
@@ -78,8 +78,8 @@ Feature: Ramp Guidance
             | bd    | motorway_link |
 
        When I route I should get
-            | waypoints | route    | turns                    |
-            | a,d       | ab,bd,bd | depart,ramp right,arrive |
+            | waypoints | route    | turns                          |
+            | a,d       | ab,bd,bd | depart,on ramp right,arrive |
 
     Scenario: Ramp Off Though Street
         Given the node map
@@ -93,9 +93,9 @@ Feature: Ramp Guidance
             | bd    | motorway_link |
 
        When I route I should get
-            | waypoints | route     | turns                    |
-            | a,d       | abc,bd,bd | depart,ramp right,arrive |
-            | a,c       | abc,abc   | depart,arrive            |
+            | waypoints | route     | turns                          |
+            | a,d       | abc,bd,bd | depart,on ramp right,arrive |
+            | a,c       | abc,abc   | depart,arrive                  |
 
     Scenario: Straight Ramp Off Turning Though Street
         Given the node map
@@ -108,9 +108,9 @@ Feature: Ramp Guidance
             | bd    | motorway_link |
 
        When I route I should get
-            | waypoints | route       | turns                       |
-            | a,d       | abc,bd,bd   | depart,ramp straight,arrive |
-            | a,c       | abc,abc,abc | depart,continue left,arrive |
+            | waypoints | route       | turns                             |
+            | a,d       | abc,bd,bd   | depart,on ramp straight,arrive |
+            | a,c       | abc,abc,abc | depart,continue left,arrive       |
 
     Scenario: Fork Ramp Off Turning Though Street
         Given the node map
@@ -124,9 +124,9 @@ Feature: Ramp Guidance
             | bd    | motorway_link |
 
        When I route I should get
-            | waypoints | route       | turns                       |
-            | a,d       | abc,bd,bd   | depart,ramp right,arrive    |
-            | a,c       | abc,abc,abc | depart,continue left,arrive |
+            | waypoints | route       | turns                             |
+            | a,d       | abc,bd,bd   | depart,on ramp right,arrive    |
+            | a,c       | abc,abc,abc | depart,continue left,arrive       |
 
     Scenario: Fork Ramp
         Given the node map
@@ -141,9 +141,9 @@ Feature: Ramp Guidance
             | bd    | motorway_link |
 
        When I route I should get
-            | waypoints | route    | turns                    |
-            | a,d       | ab,bd,bd | depart,ramp right,arrive |
-            | a,c       | ab,bc,bc | depart,turn left,arrive  |
+            | waypoints | route    | turns                          |
+            | a,d       | ab,bd,bd | depart,on ramp right,arrive |
+            | a,c       | ab,bc,bc | depart,turn left,arrive        |
 
     Scenario: Fork Slight Ramp
         Given the node map
@@ -158,9 +158,9 @@ Feature: Ramp Guidance
             | bd    | motorway_link |
 
        When I route I should get
-            | waypoints | route    | turns                           |
-            | a,d       | ab,bd,bd | depart,ramp slight right,arrive |
-            | a,c       | ab,bc,bc | depart,turn slight left,arrive  |
+            | waypoints | route    | turns                                 |
+            | a,d       | ab,bd,bd | depart,on ramp slight right,arrive |
+            | a,c       | ab,bc,bc | depart,turn slight left,arrive        |
 
     Scenario: Fork Slight Ramp on Through Street
         Given the node map
@@ -174,9 +174,9 @@ Feature: Ramp Guidance
             | bd    | motorway_link |
 
        When I route I should get
-            | waypoints | route       | turns                              |
-            | a,d       | abc,bd,bd   | depart,ramp slight right,arrive    |
-            | a,c       | abc,abc,abc | depart,continue slight left,arrive |
+            | waypoints | route       | turns                                    |
+            | a,d       | abc,bd,bd   | depart,on ramp slight right,arrive    |
+            | a,c       | abc,abc,abc | depart,continue slight left,arrive       |
 
     Scenario: Fork Slight Ramp on Obvious Through Street
         Given the node map
@@ -190,9 +190,9 @@ Feature: Ramp Guidance
             | bd    | motorway_link |
 
        When I route I should get
-            | waypoints | route     | turns                           |
-            | a,d       | abc,bd,bd | depart,ramp slight right,arrive |
-            | a,c       | abc,abc   | depart,arrive                   |
+            | waypoints | route     | turns                                 |
+            | a,d       | abc,bd,bd | depart,on ramp slight right,arrive |
+            | a,c       | abc,abc   | depart,arrive                         |
 
     Scenario: Two Ramps Joining into common Motorway
         Given the node map

features/guidance/rotary.feature

@@ -194,15 +194,15 @@ Feature: Rotary
 
         And the ways
             | nodes | junction   |
-            | ab    |            |
+            | ad    |            |
             | bcdb  | roundabout |
-            | ce    |            |
-            | df    |            |
+            | be    |            |
+            | cf    |            |
 
         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 |
+            | 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
@@ -213,15 +213,15 @@ Feature: Rotary
 
         And the ways
             | nodes | junction   |
-            | ab    |            |
+            | ac    |            |
             | bcdb  | roundabout |
-            | ce    |            |
-            | df    |            |
+            | de    |            |
+            | bf    |            |
 
         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 |
+            | 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

features/guidance/roundabout-turn.feature

@@ -0,0 +1,369 @@
+@routing  @guidance
+Feature: Basic Roundabout
+
+    Background:
+        Given the profile "car"
+        Given a grid size of 3 meters
+
+    Scenario: Enter and Exit
+        Given the node map
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | h | g |   | c | d |
+            |   |   | e |   |   |
+            |   |   | f |   |   |
+
+       And the ways
+            | nodes  | junction   |
+            | ab     |            |
+            | cd     |            |
+            | ef     |            |
+            | gh     |            |
+            | bgecb  | roundabout |
+
+       When I route I should get
+           | waypoints | route    | turns                                         |
+           | a,d       | ab,cd,cd | depart,roundabout turn left exit-3,arrive     |
+           | a,f       | ab,ef,ef | depart,roundabout turn straight exit-2,arrive |
+           | a,h       | ab,gh,gh | depart,roundabout turn right exit-1,arrive    |
+           | d,f       | cd,ef,ef | depart,roundabout turn left exit-3,arrive     |
+           | d,h       | cd,gh,gh | depart,roundabout turn straight exit-2,arrive |
+           | d,a       | cd,ab,ab | depart,roundabout turn right exit-1,arrive    |
+           | f,h       | ef,gh,gh | depart,roundabout turn left exit-3,arrive     |
+           | f,a       | ef,ab,ab | depart,roundabout turn straight exit-2,arrive |
+           | f,d       | ef,cd,cd | depart,roundabout turn right exit-1,arrive    |
+           | h,a       | gh,ab,ab | depart,roundabout turn left exit-3,arrive     |
+           | h,d       | gh,cd,cd | depart,roundabout turn straight exit-2,arrive |
+           | h,f       | gh,ef,ef | depart,roundabout turn right exit-1,arrive    |
+
+    Scenario: Enter and Exit - Rotated
+        Given the node map
+            | a |   |   | d |
+            |   | b | c |   |
+            |   | g | e |   |
+            | h |   |   | f |
+
+       And the ways
+            | nodes  | junction   |
+            | ab     |            |
+            | cd     |            |
+            | ef     |            |
+            | gh     |            |
+            | bgecb  | roundabout |
+
+       When I route I should get
+           | waypoints | route    | turns                                         |
+           | a,d       | ab,cd,cd | depart,roundabout turn left exit-3,arrive     |
+           | a,f       | ab,ef,ef | depart,roundabout turn straight exit-2,arrive |
+           | a,h       | ab,gh,gh | depart,roundabout turn right exit-1,arrive    |
+           | d,f       | cd,ef,ef | depart,roundabout turn left exit-3,arrive     |
+           | d,h       | cd,gh,gh | depart,roundabout turn straight exit-2,arrive |
+           | d,a       | cd,ab,ab | depart,roundabout turn right exit-1,arrive    |
+           | f,h       | ef,gh,gh | depart,roundabout turn left exit-3,arrive     |
+           | f,a       | ef,ab,ab | depart,roundabout turn straight exit-2,arrive |
+           | f,d       | ef,cd,cd | depart,roundabout turn right exit-1,arrive    |
+           | h,a       | gh,ab,ab | depart,roundabout turn left exit-3,arrive     |
+           | h,d       | gh,cd,cd | depart,roundabout turn straight exit-2,arrive |
+           | h,f       | gh,ef,ef | depart,roundabout turn right exit-1,arrive    |
+
+    Scenario: Only Enter
+        Given the node map
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | d | c |   | g | h |
+            |   |   | e |   |   |
+            |   |   | f |   |   |
+
+       And the ways
+            | nodes  | junction   |
+            | ab     |            |
+            | cd     |            |
+            | ef     |            |
+            | gh     |            |
+            | bcegb  | roundabout |
+
+       When I route I should get
+           | waypoints | route          | turns                                   |
+           | a,c       | ab,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | a,e       | ab,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | a,g       | ab,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | d,e       | cd,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | d,g       | cd,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | d,b       | cd,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | f,g       | ef,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | f,b       | ef,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | f,c       | ef,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | h,b       | gh,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | h,c       | gh,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+           | h,e       | gh,bcegb,bcegb | depart,roundabout-exit-undefined,arrive |
+
+    Scenario: Only Exit
+        Given the node map
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | d | c |   | g | h |
+            |   |   | e |   |   |
+            |   |   | f |   |   |
+
+       And the ways
+            | nodes  | junction   |
+            | ab     |            |
+            | cd     |            |
+            | ef     |            |
+            | gh     |            |
+            | bcegb  | roundabout |
+
+       When I route I should get
+           | waypoints | route       | turns                           |
+           | b,d       | bcegb,cd,cd | depart,roundabout-exit-1,arrive |
+           | b,f       | bcegb,ef,ef | depart,roundabout-exit-2,arrive |
+           | b,h       | bcegb,gh,gh | depart,roundabout-exit-3,arrive |
+           | c,f       | bcegb,ef,ef | depart,roundabout-exit-1,arrive |
+           | c,h       | bcegb,gh,gh | depart,roundabout-exit-2,arrive |
+           | c,a       | bcegb,ab,ab | depart,roundabout-exit-3,arrive |
+           | e,h       | bcegb,gh,gh | depart,roundabout-exit-1,arrive |
+           | e,a       | bcegb,ab,ab | depart,roundabout-exit-2,arrive |
+           | e,d       | bcegb,cd,cd | depart,roundabout-exit-3,arrive |
+           | g,a       | bcegb,ab,ab | depart,roundabout-exit-1,arrive |
+           | g,d       | bcegb,cd,cd | depart,roundabout-exit-2,arrive |
+           | g,f       | bcegb,ef,ef | depart,roundabout-exit-3,arrive |
+      #phantom node snapping can result in a full round-trip here, therefore we cannot test b->a and the other direct exits
+
+    Scenario: Drive Around
+        Given the node map
+            |   |   | a |   |   |
+            |   |   | b |   |   |
+            | d | c |   | g | h |
+            |   |   | e |   |   |
+            |   |   | f |   |   |
+
+       And the ways
+            | nodes  | junction   |
+            | ab     |            |
+            | cd     |            |
+            | ef     |            |
+            | gh     |            |
+            | bcegb  | roundabout |
+
+       When I route I should get
+           | waypoints | route       | turns         |
+           | b,c       | bcegb,bcegb | depart,arrive |
+           | b,e       | bcegb,bcegb | depart,arrive |
+           | b,g       | bcegb,bcegb | depart,arrive |
+           | c,e       | bcegb,bcegb | depart,arrive |
+           | c,g       | bcegb,bcegb | depart,arrive |
+           | c,b       | bcegb,bcegb | depart,arrive |
+           | e,g       | bcegb,bcegb | depart,arrive |
+           | e,b       | bcegb,bcegb | depart,arrive |
+           | e,c       | bcegb,bcegb | depart,arrive |
+           | g,b       | bcegb,bcegb | depart,arrive |
+           | g,c       | bcegb,bcegb | depart,arrive |
+           | g,e       | bcegb,bcegb | depart,arrive |
+
+     Scenario: Mixed Entry and Exit - Not an Intersection
+        Given the node map
+           |   | c |   | a |   |
+           | j |   | b |   | f |
+           |   | k |   | e |   |
+           | l |   | h |   | d |
+           |   | g |   | i |   |
+
+        And the ways
+           | nodes | junction   | oneway |
+           | abc   |            | yes    |
+           | def   |            | yes    |
+           | ghi   |            | yes    |
+           | jkl   |            | yes    |
+           | bkheb | roundabout | yes    |
+
+        When I route I should get
+           | waypoints | route       | turns                           |
+           | a,c       | abc,abc,abc | depart,roundabout-exit-1,arrive |
+           | a,l       | abc,jkl,jkl | depart,roundabout-exit-2,arrive |
+           | a,i       | abc,ghi,ghi | depart,roundabout-exit-3,arrive |
+           | a,f       | abc,def,def | depart,roundabout-exit-4,arrive |
+           | d,f       | def,def,def | depart,roundabout-exit-1,arrive |
+           | d,c       | def,abc,abc | depart,roundabout-exit-2,arrive |
+           | d,l       | def,jkl,jkl | depart,roundabout-exit-3,arrive |
+           | d,i       | def,ghi,ghi | depart,roundabout-exit-4,arrive |
+           | g,i       | ghi,ghi,ghi | depart,roundabout-exit-1,arrive |
+           | g,f       | ghi,def,def | depart,roundabout-exit-2,arrive |
+           | g,c       | ghi,abc,abc | depart,roundabout-exit-3,arrive |
+           | g,l       | ghi,jkl,jkl | depart,roundabout-exit-4,arrive |
+           | j,l       | jkl,jkl,jkl | depart,roundabout-exit-1,arrive |
+           | j,i       | jkl,ghi,ghi | depart,roundabout-exit-2,arrive |
+           | j,f       | jkl,def,def | depart,roundabout-exit-3,arrive |
+           | j,c       | jkl,abc,abc | depart,roundabout-exit-4,arrive |
+
+    Scenario: Segregated roads - Not an intersection
+        Given the node map
+           |   | a |   | c |   |
+           | l |   | b |   | d |
+           |   | k |   | e |   |
+           | j |   | h |   | f |
+           |   | i |   | g |   |
+
+        And the ways
+           | nodes | junction   | oneway |
+           | abc   |            | yes    |
+           | def   |            | yes    |
+           | ghi   |            | yes    |
+           | jkl   |            | yes    |
+           | bkheb | roundabout | yes    |
+
+        When I route I should get
+           | waypoints | route       | turns                           |
+           | a,c       | abc,abc,abc | depart,roundabout-exit-4,arrive |
+           | a,l       | abc,jkl,jkl | depart,roundabout-exit-1,arrive |
+           | a,i       | abc,ghi,ghi | depart,roundabout-exit-2,arrive |
+           | a,f       | abc,def,def | depart,roundabout-exit-3,arrive |
+           | d,f       | def,def,def | depart,roundabout-exit-4,arrive |
+           | d,c       | def,abc,abc | depart,roundabout-exit-1,arrive |
+           | d,l       | def,jkl,jkl | depart,roundabout-exit-2,arrive |
+           | d,i       | def,ghi,ghi | depart,roundabout-exit-3,arrive |
+           | g,i       | ghi,ghi,ghi | depart,roundabout-exit-4,arrive |
+           | g,f       | ghi,def,def | depart,roundabout-exit-1,arrive |
+           | g,c       | ghi,abc,abc | depart,roundabout-exit-2,arrive |
+           | g,l       | ghi,jkl,jkl | depart,roundabout-exit-3,arrive |
+           | j,l       | jkl,jkl,jkl | depart,roundabout-exit-4,arrive |
+           | j,i       | jkl,ghi,ghi | depart,roundabout-exit-1,arrive |
+           | j,f       | jkl,def,def | depart,roundabout-exit-2,arrive |
+           | j,c       | jkl,abc,abc | depart,roundabout-exit-3,arrive |
+
+       Scenario: Collinear in X
+        Given the node map
+            | a | b | c | d | f |
+            |   |   | e |   |   |
+
+        And the ways
+            | nodes | junction   |
+            | ab    |            |
+            | bcdb  | roundabout |
+            | ce    |            |
+            | df    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                           |
+            | a,e       | ab,ce,ce | depart,roundabout-exit-1,arrive |
+            | a,f       | ab,df,df | depart,roundabout-exit-2,arrive |
+
+       Scenario: Collinear in X,Y
+        Given the node map
+            | a |   |   |
+            | b |   |   |
+            | c | d | f |
+            | e |   |   |
+
+        And the ways
+            | nodes | junction   |
+            | ab    |            |
+            | bcdb  | roundabout |
+            | ce    |            |
+            | df    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                                         |
+            | a,e       | ab,ce,ce | depart,roundabout turn straight exit-1,arrive |
+            | a,f       | ab,df,df | depart,roundabout turn left exit-2,arrive     |
+
+       Scenario: Collinear in X,Y
+        Given the node map
+            | a |   |   |
+            | d |   |   |
+            | b | c | f |
+            | e |   |   |
+
+        And the ways
+            | nodes | junction   |
+            | ad    |            |
+            | bcdb  | roundabout |
+            | be    |            |
+            | cf    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                                         |
+            | a,e       | ad,be,be | depart,roundabout turn straight exit-1,arrive |
+            | a,f       | ad,cf,cf | depart,roundabout turn left exit-2,arrive     |
+
+       Scenario: Collinear in X,Y
+        Given the node map
+            | a |   |   |
+            | c |   |   |
+            | d | b | f |
+            | e |   |   |
+
+        And the ways
+            | nodes | junction   |
+            | ac    |            |
+            | bcdb  | roundabout |
+            | de    |            |
+            | bf    |            |
+
+        When I route I should get
+            | waypoints | route    | turns                                         |
+            | a,e       | ac,de,de | depart,roundabout turn straight exit-1,arrive |
+            | a,f       | ac,bf,bf | depart,roundabout turn left exit-2,arrive     |
+
+    Scenario: Enter and Exit -- too complex
+        Given the node map
+            | j |   | a |   |   |
+            |   | i | b |   |   |
+            |   | g |   | c | d |
+            | h |   | e |   |   |
+            |   |   | f |   |   |
+
+       And the ways
+            | nodes  | junction   |
+            | ab     |            |
+            | ij     |            |
+            | cd     |            |
+            | ef     |            |
+            | gh     |            |
+            | bigecb | roundabout |
+
+       When I route I should get
+           | waypoints | route    | turns                           |
+           | a,d       | ab,cd,cd | depart,roundabout-exit-4,arrive |
+           | a,f       | ab,ef,ef | depart,roundabout-exit-3,arrive |
+           | a,h       | ab,gh,gh | depart,roundabout-exit-2,arrive |
+           | d,f       | cd,ef,ef | depart,roundabout-exit-4,arrive |
+           | d,h       | cd,gh,gh | depart,roundabout-exit-3,arrive |
+           | d,a       | cd,ab,ab | depart,roundabout-exit-1,arrive |
+           | f,h       | ef,gh,gh | depart,roundabout-exit-4,arrive |
+           | f,a       | ef,ab,ab | depart,roundabout-exit-2,arrive |
+           | f,d       | ef,cd,cd | depart,roundabout-exit-1,arrive |
+           | h,a       | gh,ab,ab | depart,roundabout-exit-3,arrive |
+           | h,d       | gh,cd,cd | depart,roundabout-exit-2,arrive |
+           | h,f       | gh,ef,ef | depart,roundabout-exit-1,arrive |
+
+    Scenario: Enter and Exit -- Non-Distinct
+        Given the node map
+           |   |   | a |   |   |
+           |   |   | b |   |   |
+           |   | g |   | c | d |
+           |   |   | e |   |   |
+           | h |   | f |   |   |
+
+       And the ways
+            | nodes | junction   |
+            | ab    |            |
+            | cd    |            |
+            | ef    |            |
+            | gh    |            |
+            | bgecb | roundabout |
+
+       When I route I should get
+           | waypoints | route    | turns                           |
+           | a,d       | ab,cd,cd | depart,roundabout-exit-3,arrive |
+           | a,f       | ab,ef,ef | depart,roundabout-exit-2,arrive |
+           | a,h       | ab,gh,gh | depart,roundabout-exit-1,arrive |
+           | d,f       | cd,ef,ef | depart,roundabout-exit-3,arrive |
+           | d,h       | cd,gh,gh | depart,roundabout-exit-2,arrive |
+           | d,a       | cd,ab,ab | depart,roundabout-exit-1,arrive |
+           | f,h       | ef,gh,gh | depart,roundabout-exit-3,arrive |
+           | f,a       | ef,ab,ab | depart,roundabout-exit-2,arrive |
+           | f,d       | ef,cd,cd | depart,roundabout-exit-1,arrive |
+           | h,a       | gh,ab,ab | depart,roundabout-exit-3,arrive |
+           | h,d       | gh,cd,cd | depart,roundabout-exit-2,arrive |
+           | h,f       | gh,ef,ef | depart,roundabout-exit-1,arrive |
+

features/guidance/roundabout.feature

@@ -165,6 +165,84 @@ Feature: Basic Roundabout
            | j,f       | jkl,def,def | depart,roundabout-exit-3,arrive |
            | j,c       | jkl,abc,abc | depart,roundabout-exit-4,arrive |
 
+    Scenario: Mixed Entry and Exit - segregated roads
+        Given the node map
+           |   |   | a |   | c |   |   |
+           |   |   |   |   |   |   |   |
+           | l |   |   | b |   |   | d |
+           |   |   | k |   | e |   |   |
+           | j |   |   | h |   |   | f |
+           |   |   |   |   |   |   |   |
+           |   |   | i |   | g |   |   |
+
+        And the ways
+           | nodes | junction   | oneway |
+           | abc   |            | yes    |
+           | def   |            | yes    |
+           | ghi   |            | yes    |
+           | jkl   |            | yes    |
+           | bkheb | roundabout | yes    |
+
+        When I route I should get
+           | waypoints | route       | turns                           |
+           | a,c       | abc,abc,abc | depart,roundabout-exit-4,arrive |
+           | a,l       | abc,jkl,jkl | depart,roundabout-exit-1,arrive |
+           | a,i       | abc,ghi,ghi | depart,roundabout-exit-2,arrive |
+           | a,f       | abc,def,def | depart,roundabout-exit-3,arrive |
+           | d,f       | def,def,def | depart,roundabout-exit-4,arrive |
+           | d,c       | def,abc,abc | depart,roundabout-exit-1,arrive |
+           | d,l       | def,jkl,jkl | depart,roundabout-exit-2,arrive |
+           | d,i       | def,ghi,ghi | depart,roundabout-exit-3,arrive |
+           | g,i       | ghi,ghi,ghi | depart,roundabout-exit-4,arrive |
+           | g,f       | ghi,def,def | depart,roundabout-exit-1,arrive |
+           | g,c       | ghi,abc,abc | depart,roundabout-exit-2,arrive |
+           | g,l       | ghi,jkl,jkl | depart,roundabout-exit-3,arrive |
+           | j,l       | jkl,jkl,jkl | depart,roundabout-exit-4,arrive |
+           | j,i       | jkl,ghi,ghi | depart,roundabout-exit-1,arrive |
+           | j,f       | jkl,def,def | depart,roundabout-exit-2,arrive |
+           | j,c       | jkl,abc,abc | depart,roundabout-exit-3,arrive |
+
+    Scenario: Mixed Entry and Exit - segregated roads, different names
+        Given the node map
+           |   |   | a |   | c |   |   |
+           |   |   |   |   |   |   |   |
+           | l |   |   | b |   |   | d |
+           |   |   | k |   | e |   |   |
+           | j |   |   | h |   |   | f |
+           |   |   |   |   |   |   |   |
+           |   |   | i |   | g |   |   |
+
+        And the ways
+           | nodes | junction   | oneway |
+           | ab    |            | yes    |
+           | bc    |            | yes    |
+           | de    |            | yes    |
+           | ef    |            | yes    |
+           | gh    |            | yes    |
+           | hi    |            | yes    |
+           | jk    |            | yes    |
+           | kl    |            | yes    |
+           | bkheb | roundabout | yes    |
+
+        When I route I should get
+           | waypoints | route    | turns                           |
+           | a,c       | ab,bc,bc | depart,roundabout-exit-4,arrive |
+           | a,l       | ab,kl,kl | depart,roundabout-exit-1,arrive |
+           | a,i       | ab,hi,hi | depart,roundabout-exit-2,arrive |
+           | a,f       | ab,ef,ef | depart,roundabout-exit-3,arrive |
+           | d,f       | de,ef,ef | depart,roundabout-exit-4,arrive |
+           | d,c       | de,bc,bc | depart,roundabout-exit-1,arrive |
+           | d,l       | de,kl,kl | depart,roundabout-exit-2,arrive |
+           | d,i       | de,hi,hi | depart,roundabout-exit-3,arrive |
+           | g,i       | gh,hi,hi | depart,roundabout-exit-4,arrive |
+           | g,f       | gh,ef,ef | depart,roundabout-exit-1,arrive |
+           | g,c       | gh,bc,bc | depart,roundabout-exit-2,arrive |
+           | g,l       | gh,kl,kl | depart,roundabout-exit-3,arrive |
+           | j,l       | jk,kl,kl | depart,roundabout-exit-4,arrive |
+           | j,i       | jk,hi,hi | depart,roundabout-exit-1,arrive |
+           | j,f       | jk,ef,ef | depart,roundabout-exit-2,arrive |
+           | j,c       | jk,bc,bc | depart,roundabout-exit-3,arrive |
+
        Scenario: Collinear in X
         Given the node map
             | a | b | c | d | f |
@@ -184,11 +262,11 @@ Feature: Basic Roundabout
 
        Scenario: Collinear in Y
         Given the node map
-            | a |   |
-            | b |   |
-            | c | e |
-            | d |   |
-            | f |   |
+            |   | a |
+            |   | b |
+            | e | c |
+            |   | d |
+            |   | f |
 
         And the ways
             | nodes | junction   |
@@ -230,15 +308,15 @@ Feature: Basic Roundabout
 
         And the ways
             | nodes | junction   |
-            | ab    |            |
+            | ad    |            |
             | bcdb  | roundabout |
-            | ce    |            |
-            | df    |            |
+            | be    |            |
+            | cf    |            |
 
         When I route I should get
             | waypoints | route    | turns                           |
-            | a,e       | ab,ce,ce | depart,roundabout-exit-1,arrive |
-            | a,f       | ab,df,df | depart,roundabout-exit-2,arrive |
+            | a,e       | ad,be,be | depart,roundabout-exit-1,arrive |
+            | a,f       | ad,cf,cf | depart,roundabout-exit-2,arrive |
 
        Scenario: Collinear in X,Y
         Given the node map
@@ -249,13 +327,13 @@ Feature: Basic Roundabout
 
         And the ways
             | nodes | junction   |
-            | ab    |            |
+            | ac    |            |
             | bcdb  | roundabout |
-            | ce    |            |
-            | df    |            |
+            | de    |            |
+            | bf    |            |
 
         When I route I should get
             | waypoints | route    | turns                           |
-            | a,e       | ab,ce,ce | depart,roundabout-exit-1,arrive |
-            | a,f       | ab,df,df | depart,roundabout-exit-2,arrive |
+            | a,e       | ac,de,de | depart,roundabout-exit-1,arrive |
+            | a,f       | ac,bf,bf | depart,roundabout-exit-2,arrive |
 

features/guidance/suffix-changes.feature

@@ -0,0 +1,101 @@
+@routing  @guidance
+Feature: Suppress New Names on dedicated Suffices
+
+    Background:
+        Given the profile "car"
+        Given a grid size of 10 meters
+
+    Scenario: Suffix To Suffix
+        Given the node map
+            | a |   | b |   | c |
+
+        And the ways
+            | nodes  | name |
+            | ab     | 42 N |
+            | bc     | 42 S |
+
+       When I route I should get
+            | waypoints | route     | turns         |
+            | a,c       | 42 N,42 S | depart,arrive |
+
+    Scenario: Suffix To Suffix Ref
+        Given the node map
+            | a |   | b |   | c |
+
+        And the ways
+            | nodes  | name | ref |
+            | ab     | 42 N |     |
+            | bc     | 42 S | 101 |
+
+       When I route I should get
+            | waypoints | route           | turns         |
+            | a,c       | 42 N,42 S (101) | depart,arrive |
+
+    Scenario: Prefix Change
+        Given the node map
+            | a |   | b |   | c |
+
+        And the ways
+            | nodes  | name    |
+            | ab     | West 42 |
+            | bc     | East 42 |
+
+       When I route I should get
+            | waypoints | route           | turns         |
+            | a,c       | West 42,East 42 | depart,arrive |
+
+    Scenario: Prefix Change and Reference
+        Given the node map
+            | a |   | b |   | c |
+
+        And the ways
+            | nodes  | name    | ref |
+            | ab     | West 42 | 101 |
+            | bc     | East 42 |     |
+
+       When I route I should get
+            | waypoints | route                 | turns         |
+            | a,c       | West 42 (101),East 42 | depart,arrive |
+
+    Scenario: Suffix To Suffix - Turn
+        Given the node map
+            | a |   | b |   | c |
+            |   |   | d |   |   |
+
+        And the ways
+            | nodes  | name |
+            | ab     | 42 N |
+            | bc     | 42 S |
+            | bd     | 42 E |
+
+       When I route I should get
+            | waypoints | route          | turns                    |
+            | a,c       | 42 N,42 S      | depart,arrive            |
+            | a,d       | 42 N,42 E,42 E | depart,turn right,arrive |
+
+    Scenario: Suffix To No Suffix
+        Given the node map
+            | a |   | b |   | c |
+
+        And the ways
+            | nodes  | name |
+            | ab     | 42 N |
+            | bc     | 42   |
+
+       When I route I should get
+            | waypoints | route   | turns         |
+            | a,c       | 42 N,42 | depart,arrive |
+
+    Scenario: No Suffix To Suffix
+        Given the node map
+            | a |   | b |   | c |
+
+        And the ways
+            | nodes  | name |
+            | ab     | 42   |
+            | bc     | 42 S |
+
+       When I route I should get
+            | waypoints | route   | turns         |
+            | a,c       | 42,42 S | depart,arrive |
+

features/guidance/turn.feature

@@ -389,7 +389,6 @@ Feature: Simple Turns
             | waypoints | route     | turns                   |
             | a,d       | abc,bd,bd | depart,turn left,arrive |
 
-    @bug @pr2275
     Scenario: Left Turn Assignment (6)
         Given the node map
             | d |   |   |   |   |
@@ -511,7 +510,6 @@ Feature: Simple Turns
             | waypoints | route     | turns                    |
             | a,d       | abc,bd,bd | depart,turn right,arrive |
 
-    @bug @pr2275
     Scenario: Right Turn Assignment (6)
         Given the node map
             |   |   | e |   |   |
@@ -569,7 +567,7 @@ Feature: Simple Turns
 
    Scenario: Right Turn Assignment Two Turns (2)
         Given the node map
-            |   |   | f | c |   |
+            |   |   | f |   | c |
             | a |   | b |   |   |
             |   |   |   |   | e |
             |   |   |   | d |   |
@@ -667,7 +665,6 @@ Feature: Simple Turns
             | d,e       | dbe,dbe | depart,arrive |
             | e,d       | dbe,dbe | depart,arrive |
 
-    @bug @pr2275
     Scenario: Slight Turn involving Oneways
         Given the node map
             |   |   |   | a |   |
@@ -729,7 +726,6 @@ Feature: Simple Turns
             | a,e       | abc,eb,eb | depart,turn right,arrive        |
             | a,f       | abc,fb,fb | depart,turn slight right,arrive |
 
-     @bug @pr2275
      Scenario: Right Turn Assignment Three Conflicting Turns with invalid - 2
         Given the node map
             |   |   | g |   |   |
@@ -790,7 +786,6 @@ Feature: Simple Turns
             | a,e       | abc,be,be | depart,turn right,arrive        |
             | a,f       | abc,bf,bf | depart,turn sharp right,arrive  |
 
-    @bug @pr2275
     Scenario: Conflicting Turns with well distinguished turn (back)
         Given the node map
             | a |   |   | b |   |   | c |

features/step_definitions/data.js

@@ -10,13 +10,11 @@ module.exports = function () {
     });
 
     this.Given(/^the extract extra arguments "(.*?)"$/, (args, callback) => {
-        this.setExtractArgs(args);
-        callback();
+        this.setExtractArgs(args, callback);
     });
 
     this.Given(/^the contract extra arguments "(.*?)"$/, (args, callback) => {
-        this.setContractArgs(args);
-        callback();
+        this.setContractArgs(args, callback);
     });
 
     this.Given(/^a grid size of (\d+) meters$/, (meters, callback) => {
@@ -49,18 +47,27 @@ module.exports = function () {
 
         var addNode = (name, ri, ci, cb) => {
             if (name) {
-                if (name.length !== 1) throw new Error(util.format('*** node invalid name %s, must be single characters', name));
-                if (!name.match(/[a-z0-9]/)) throw new Error(util.format('*** invalid node name %s, must me alphanumeric', name));
-
-                var lonLat;
-                if (name.match(/[a-z]/)) {
-                    if (this.nameNodeHash[name]) throw new Error(util.format('*** duplicate node %s', name));
+                var nodeWithID = name.match(/([a-z])\:([0-9]*)/);
+                if (nodeWithID) {
+                    var nodeName = nodeWithID[1],
+                        nodeID = nodeWithID[2];
+                    if (this.nameNodeHash[nodeName]) throw new Error(util.format('*** duplicate node %s', name));
                     lonLat = this.tableCoordToLonLat(ci, ri);
-                    this.addOSMNode(name, lonLat[0], lonLat[1], null);
+                    this.addOSMNode(nodeName, lonLat[0], lonLat[1], nodeID);
                 } else {
-                    if (this.locationHash[name]) throw new Error(util.format('*** duplicate node %s'), name);
-                    lonLat = this.tableCoordToLonLat(ci, ri);
-                    this.addLocation(name, lonLat[0], lonLat[1], null);
+                    if (name.length !== 1) throw new Error(util.format('*** node invalid name %s, must be single characters', name));
+                    if (!name.match(/[a-z0-9]/)) throw new Error(util.format('*** invalid node name %s, must me alphanumeric', name));
+
+                    var lonLat;
+                    if (name.match(/[a-z]/)) {
+                        if (this.nameNodeHash[name]) throw new Error(util.format('*** duplicate node %s', name));
+                        lonLat = this.tableCoordToLonLat(ci, ri);
+                        this.addOSMNode(name, lonLat[0], lonLat[1], null);
+                    } else {
+                        if (this.locationHash[name]) throw new Error(util.format('*** duplicate node %s'), name);
+                        lonLat = this.tableCoordToLonLat(ci, ri);
+                        this.addLocation(name, lonLat[0], lonLat[1], null);
+                    }
                 }
 
                 cb();
@@ -228,6 +235,10 @@ module.exports = function () {
         fs.writeFile(path.resolve(this.TEST_FOLDER, 'speeds.csv'), data, callback);
     });
 
+    this.Given(/^the turn penalty file$/, (data, callback) => {
+        fs.writeFile(path.resolve(this.TEST_FOLDER, 'penalties.csv'), data, callback);
+    });
+
     this.Given(/^the data has been saved to disk$/, (callback) => {
         try {
             this.reprocess(callback);

features/step_definitions/options.js

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

features/step_definitions/routability.js

@@ -71,6 +71,7 @@ module.exports = function () {
                 r.status = res.statusCode === 200 ? 'x' : null;
                 if (r.status) {
                     r.route = this.wayList(r.json.routes[0]);
+                    r.summary = r.json.routes[0].legs.map(l => l.summary).join(',');
 
                     if (r.route.split(',')[0] === util.format('w%d', i)) {
                         r.time = r.json.routes[0].duration;

features/step_definitions/routing.js

@@ -3,8 +3,7 @@ var d3 = require('d3-queue');
 module.exports = function () {
     this.When(/^I route I should get$/, this.WhenIRouteIShouldGet);
 
-    // This is used to route 100 times; timeout for entire step is therefore set to 100 * STRESS_TIMEOUT
-    this.When(/^I route (\d+) times I should get$/, { timeout: 30000 }, (n, table, callback) => {
+    this.When(/^I route (\d+) times I should get$/, { timeout: 100 * this.TIMEOUT }, (n, table, callback) => {
         var q = d3.queue(1);
 
         for (var i=0; i<n; i++) {

features/support/config.js

@@ -19,8 +19,6 @@ module.exports = function () {
 
         this.osmData = new classes.osmData(this);
 
-        this.STRESS_TIMEOUT = 300;
-
         this.OSRMLoader = this._OSRMLoader();
 
         this.PREPROCESS_LOG_FILE = path.resolve(this.TEST_FOLDER, 'preprocessing.log');
@@ -105,11 +103,16 @@ module.exports = function () {
         } else cb();
     };
 
-    this.setExtractArgs = (args) => {
+    this.setExtractArgs = (args, callback) => {
         this.extractArgs = args;
+        this.forceExtract = true;
+        this.forceContract = true;
+        callback();
     };
 
-    this.setContractArgs = (args) => {
+    this.setContractArgs = (args, callback) => {
         this.contractArgs = args;
+        this.forceContract = true;
+        callback();
     };
 };

features/support/data.js

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

features/support/env.js

@@ -6,10 +6,9 @@ var d3 = require('d3-queue');
 
 module.exports = function () {
     this.initializeEnv = (callback) => {
-        this.DEFAULT_PORT = 5000;
-	// OSX builds on Travis hit a timeout of ~2000 from time to time
-        this.DEFAULT_TIMEOUT = 5000;
-        this.setDefaultTimeout(this.DEFAULT_TIMEOUT);
+        this.OSRM_PORT = process.env.OSRM_PORT && parseInt(process.env.OSRM_PORT) || 5000;
+        this.TIMEOUT = process.env.CUCUMBER_TIMEOUT && parseInt(process.env.CUCUMBER_TIMEOUT) || 3000;
+        this.setDefaultTimeout(this.TIMEOUT);
         this.ROOT_FOLDER = process.cwd();
         this.OSM_USER = 'osrm';
         this.OSM_GENERATOR = 'osrm-test';
@@ -25,8 +24,6 @@ module.exports = function () {
         this.BIN_PATH = path.resolve(this.ROOT_FOLDER, 'build');
         this.DEFAULT_INPUT_FORMAT = 'osm';
         this.DEFAULT_ORIGIN = [1,1];
-        this.LAUNCH_TIMEOUT = 1000;
-        this.SHUTDOWN_TIMEOUT = 10000;
         this.DEFAULT_LOAD_METHOD = 'datastore';
         this.OSRM_ROUTED_LOG_FILE = path.resolve(this.TEST_FOLDER, 'osrm-routed.log');
         this.ERROR_LOG_FILE = path.resolve(this.TEST_FOLDER, 'error.log');
@@ -51,26 +48,6 @@ module.exports = function () {
         console.info(util.format('Node Version', process.version));
         if (parseInt(process.version.match(/v(\d)/)[1]) < 4) throw new Error('*** PLease upgrade to Node 4.+ to run OSRM cucumber tests');
 
-        if (process.env.OSRM_PORT) {
-            this.OSRM_PORT = parseInt(process.env.OSRM_PORT);
-            // eslint-disable-next-line no-console
-            console.info(util.format('Port set to %d', this.OSRM_PORT));
-        } else {
-            this.OSRM_PORT = this.DEFAULT_PORT;
-            // eslint-disable-next-line no-console
-            console.info(util.format('Using default port %d', this.OSRM_PORT));
-        }
-
-        if (process.env.OSRM_TIMEOUT) {
-            this.OSRM_TIMEOUT = parseInt(process.env.OSRM_TIMEOUT);
-            // eslint-disable-next-line no-console
-            console.info(util.format('Timeout set to %d', this.OSRM_TIMEOUT));
-        } else {
-            this.OSRM_TIMEOUT = this.DEFAULT_TIMEOUT;
-            // eslint-disable-next-line no-console
-            console.info(util.format('Using default timeout %d', this.OSRM_TIMEOUT));
-        }
-
         fs.exists(this.TEST_FOLDER, (exists) => {
             if (!exists) throw new Error(util.format('*** Test folder %s doesn\'t exist.', this.TEST_FOLDER));
             callback();

features/support/hooks.js

@@ -24,10 +24,12 @@ module.exports = function () {
     });
 
     this.After((scenario, callback) => {
-        this.setExtractArgs('');
-        this.setContractArgs('');
-        if (this.loadMethod === 'directly' && !!this.OSRMLoader.loader) this.OSRMLoader.shutdown(callback);
-        else callback();
+        this.setExtractArgs('', () => {
+            this.setContractArgs('', () => {
+                if (this.loadMethod === 'directly' && !!this.OSRMLoader.loader) this.OSRMLoader.shutdown(callback);
+                else callback();
+            });
+        });
     });
 
     this.Around('@stress', (scenario, callback) => {

features/support/http.js

@@ -20,7 +20,7 @@ module.exports = function () {
     };
 
     this.sendRequest = (baseUri, parameters, callback) => {
-        var limit = Timeout(this.OSRM_TIMEOUT, { err: { statusCode: 408 } });
+        var limit = Timeout(this.TIMEOUT, { err: { statusCode: 408 } });
 
         var runRequest = (cb) => {
             var params = this.paramsToString(parameters);

features/support/launch_classes.js

@@ -12,7 +12,7 @@ var OSRMBaseLoader = class {
     }
 
     launch (callback) {
-        var limit = Timeout(this.scope.LAUNCH_TIMEOUT, { err: this.scope.RoutedError('Launching osrm-routed timed out.') });
+        var limit = Timeout(this.scope.TIMEOUT, { err: this.scope.RoutedError('Launching osrm-routed timed out.') });
 
         var runLaunch = (cb) => {
             this.osrmUp(() => {
@@ -24,7 +24,7 @@ var OSRMBaseLoader = class {
     }
 
     shutdown (callback) {
-        var limit = Timeout(this.scope.SHUTDOWN_TIMEOUT, { err: this.scope.RoutedError('Shutting down osrm-routed timed out.')});
+        var limit = Timeout(this.scope.TIMEOUT, { err: this.scope.RoutedError('Shutting down osrm-routed timed out.')});
 
         var runShutdown = (cb) => {
             this.osrmDown(cb);

features/support/route.js

@@ -15,7 +15,7 @@ module.exports = function () {
 
     this.requestUrl = (path, callback) => {
         var uri = this.query = [this.HOST, path].join('/'),
-            limit = Timeout(this.OSRM_TIMEOUT, { err: { statusCode: 408 } });
+            limit = Timeout(this.TIMEOUT, { err: { statusCode: 408 } });
 
         function runRequest (cb) {
             request(uri, cb);
@@ -127,6 +127,12 @@ module.exports = function () {
         }
     };
 
+    this.summary = (instructions) => {
+        if (instructions) {
+            return instructions.legs.map(l => l.summary).join(',');
+        }
+    };
+
     this.wayList = (instructions) => {
         return this.extractInstructionList(instructions, s => s.name);
     };
@@ -142,6 +148,9 @@ module.exports = function () {
                 case 'depart':
                 case 'arrive':
                     return v.maneuver.type;
+                case 'on ramp':
+                case 'off ramp':
+                    return v.maneuver.type + ' ' + v.maneuver.modifier;
                 case 'roundabout':
                     return 'roundabout-exit-' + v.maneuver.exit;
                 case 'rotary':
@@ -149,6 +158,8 @@ module.exports = function () {
                         return v.rotary_name + '-exit-' + v.maneuver.exit;
                     else
                         return 'rotary-exit-' + v.maneuver.exit;
+                case 'roundabout turn':
+                    return v.maneuver.type + ' ' + v.maneuver.modifier + ' exit-' + v.maneuver.exit;
                 // FIXME this is a little bit over-simplistic for merge/fork instructions
                 default:
                     return v.maneuver.type + ' ' + v.maneuver.modifier;

features/support/shared_steps.js

@@ -31,7 +31,7 @@ module.exports = function () {
                 var afterRequest = (err, res, body) => {
                     if (err) return cb(err);
                     if (body && body.length) {
-                        var instructions, bearings, turns, modes, times, distances;
+                        var instructions, bearings, turns, modes, times, distances, summary;
 
                         var json = JSON.parse(body);
 
@@ -44,6 +44,7 @@ module.exports = function () {
                             modes = this.modeList(json.routes[0]);
                             times = this.timeList(json.routes[0]);
                             distances = this.distanceList(json.routes[0]);
+                            summary = this.summary(json.routes[0]);
                         }
 
                         if (headers.has('status')) {
@@ -66,6 +67,10 @@ module.exports = function () {
                         if (headers.has('route')) {
                             got.route = (instructions || '').trim();
 
+                            if (headers.has('summary')) {
+                                got.summary = (summary || '').trim();
+                            }
+
                             if (headers.has('alternative')) {
                                 // TODO examine more than first alternative?
                                 got.alternative ='';

features/testbot/mode.feature

@@ -12,7 +12,6 @@ Feature: Testbot - Travel mode
     Background:
        Given the profile "testbot"
 
-    @mokob @2166
     Scenario: Testbot - Always announce mode change
         Given the node map
             | a | b | c | d |
@@ -28,7 +27,6 @@ Feature: Testbot - Travel mode
             | a    | d  | foo,foo,foo,foo | driving,river downstream,driving,driving |
             | b    | d  | foo,foo,foo     | river downstream,driving,driving         |
 
-    @mokob @2166
     Scenario: Testbot - Compressed Modes
         Given the node map
             | a | b | c | d | e | f | g |
@@ -44,7 +42,6 @@ Feature: Testbot - Travel mode
             | a    | g  | road,liquid,solid,solid  | driving,river downstream,driving,driving |
             | c    | g  | liquid,solid,solid       | river downstream,driving,driving         |
 
-    @mokob @2166
     Scenario: Testbot - Modes in each direction, different forward/backward speeds
         Given the node map
             |   | 0 | 1 |   |
@@ -79,7 +76,7 @@ Feature: Testbot - Travel mode
             | 0    | 1  | ab,ab | steps down,steps down | 60s +-1 |
             | 1    | 0  | ab,ab | steps up,steps up     | 60s +-1 |
 
-    @oneway @mokob @2166
+    @oneway
     Scenario: Testbot - Modes for oneway, different forward/backward speeds
         Given the node map
             | a | b |
@@ -107,7 +104,7 @@ Feature: Testbot - Travel mode
             | a    | b  | ab,ab | steps down,steps down |
             | b    | a  |       |                       |
 
-    @oneway @mokob @2166
+    @oneway
     Scenario: Testbot - Modes for reverse oneway, different forward/backward speeds
         Given the node map
             | a | b |
@@ -135,7 +132,7 @@ Feature: Testbot - Travel mode
             | a    | b  |       |                   |
             | b    | a  | ab,ab | steps up,steps up |
 
-    @via @mokob @2166
+    @via
     Scenario: Testbot - Mode should be set at via points
         Given the node map
             | a | 1 | b |
@@ -149,7 +146,6 @@ Feature: Testbot - Travel mode
             | a,1,b     | ab,ab,ab,ab | river downstream,river downstream,river downstream,river downstream |
             | b,1,a     | ab,ab,ab,ab | river upstream,river upstream,river upstream,river upstream         |
 
-    @mokob @2166
     Scenario: Testbot - Starting at a tricky node
        Given the node map
             |  | a |  |   |   |
@@ -164,7 +160,6 @@ Feature: Testbot - Travel mode
             | from | to | route | modes                         |
             | b    | a  | ab,ab | river upstream,river upstream |
 
-    @mokob @2166
     Scenario: Testbot - Mode changes on straight way without name change
        Given the node map
             | a | 1 | b | 2 | c |
@@ -204,7 +199,6 @@ Feature: Testbot - Travel mode
             | b    | d  | bc,cd,cd          | route,driving,driving                         |
             | a    | f  | ab,bc,cd,de,ef,ef | driving,route,driving,driving,driving,driving |
 
-    @mokob @2166
     Scenario: Testbot - Modes, triangle map
         Given the node map
             |   |   |   |   |   |   | d |
@@ -239,7 +233,6 @@ Feature: Testbot - Travel mode
             | a    | d  | abc,cd,cd        | driving,driving,driving                        |
             | d    | a  | de,ce,abc,abc    | driving,river upstream,driving,driving         |
 
-    @mokob @2166
     Scenario: Testbot - River in the middle
         Given the node map
             | a | b | c |   |   |

features/testbot/status.feature

@@ -55,13 +55,13 @@ Feature: Status messages
             | ?                           | 400    | URL string malformed close to position 1: "/?"    |
             | route/v1/driving            | 400    | URL string malformed close to position 17: "ing"  |
             | route/v1/driving/           | 400    | URL string malformed close to position 18: "ng/"  |
-            | route/v1/driving/1          | 400    | Query string malformed close to position 1        |
+            | route/v1/driving/1          | 400    | Query string malformed close to position 19       |
             | route/v1/driving/1,1        | 400    | Number of coordinates needs to be at least two.   |
-            | route/v1/driving/1,1,1      | 400    | Query string malformed close to position 3        |
-            | route/v1/driving/x          | 400    | Query string malformed close to position 0        |
-            | route/v1/driving/x,y        | 400    | Query string malformed close to position 0        |
-            | route/v1/driving/1,1;       | 400    | Query string malformed close to position 3        |
-            | route/v1/driving/1,1;1      | 400    | Query string malformed close to position 5        |
-            | route/v1/driving/1,1;1,1,1  | 400    | Query string malformed close to position 7        |
-            | route/v1/driving/1,1;x      | 400    | Query string malformed close to position 3        |
-            | route/v1/driving/1,1;x,y    | 400    | Query string malformed close to position 3        |
+            | route/v1/driving/1,1,1      | 400    | Query string malformed close to position 21       |
+            | route/v1/driving/x          | 400    | Query string malformed close to position 18       |
+            | route/v1/driving/x,y        | 400    | Query string malformed close to position 18       |
+            | route/v1/driving/1,1;       | 400    | Query string malformed close to position 21       |
+            | route/v1/driving/1,1;1      | 400    | Query string malformed close to position 23       |
+            | route/v1/driving/1,1;1,1,1  | 400    | Query string malformed close to position 25       |
+            | route/v1/driving/1,1;x      | 400    | Query string malformed close to position 21       |
+            | route/v1/driving/1,1;x,y    | 400    | Query string malformed close to position 21       |

features/testbot/summary.feature

@@ -0,0 +1,77 @@
+@routing @basic @testbot
+Feature: Basic Routing
+
+    Background:
+        Given the profile "testbot"
+
+    @smallest
+    Scenario: Checking 
+        Given the node map
+            | a | b |  | c | d | e |
+
+        And the ways
+            | nodes |
+            | ab    |
+            | bc    |
+            | cd    |
+            | de    |
+
+        When I route I should get
+            | from | to | route          | summary  |
+            | a    | e  | ab,bc,cd,de,de | ab, bc   |
+            | e    | a  | de,cd,bc,ab,ab | de, bc   |
+            | a    | b  | ab,ab          | ab       |
+            | b    | d  | bc,cd,cd       | bc, cd   |
+
+    @smallest
+    Scenario: Check handling empty values
+        Given the node map
+            | a | b |  | c |   | d | f |
+            |   |   |  |   |   | e |
+
+        And the ways
+            | nodes | name |
+            | ab    | ab   |
+            | bc    | bc   |
+            | cd    |      |
+            | de    | de   |
+            | df    | df   |
+
+        When I route I should get
+            | from | to | route          | summary  |
+            | e    | a  | de,,bc,ab,ab   | de, bc   |
+
+    @smallest @todo
+    Scenario: Summaries when routing on a simple network
+        Given the node map
+            | a | b |
+
+        And the ways
+            | nodes |
+            | ab    |
+
+        When I route I should get
+            | from | to | route | summary  |
+            | a    | b  | ab,ab | ab       |
+            | b    | a  | ab,ab | ab       |
+
+    @repeated
+    Scenario: Check handling empty values
+        Given the node map
+            | f |   |   | x |   |   |
+            | b | c | d | e | 1 | g |
+            | a |   |   | y |   |   |
+
+        And the ways
+            | nodes | name   | # |
+            | ab    | first  |   |
+            | bc    | first  |   |
+            | cd    | first  |   |
+            | deg   | second |   |
+            | bf    | third  |   |
+            | xey   | cross  |we need this because phantom node segments are not considered for the summary |
+
+        When I route I should get
+            | from | to | route                     | summary       |
+            | a    | 1  | first,first,second,second | first, second |
+

features/testbot/traffic_turn_penalties.feature

@@ -0,0 +1,37 @@
+@routing @speed @traffic
+Feature: Traffic - turn penalties applied to turn onto which a phantom node snaps
+
+    Background: Simple map with phantom nodes
+        Given the node map
+            |     | 1   |     | 2   |     | 3   |     |
+            | a:1 |     | b:2 |     | c:3 |     | d:4 |
+            |     |     |     |     |     |     |     |
+            |     |     | e:5 |     | f:6 |     | g:7 |
+        And the ways
+            | nodes | highway |
+            | ab    | primary |
+            | bc    | primary |
+            | cd    | primary |
+
+            | be    | primary |
+            | cf    | primary |
+            | dg    | primary |
+        And the profile "testbot"
+        # Since testbot doesn't have turn penalties, a penalty from file of 0 should produce a neutral effect
+        And the extract extra arguments "--generate-edge-lookup"
+
+    Scenario: Weighting based on turn penalty file, with an extreme negative value -- clamps and does not fail
+        Given the turn penalty file
+            """
+            1,2,5,0
+            3,4,7,-20
+            """
+        And the contract extra arguments "--turn-penalty-file penalties.csv"
+        When I route I should get
+            | from | to | route    | speed   | time    |
+            | a    | e  | ab,be,be | 36 km/h | 40s +-1 |
+            | 1    | e  | ab,be,be | 36 km/h | 30s +-1 |
+            | b    | f  | bc,cf,cf | 36 km/h | 40s +-1 |
+            | 2    | f  | bc,cf,cf | 36 km/h | 30s +-1 |
+            | c    | g  | cd,dg,dg | 71 km/h | 20s +-1 |
+            | 3    | g  | cd,dg,dg | 54 km/h | 20s +-1 |

features/testbot/via.feature

@@ -46,7 +46,6 @@ Feature: Via points
             | a,d,c     | abc,bd,bd,bd,abc,abc |
             | c,d,a     | abc,bd,bd,bd,abc,abc |
 
-    @mokob
     Scenario: Multiple via points
         Given the node map
             | a |   |   |   | e | f | g |   |
@@ -149,6 +148,47 @@ Feature: Via points
             | a,d,c     | abc,bd,bd,bd,abc,abc |
             | c,d,a     | abc,bd,bd,bd,abc,abc |
 
+    # See issue #2349
+    Scenario: Via point at a dead end with oneway
+        Given the node map
+            | a | b | c |
+            |   | d |   |
+            |   | e |   |
+
+        And the ways
+            | nodes | oneway |
+            | abc   |  no    |
+            | bd    |  no    |
+            | ed    |  yes   |
+
+        When I route I should get
+            | waypoints | route                |
+            | a,d,c     | abc,bd,bd,bd,abc,abc |
+            | c,d,a     | abc,bd,bd,bd,abc,abc |
+
+    # See issue #2349
+    @bug
+    Scenario: Via point at a dead end with oneway
+        Given the node map
+            | a | b | c |
+            |   | d |   |
+            |   | e | g |
+            |   | f |   |
+
+        And the ways
+            | nodes | oneway |
+            | abc   |  no    |
+            | bd    |  no    |
+            | ed    |  yes   |
+            | dg    |  yes   |
+            | ef    |  no    |
+            | fg    |  yes   |
+
+        When I route I should get
+            | waypoints | route                |
+            | a,d,c     | abc,bd,bd,bd,abc,abc |
+            | c,d,a     | abc,bd,bd,bd,abc,abc |
+
     # See issue #1896
     Scenario: Via point at a dead end with barrier
         Given the profile "car"

include/contractor/contractor.hpp

@@ -84,6 +84,7 @@ class Contractor
                           const std::string &edge_segment_lookup_path,
                           const std::string &edge_penalty_path,
                           const std::vector<std::string> &segment_speed_path,
+                          const std::vector<std::string> &turn_penalty_path,
                           const std::string &nodes_filename,
                           const std::string &geometry_filename,
                           const std::string &datasource_names_filename,

include/contractor/contractor_config.hpp

@@ -81,6 +81,7 @@ struct ContractorConfig
     double core_factor;
 
     std::vector<std::string> segment_speed_lookup_paths;
+    std::vector<std::string> turn_penalty_lookup_paths;
     std::string datasource_indexes_path;
     std::string datasource_names_path;
 };

include/contractor/crc32_processor.hpp

@@ -17,9 +17,9 @@ namespace contractor
 class IteratorbasedCRC32
 {
   public:
-    bool using_hardware() const { return use_hardware_implementation; }
+    bool UsingHardware() const { return use_hardware_implementation; }
 
-    IteratorbasedCRC32() : crc(0) { use_hardware_implementation = detect_hardware_support(); }
+    IteratorbasedCRC32() : crc(0) { use_hardware_implementation = DetectHardwareSupport(); }
 
     template <class Iterator> unsigned operator()(Iterator iter, const Iterator end)
     {
@@ -31,11 +31,11 @@ class IteratorbasedCRC32
 
             if (use_hardware_implementation)
             {
-                crc = compute_in_hardware(data, sizeof(value_type));
+                crc = ComputeInHardware(data, sizeof(value_type));
             }
             else
             {
-                crc = compute_in_software(data, sizeof(value_type));
+                crc = ComputeInSoftware(data, sizeof(value_type));
             }
             ++iter;
         }
@@ -43,7 +43,7 @@ class IteratorbasedCRC32
     }
 
   private:
-    bool detect_hardware_support() const
+    bool DetectHardwareSupport() const
     {
         static const int sse42_bit = 0x00100000;
         const unsigned ecx = cpuid();
@@ -51,14 +51,14 @@ class IteratorbasedCRC32
         return sse42_found;
     }
 
-    unsigned compute_in_software(const char *str, unsigned len)
+    unsigned ComputeInSoftware(const char *str, unsigned len)
     {
         crc_processor.process_bytes(str, len);
         return crc_processor.checksum();
     }
 
     // adapted from http://byteworm.com/2010/10/13/crc32/
-    unsigned compute_in_hardware(const char *str, unsigned len)
+    unsigned ComputeInHardware(const char *str, unsigned len)
     {
 #if defined(__x86_64__)
         unsigned q = len / sizeof(unsigned);
@@ -114,7 +114,7 @@ struct RangebasedCRC32
         return crc32(std::begin(iterable), std::end(iterable));
     }
 
-    bool using_hardware() const { return crc32.using_hardware(); }
+    bool UsingHardware() const { return crc32.UsingHardware(); }
 
   private:
     IteratorbasedCRC32 crc32;

include/contractor/graph_contractor.hpp

@@ -115,7 +115,7 @@ class GraphContractor
     {
         explicit ThreadDataContainer(int number_of_nodes) : number_of_nodes(number_of_nodes) {}
 
-        inline ContractorThreadData *getThreadData()
+        inline ContractorThreadData *GetThreadData()
         {
             bool exists = false;
             auto &ref = data.local(exists);
@@ -302,7 +302,7 @@ class GraphContractor
                               [this, &node_priorities, &node_depth,
                                &thread_data_list](const tbb::blocked_range<int> &range)
                               {
-                                  ContractorThreadData *data = thread_data_list.getThreadData();
+                                  ContractorThreadData *data = thread_data_list.GetThreadData();
                                   for (int x = range.begin(), end = range.end(); x != end; ++x)
                                   {
                                       node_priorities[x] =
@@ -424,7 +424,7 @@ class GraphContractor
                 [this, &node_priorities, &remaining_nodes,
                  &thread_data_list](const tbb::blocked_range<std::size_t> &range)
                 {
-                    ContractorThreadData *data = thread_data_list.getThreadData();
+                    ContractorThreadData *data = thread_data_list.GetThreadData();
                     // determine independent node set
                     for (auto i = range.begin(), end = range.end(); i != end; ++i)
                     {
@@ -481,7 +481,7 @@ class GraphContractor
                               [this, &remaining_nodes,
                                &thread_data_list](const tbb::blocked_range<std::size_t> &range)
                               {
-                                  ContractorThreadData *data = thread_data_list.getThreadData();
+                                  ContractorThreadData *data = thread_data_list.GetThreadData();
                                   for (int position = range.begin(), end = range.end();
                                        position != end; ++position)
                                   {
@@ -495,7 +495,7 @@ class GraphContractor
                                         DeleteGrainSize),
                 [this, &remaining_nodes, &thread_data_list](const tbb::blocked_range<int> &range)
                 {
-                    ContractorThreadData *data = thread_data_list.getThreadData();
+                    ContractorThreadData *data = thread_data_list.GetThreadData();
                     for (int position = range.begin(), end = range.end(); position != end;
                          ++position)
                     {
@@ -547,7 +547,7 @@ class GraphContractor
                     [this, &node_priorities, &remaining_nodes, &node_depth,
                      &thread_data_list](const tbb::blocked_range<int> &range)
                     {
-                        ContractorThreadData *data = thread_data_list.getThreadData();
+                        ContractorThreadData *data = thread_data_list.GetThreadData();
                         for (int position = range.begin(), end = range.end(); position != end;
                              ++position)
                         {
@@ -561,7 +561,7 @@ class GraphContractor
             number_of_contracted_nodes += end_independent_nodes_idx - begin_independent_nodes_idx;
             remaining_nodes.resize(begin_independent_nodes_idx);
 
-            p.printStatus(number_of_contracted_nodes);
+            p.PrintStatus(number_of_contracted_nodes);
             ++current_level;
         }
 
@@ -627,7 +627,7 @@ class GraphContractor
             Edge new_edge;
             for (const auto node : util::irange(0u, number_of_nodes))
             {
-                p.printStatus(node);
+                p.PrintStatus(node);
                 for (auto edge : contractor_graph->GetAdjacentEdgeRange(node))
                 {
                     const NodeID target = contractor_graph->GetTarget(edge);
@@ -710,9 +710,9 @@ class GraphContractor
 
     inline void Dijkstra(const int max_distance,
                          const unsigned number_of_targets,
-                         const int maxNodes,
+                         const int max_nodes,
                          ContractorThreadData &data,
-                         const NodeID middleNode)
+                         const NodeID middle_node)
     {
 
         ContractorHeap &heap = data.heap;
@@ -723,7 +723,7 @@ class GraphContractor
         {
             const NodeID node = heap.DeleteMin();
             const auto distance = heap.GetKey(node);
-            if (++nodes > maxNodes)
+            if (++nodes > max_nodes)
             {
                 return;
             }
@@ -742,7 +742,7 @@ class GraphContractor
                 }
             }
 
-            RelaxNode(node, middleNode, distance, heap);
+            RelaxNode(node, middle_node, distance, heap);
         }
     }
 
@@ -1032,7 +1032,7 @@ class GraphContractor
             }
             // tie breaking
             if (std::abs(priority - target_priority) < std::numeric_limits<float>::epsilon() &&
-                bias(node, target))
+                Bias(node, target))
             {
                 return false;
             }
@@ -1061,7 +1061,7 @@ class GraphContractor
                 }
                 // tie breaking
                 if (std::abs(priority - target_priority) < std::numeric_limits<float>::epsilon() &&
-                    bias(node, target))
+                    Bias(node, target))
                 {
                     return false;
                 }
@@ -1071,7 +1071,7 @@ class GraphContractor
     }
 
     // This bias function takes up 22 assembly instructions in total on X86
-    inline bool bias(const NodeID a, const NodeID b) const
+    inline bool Bias(const NodeID a, const NodeID b) const
     {
         const unsigned short hasha = fast_hash(a);
         const unsigned short hashb = fast_hash(b);

include/engine/api/route_api.hpp

@@ -132,6 +132,7 @@ class RouteAPI : public BaseAPI
 
                 guidance::trimShortSegments(steps, leg_geometry);
                 leg.steps = guidance::postProcess(std::move(steps));
+                leg.steps = guidance::collapseTurns(std::move(leg.steps));
                 leg.steps = guidance::assignRelativeLocations(std::move(leg.steps), leg_geometry,
                                                               phantoms.source_phantom,
                                                               phantoms.target_phantom);

include/engine/base64.hpp

@@ -15,6 +15,9 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/range/algorithm/copy.hpp>
 
+namespace osrm
+{
+
 // RFC 4648 "The Base16, Base32, and Base64 Data Encodings"
 // See: https://tools.ietf.org/html/rfc4648
 
@@ -36,9 +39,6 @@ using BinaryFromBase64 = boost::archive::iterators::transform_width<
     6  // from a sequence of 6 bit
     >;
 } // ns detail
-
-namespace osrm
-{
 namespace engine
 {
 

include/engine/datafacade/datafacade_base.hpp

@@ -90,47 +90,47 @@ class BaseDataFacade
     virtual extractor::TravelMode GetTravelModeForEdgeID(const unsigned id) const = 0;
 
     virtual std::vector<RTreeLeaf> GetEdgesInBox(const util::Coordinate south_west,
-                                                 const util::Coordinate north_east) = 0;
+                                                 const util::Coordinate north_east) const = 0;
 
     virtual std::vector<PhantomNodeWithDistance>
     NearestPhantomNodesInRange(const util::Coordinate input_coordinate,
                                const float max_distance,
                                const int bearing,
-                               const int bearing_range) = 0;
+                               const int bearing_range) const = 0;
     virtual std::vector<PhantomNodeWithDistance>
     NearestPhantomNodesInRange(const util::Coordinate input_coordinate,
-                               const float max_distance) = 0;
+                               const float max_distance) const = 0;
 
     virtual std::vector<PhantomNodeWithDistance>
     NearestPhantomNodes(const util::Coordinate input_coordinate,
                         const unsigned max_results,
                         const double max_distance,
                         const int bearing,
-                        const int bearing_range) = 0;
+                        const int bearing_range) const = 0;
     virtual std::vector<PhantomNodeWithDistance>
     NearestPhantomNodes(const util::Coordinate input_coordinate,
                         const unsigned max_results,
                         const int bearing,
-                        const int bearing_range) = 0;
+                        const int bearing_range) const = 0;
     virtual std::vector<PhantomNodeWithDistance>
-    NearestPhantomNodes(const util::Coordinate input_coordinate, const unsigned max_results) = 0;
+    NearestPhantomNodes(const util::Coordinate input_coordinate, const unsigned max_results) const = 0;
     virtual std::vector<PhantomNodeWithDistance>
     NearestPhantomNodes(const util::Coordinate input_coordinate,
                         const unsigned max_results,
-                        const double max_distance) = 0;
+                        const double max_distance) const = 0;
 
     virtual std::pair<PhantomNode, PhantomNode>
-    NearestPhantomNodeWithAlternativeFromBigComponent(const util::Coordinate input_coordinate) = 0;
+    NearestPhantomNodeWithAlternativeFromBigComponent(const util::Coordinate input_coordinate) const = 0;
     virtual std::pair<PhantomNode, PhantomNode>
     NearestPhantomNodeWithAlternativeFromBigComponent(const util::Coordinate input_coordinate,
-                                                      const double max_distance) = 0;
+                                                      const double max_distance) const = 0;
     virtual std::pair<PhantomNode, PhantomNode>
     NearestPhantomNodeWithAlternativeFromBigComponent(const util::Coordinate input_coordinate,
                                                       const double max_distance,
                                                       const int bearing,
-                                                      const int bearing_range) = 0;
+                                                      const int bearing_range) const = 0;
     virtual std::pair<PhantomNode, PhantomNode> NearestPhantomNodeWithAlternativeFromBigComponent(
-        const util::Coordinate input_coordinate, const int bearing, const int bearing_range) = 0;
+        const util::Coordinate input_coordinate, const int bearing, const int bearing_range) const = 0;
 
     virtual unsigned GetCheckSum() const = 0;
 

include/engine/datafacade/internal_datafacade.hpp

@@ -7,6 +7,7 @@
 
 #include "extractor/guidance/turn_instruction.hpp"
 
+#include "storage/storage_config.hpp"
 #include "engine/geospatial_query.hpp"
 #include "extractor/original_edge_data.hpp"
 #include "extractor/profile_properties.hpp"
@@ -55,8 +56,8 @@ class InternalDataFacade final : public BaseDataFacade
   private:
     using super = BaseDataFacade;
     using QueryGraph = util::StaticGraph<typename super::EdgeData>;
-    using InputEdge = typename QueryGraph::InputEdge;
-    using RTreeLeaf = typename super::RTreeLeaf;
+    using InputEdge = QueryGraph::InputEdge;
+    using RTreeLeaf = super::RTreeLeaf;
     using InternalRTree =
         util::StaticRTree<RTreeLeaf, util::ShM<util::Coordinate, false>::vector, false>;
     using InternalGeospatialQuery = GeospatialQuery<InternalRTree, BaseDataFacade>;
@@ -68,7 +69,7 @@ class InternalDataFacade final : public BaseDataFacade
     std::unique_ptr<QueryGraph> m_query_graph;
     std::string m_timestamp;
 
-    std::shared_ptr<util::ShM<util::Coordinate, false>::vector> m_coordinate_list;
+    util::ShM<util::Coordinate, false>::vector m_coordinate_list;
     util::ShM<NodeID, false>::vector m_via_node_list;
     util::ShM<unsigned, false>::vector m_name_ID_list;
     util::ShM<extractor::guidance::TurnInstruction, false>::vector m_turn_instruction_list;
@@ -82,8 +83,8 @@ class InternalDataFacade final : public BaseDataFacade
     util::ShM<std::string, false>::vector m_datasource_names;
     extractor::ProfileProperties m_profile_properties;
 
-    boost::thread_specific_ptr<InternalRTree> m_static_rtree;
-    boost::thread_specific_ptr<InternalGeospatialQuery> m_geospatial_query;
+    std::unique_ptr<InternalRTree> m_static_rtree;
+    std::unique_ptr<InternalGeospatialQuery> m_geospatial_query;
     boost::filesystem::path ram_index_path;
     boost::filesystem::path file_index_path;
     util::RangeTable<16, false> m_name_table;
@@ -112,8 +113,8 @@ class InternalDataFacade final : public BaseDataFacade
 
     void LoadGraph(const boost::filesystem::path &hsgr_path)
     {
-        typename util::ShM<typename QueryGraph::NodeArrayEntry, false>::vector node_list;
-        typename util::ShM<typename QueryGraph::EdgeArrayEntry, false>::vector edge_list;
+        util::ShM<QueryGraph::NodeArrayEntry, false>::vector node_list;
+        util::ShM<QueryGraph::EdgeArrayEntry, false>::vector edge_list;
 
         util::SimpleLogger().Write() << "loading graph from " << hsgr_path.string();
 
@@ -138,12 +139,12 @@ class InternalDataFacade final : public BaseDataFacade
         extractor::QueryNode current_node;
         unsigned number_of_coordinates = 0;
         nodes_input_stream.read((char *)&number_of_coordinates, sizeof(unsigned));
-        m_coordinate_list = std::make_shared<std::vector<util::Coordinate>>(number_of_coordinates);
+        m_coordinate_list.resize(number_of_coordinates);
         for (unsigned i = 0; i < number_of_coordinates; ++i)
         {
             nodes_input_stream.read((char *)&current_node, sizeof(extractor::QueryNode));
-            m_coordinate_list->at(i) = util::Coordinate(current_node.lon, current_node.lat);
-            BOOST_ASSERT(m_coordinate_list->at(i).IsValid());
+            m_coordinate_list[i] = util::Coordinate(current_node.lon, current_node.lat);
+            BOOST_ASSERT(m_coordinate_list[i].IsValid());
         }
 
         boost::filesystem::ifstream edges_input_stream(edges_file, std::ios::binary);
@@ -252,7 +253,7 @@ class InternalDataFacade final : public BaseDataFacade
 
     void LoadRTree()
     {
-        BOOST_ASSERT_MSG(!m_coordinate_list->empty(), "coordinates must be loaded before r-tree");
+        BOOST_ASSERT_MSG(!m_coordinate_list.empty(), "coordinates must be loaded before r-tree");
 
         m_static_rtree.reset(new InternalRTree(ram_index_path, file_index_path, m_coordinate_list));
         m_geospatial_query.reset(
@@ -312,6 +313,9 @@ class InternalDataFacade final : public BaseDataFacade
 
         util::SimpleLogger().Write() << "loading street names";
         LoadStreetNames(config.names_data_path);
+
+        util::SimpleLogger().Write() << "loading rtree";
+        LoadRTree();
     }
 
     // search graph access
@@ -360,7 +364,7 @@ class InternalDataFacade final : public BaseDataFacade
     // node and edge information access
     util::Coordinate GetCoordinateOfNode(const unsigned id) const override final
     {
-        return m_coordinate_list->at(id);
+        return m_coordinate_list[id];
     }
 
     extractor::guidance::TurnInstruction
@@ -375,13 +379,9 @@ class InternalDataFacade final : public BaseDataFacade
     }
 
     std::vector<RTreeLeaf> GetEdgesInBox(const util::Coordinate south_west,
-                                         const util::Coordinate north_east) override final
+                                         const util::Coordinate north_east) const override final
     {
-        if (!m_static_rtree.get())
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
         const util::RectangleInt2D bbox{south_west.lon, north_east.lon, south_west.lat,
                                         north_east.lat};
         return m_geospatial_query->Search(bbox);
@@ -389,13 +389,9 @@ class InternalDataFacade final : public BaseDataFacade
 
     std::vector<PhantomNodeWithDistance>
     NearestPhantomNodesInRange(const util::Coordinate input_coordinate,
-                               const float max_distance) override final
+                               const float max_distance) const override final
     {
-        if (!m_static_rtree.get())
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodesInRange(input_coordinate, max_distance);
     }
@@ -404,13 +400,9 @@ class InternalDataFacade final : public BaseDataFacade
     NearestPhantomNodesInRange(const util::Coordinate input_coordinate,
                                const float max_distance,
                                const int bearing,
-                               const int bearing_range) override final
+                               const int bearing_range) const override final
     {
-        if (!m_static_rtree.get())
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodesInRange(input_coordinate, max_distance,
                                                               bearing, bearing_range);
@@ -418,13 +410,9 @@ class InternalDataFacade final : public BaseDataFacade
 
     std::vector<PhantomNodeWithDistance>
     NearestPhantomNodes(const util::Coordinate input_coordinate,
-                        const unsigned max_results) override final
+                        const unsigned max_results) const override final
     {
-        if (!m_static_rtree.get())
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodes(input_coordinate, max_results);
     }
@@ -432,13 +420,9 @@ class InternalDataFacade final : public BaseDataFacade
     std::vector<PhantomNodeWithDistance>
     NearestPhantomNodes(const util::Coordinate input_coordinate,
                         const unsigned max_results,
-                        const double max_distance) override final
+                        const double max_distance) const override final
     {
-        if (!m_static_rtree.get())
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodes(input_coordinate, max_results, max_distance);
     }
@@ -447,13 +431,9 @@ class InternalDataFacade final : public BaseDataFacade
     NearestPhantomNodes(const util::Coordinate input_coordinate,
                         const unsigned max_results,
                         const int bearing,
-                        const int bearing_range) override final
+                        const int bearing_range) const override final
     {
-        if (!m_static_rtree.get())
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodes(input_coordinate, max_results, bearing,
                                                        bearing_range);
@@ -464,13 +444,9 @@ class InternalDataFacade final : public BaseDataFacade
                         const unsigned max_results,
                         const double max_distance,
                         const int bearing,
-                        const int bearing_range) override final
+                        const int bearing_range) const override final
     {
-        if (!m_static_rtree.get())
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodes(input_coordinate, max_results, max_distance,
                                                        bearing, bearing_range);
@@ -478,26 +454,18 @@ class InternalDataFacade final : public BaseDataFacade
 
     std::pair<PhantomNode, PhantomNode>
     NearestPhantomNodeWithAlternativeFromBigComponent(const util::Coordinate input_coordinate,
-                                                      const double max_distance) override final
+                                                      const double max_distance) const override final
     {
-        if (!m_static_rtree.get())
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodeWithAlternativeFromBigComponent(
             input_coordinate, max_distance);
     }
 
     std::pair<PhantomNode, PhantomNode> NearestPhantomNodeWithAlternativeFromBigComponent(
-        const util::Coordinate input_coordinate) override final
+        const util::Coordinate input_coordinate) const override final
     {
-        if (!m_static_rtree.get())
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodeWithAlternativeFromBigComponent(
             input_coordinate);
@@ -507,13 +475,9 @@ class InternalDataFacade final : public BaseDataFacade
     NearestPhantomNodeWithAlternativeFromBigComponent(const util::Coordinate input_coordinate,
                                                       const double max_distance,
                                                       const int bearing,
-                                                      const int bearing_range) override final
+                                                      const int bearing_range) const override final
     {
-        if (!m_static_rtree.get())
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodeWithAlternativeFromBigComponent(
             input_coordinate, max_distance, bearing, bearing_range);
@@ -522,13 +486,9 @@ class InternalDataFacade final : public BaseDataFacade
     std::pair<PhantomNode, PhantomNode>
     NearestPhantomNodeWithAlternativeFromBigComponent(const util::Coordinate input_coordinate,
                                                       const int bearing,
-                                                      const int bearing_range) override final
+                                                      const int bearing_range) const override final
     {
-        if (!m_static_rtree.get())
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodeWithAlternativeFromBigComponent(
             input_coordinate, bearing, bearing_range);

include/engine/datafacade/shared_datafacade.hpp

@@ -9,6 +9,7 @@
 
 #include "extractor/guidance/turn_instruction.hpp"
 #include "extractor/profile_properties.hpp"
+#include "extractor/compressed_edge_container.hpp"
 
 #include "engine/geospatial_query.hpp"
 #include "util/range_table.hpp"
@@ -46,16 +47,15 @@ class SharedDataFacade final : public BaseDataFacade
   private:
     using super = BaseDataFacade;
     using QueryGraph = util::StaticGraph<EdgeData, true>;
-    using GraphNode = typename QueryGraph::NodeArrayEntry;
-    using GraphEdge = typename QueryGraph::EdgeArrayEntry;
-    using NameIndexBlock = typename util::RangeTable<16, true>::BlockT;
-    using InputEdge = typename QueryGraph::InputEdge;
-    using RTreeLeaf = typename super::RTreeLeaf;
+    using GraphNode = QueryGraph::NodeArrayEntry;
+    using GraphEdge = QueryGraph::EdgeArrayEntry;
+    using NameIndexBlock = util::RangeTable<16, true>::BlockT;
+    using InputEdge = QueryGraph::InputEdge;
+    using RTreeLeaf = super::RTreeLeaf;
     using SharedRTree =
         util::StaticRTree<RTreeLeaf, util::ShM<util::Coordinate, true>::vector, true>;
     using SharedGeospatialQuery = GeospatialQuery<SharedRTree, BaseDataFacade>;
-    using TimeStampedRTreePair = std::pair<unsigned, std::shared_ptr<SharedRTree>>;
-    using RTreeNode = typename SharedRTree::TreeNode;
+    using RTreeNode = SharedRTree::TreeNode;
 
     storage::SharedDataLayout *data_layout;
     char *shared_memory;
@@ -70,9 +70,9 @@ class SharedDataFacade final : public BaseDataFacade
     std::unique_ptr<storage::SharedMemory> m_layout_memory;
     std::unique_ptr<storage::SharedMemory> m_large_memory;
     std::string m_timestamp;
-    extractor::ProfileProperties* m_profile_properties;
+    extractor::ProfileProperties *m_profile_properties;
 
-    std::shared_ptr<util::ShM<util::Coordinate, true>::vector> m_coordinate_list;
+    util::ShM<util::Coordinate, true>::vector m_coordinate_list;
     util::ShM<NodeID, true>::vector m_via_node_list;
     util::ShM<unsigned, true>::vector m_name_ID_list;
     util::ShM<extractor::guidance::TurnInstruction, true>::vector m_turn_instruction_list;
@@ -88,8 +88,8 @@ class SharedDataFacade final : public BaseDataFacade
     util::ShM<std::size_t, true>::vector m_datasource_name_offsets;
     util::ShM<std::size_t, true>::vector m_datasource_name_lengths;
 
-    boost::thread_specific_ptr<std::pair<unsigned, std::shared_ptr<SharedRTree>>> m_static_rtree;
-    boost::thread_specific_ptr<SharedGeospatialQuery> m_geospatial_query;
+    std::unique_ptr<SharedRTree> m_static_rtree;
+    std::unique_ptr<SharedGeospatialQuery> m_geospatial_query;
     boost::filesystem::path file_index_path;
 
     std::shared_ptr<util::RangeTable<16, true>> m_name_table;
@@ -103,8 +103,8 @@ class SharedDataFacade final : public BaseDataFacade
 
     void LoadProfileProperties()
     {
-        m_profile_properties =
-            data_layout->GetBlockPtr<extractor::ProfileProperties>(shared_memory, storage::SharedDataLayout::PROPERTIES);
+        m_profile_properties = data_layout->GetBlockPtr<extractor::ProfileProperties>(
+            shared_memory, storage::SharedDataLayout::PROPERTIES);
     }
 
     void LoadTimestamp()
@@ -119,17 +119,15 @@ class SharedDataFacade final : public BaseDataFacade
 
     void LoadRTree()
     {
-        BOOST_ASSERT_MSG(!m_coordinate_list->empty(), "coordinates must be loaded before r-tree");
+        BOOST_ASSERT_MSG(!m_coordinate_list.empty(), "coordinates must be loaded before r-tree");
 
         auto tree_ptr = data_layout->GetBlockPtr<RTreeNode>(
             shared_memory, storage::SharedDataLayout::R_SEARCH_TREE);
-        m_static_rtree.reset(new TimeStampedRTreePair(
-            CURRENT_TIMESTAMP,
-            util::make_unique<SharedRTree>(
-                tree_ptr, data_layout->num_entries[storage::SharedDataLayout::R_SEARCH_TREE],
-                file_index_path, m_coordinate_list)));
+        m_static_rtree.reset(new SharedRTree(
+            tree_ptr, data_layout->num_entries[storage::SharedDataLayout::R_SEARCH_TREE],
+            file_index_path, m_coordinate_list));
         m_geospatial_query.reset(
-            new SharedGeospatialQuery(*m_static_rtree->second, m_coordinate_list, *this));
+            new SharedGeospatialQuery(*m_static_rtree, m_coordinate_list, *this));
     }
 
     void LoadGraph()
@@ -140,9 +138,9 @@ class SharedDataFacade final : public BaseDataFacade
         auto graph_edges_ptr = data_layout->GetBlockPtr<GraphEdge>(
             shared_memory, storage::SharedDataLayout::GRAPH_EDGE_LIST);
 
-        typename util::ShM<GraphNode, true>::vector node_list(
+        util::ShM<GraphNode, true>::vector node_list(
             graph_nodes_ptr, data_layout->num_entries[storage::SharedDataLayout::GRAPH_NODE_LIST]);
-        typename util::ShM<GraphEdge, true>::vector edge_list(
+        util::ShM<GraphEdge, true>::vector edge_list(
             graph_edges_ptr, data_layout->num_entries[storage::SharedDataLayout::GRAPH_EDGE_LIST]);
         m_query_graph.reset(new QueryGraph(node_list, edge_list));
     }
@@ -151,28 +149,26 @@ class SharedDataFacade final : public BaseDataFacade
     {
         auto coordinate_list_ptr = data_layout->GetBlockPtr<util::Coordinate>(
             shared_memory, storage::SharedDataLayout::COORDINATE_LIST);
-        m_coordinate_list = util::make_unique<util::ShM<util::Coordinate, true>::vector>(
-            coordinate_list_ptr,
+        m_coordinate_list.reset(coordinate_list_ptr,
             data_layout->num_entries[storage::SharedDataLayout::COORDINATE_LIST]);
 
         auto travel_mode_list_ptr = data_layout->GetBlockPtr<extractor::TravelMode>(
             shared_memory, storage::SharedDataLayout::TRAVEL_MODE);
-        typename util::ShM<extractor::TravelMode, true>::vector travel_mode_list(
+        util::ShM<extractor::TravelMode, true>::vector travel_mode_list(
             travel_mode_list_ptr, data_layout->num_entries[storage::SharedDataLayout::TRAVEL_MODE]);
         m_travel_mode_list = std::move(travel_mode_list);
 
         auto turn_instruction_list_ptr =
             data_layout->GetBlockPtr<extractor::guidance::TurnInstruction>(
                 shared_memory, storage::SharedDataLayout::TURN_INSTRUCTION);
-        typename util::ShM<extractor::guidance::TurnInstruction, true>::vector
-            turn_instruction_list(
-                turn_instruction_list_ptr,
-                data_layout->num_entries[storage::SharedDataLayout::TURN_INSTRUCTION]);
+        util::ShM<extractor::guidance::TurnInstruction, true>::vector turn_instruction_list(
+            turn_instruction_list_ptr,
+            data_layout->num_entries[storage::SharedDataLayout::TURN_INSTRUCTION]);
         m_turn_instruction_list = std::move(turn_instruction_list);
 
         auto name_id_list_ptr = data_layout->GetBlockPtr<unsigned>(
             shared_memory, storage::SharedDataLayout::NAME_ID_LIST);
-        typename util::ShM<unsigned, true>::vector name_id_list(
+        util::ShM<unsigned, true>::vector name_id_list(
             name_id_list_ptr, data_layout->num_entries[storage::SharedDataLayout::NAME_ID_LIST]);
         m_name_ID_list = std::move(name_id_list);
     }
@@ -181,7 +177,7 @@ class SharedDataFacade final : public BaseDataFacade
     {
         auto via_node_list_ptr = data_layout->GetBlockPtr<NodeID>(
             shared_memory, storage::SharedDataLayout::VIA_NODE_LIST);
-        typename util::ShM<NodeID, true>::vector via_node_list(
+        util::ShM<NodeID, true>::vector via_node_list(
             via_node_list_ptr, data_layout->num_entries[storage::SharedDataLayout::VIA_NODE_LIST]);
         m_via_node_list = std::move(via_node_list);
     }
@@ -192,14 +188,14 @@ class SharedDataFacade final : public BaseDataFacade
             shared_memory, storage::SharedDataLayout::NAME_OFFSETS);
         auto blocks_ptr = data_layout->GetBlockPtr<NameIndexBlock>(
             shared_memory, storage::SharedDataLayout::NAME_BLOCKS);
-        typename util::ShM<unsigned, true>::vector name_offsets(
+        util::ShM<unsigned, true>::vector name_offsets(
             offsets_ptr, data_layout->num_entries[storage::SharedDataLayout::NAME_OFFSETS]);
-        typename util::ShM<NameIndexBlock, true>::vector name_blocks(
+        util::ShM<NameIndexBlock, true>::vector name_blocks(
             blocks_ptr, data_layout->num_entries[storage::SharedDataLayout::NAME_BLOCKS]);
 
         auto names_list_ptr = data_layout->GetBlockPtr<char>(
             shared_memory, storage::SharedDataLayout::NAME_CHAR_LIST);
-        typename util::ShM<char, true>::vector names_char_list(
+        util::ShM<char, true>::vector names_char_list(
             names_list_ptr, data_layout->num_entries[storage::SharedDataLayout::NAME_CHAR_LIST]);
         m_name_table = util::make_unique<util::RangeTable<16, true>>(
             name_offsets, name_blocks, static_cast<unsigned>(names_char_list.size()));
@@ -216,7 +212,7 @@ class SharedDataFacade final : public BaseDataFacade
 
         auto core_marker_ptr = data_layout->GetBlockPtr<unsigned>(
             shared_memory, storage::SharedDataLayout::CORE_MARKER);
-        typename util::ShM<bool, true>::vector is_core_node(
+        util::ShM<bool, true>::vector is_core_node(
             core_marker_ptr, data_layout->num_entries[storage::SharedDataLayout::CORE_MARKER]);
         m_is_core_node = std::move(is_core_node);
     }
@@ -225,7 +221,7 @@ class SharedDataFacade final : public BaseDataFacade
     {
         auto geometries_index_ptr = data_layout->GetBlockPtr<unsigned>(
             shared_memory, storage::SharedDataLayout::GEOMETRIES_INDEX);
-        typename util::ShM<unsigned, true>::vector geometry_begin_indices(
+        util::ShM<unsigned, true>::vector geometry_begin_indices(
             geometries_index_ptr,
             data_layout->num_entries[storage::SharedDataLayout::GEOMETRIES_INDEX]);
         m_geometry_indices = std::move(geometry_begin_indices);
@@ -233,35 +229,35 @@ class SharedDataFacade final : public BaseDataFacade
         auto geometries_list_ptr =
             data_layout->GetBlockPtr<extractor::CompressedEdgeContainer::CompressedEdge>(
                 shared_memory, storage::SharedDataLayout::GEOMETRIES_LIST);
-        typename util::ShM<extractor::CompressedEdgeContainer::CompressedEdge, true>::vector
-            geometry_list(geometries_list_ptr,
-                          data_layout->num_entries[storage::SharedDataLayout::GEOMETRIES_LIST]);
+        util::ShM<extractor::CompressedEdgeContainer::CompressedEdge, true>::vector geometry_list(
+            geometries_list_ptr,
+            data_layout->num_entries[storage::SharedDataLayout::GEOMETRIES_LIST]);
         m_geometry_list = std::move(geometry_list);
 
         auto datasources_list_ptr = data_layout->GetBlockPtr<uint8_t>(
             shared_memory, storage::SharedDataLayout::DATASOURCES_LIST);
-        typename util::ShM<uint8_t, true>::vector datasources_list(
+        util::ShM<uint8_t, true>::vector datasources_list(
             datasources_list_ptr,
             data_layout->num_entries[storage::SharedDataLayout::DATASOURCES_LIST]);
         m_datasource_list = std::move(datasources_list);
 
         auto datasource_name_data_ptr = data_layout->GetBlockPtr<char>(
             shared_memory, storage::SharedDataLayout::DATASOURCE_NAME_DATA);
-        typename util::ShM<char, true>::vector datasource_name_data(
+        util::ShM<char, true>::vector datasource_name_data(
             datasource_name_data_ptr,
             data_layout->num_entries[storage::SharedDataLayout::DATASOURCE_NAME_DATA]);
         m_datasource_name_data = std::move(datasource_name_data);
 
         auto datasource_name_offsets_ptr = data_layout->GetBlockPtr<std::size_t>(
             shared_memory, storage::SharedDataLayout::DATASOURCE_NAME_OFFSETS);
-        typename util::ShM<std::size_t, true>::vector datasource_name_offsets(
+        util::ShM<std::size_t, true>::vector datasource_name_offsets(
             datasource_name_offsets_ptr,
             data_layout->num_entries[storage::SharedDataLayout::DATASOURCE_NAME_OFFSETS]);
         m_datasource_name_offsets = std::move(datasource_name_offsets);
 
         auto datasource_name_lengths_ptr = data_layout->GetBlockPtr<std::size_t>(
             shared_memory, storage::SharedDataLayout::DATASOURCE_NAME_LENGTHS);
-        typename util::ShM<std::size_t, true>::vector datasource_name_lengths(
+        util::ShM<std::size_t, true>::vector datasource_name_lengths(
             datasource_name_lengths_ptr,
             data_layout->num_entries[storage::SharedDataLayout::DATASOURCE_NAME_LENGTHS]);
         m_datasource_name_lengths = std::move(datasource_name_lengths);
@@ -353,15 +349,13 @@ class SharedDataFacade final : public BaseDataFacade
                 LoadNames();
                 LoadCoreInformation();
                 LoadProfileProperties();
+                LoadRTree();
 
                 util::SimpleLogger().Write() << "number of geometries: "
-                                             << m_coordinate_list->size();
-                for (unsigned i = 0; i < m_coordinate_list->size(); ++i)
+                                             << m_coordinate_list.size();
+                for (unsigned i = 0; i < m_coordinate_list.size(); ++i)
                 {
-                    if (!GetCoordinateOfNode(i).IsValid())
-                    {
-                        util::SimpleLogger().Write() << "coordinate " << i << " not valid";
-                    }
+                    BOOST_ASSERT(GetCoordinateOfNode(i).IsValid());
                 }
             }
             util::SimpleLogger().Write(logDEBUG) << "Releasing exclusive lock";
@@ -414,7 +408,7 @@ class SharedDataFacade final : public BaseDataFacade
     // node and edge information access
     util::Coordinate GetCoordinateOfNode(const NodeID id) const override final
     {
-        return m_coordinate_list->at(id);
+        return m_coordinate_list[id];
     }
 
     virtual void GetUncompressedGeometry(const EdgeID id,
@@ -465,13 +459,9 @@ class SharedDataFacade final : public BaseDataFacade
     }
 
     std::vector<RTreeLeaf> GetEdgesInBox(const util::Coordinate south_west,
-                                         const util::Coordinate north_east) override final
+                                         const util::Coordinate north_east) const override final
     {
-        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
         const util::RectangleInt2D bbox{south_west.lon, north_east.lon, south_west.lat,
                                         north_east.lat};
         return m_geospatial_query->Search(bbox);
@@ -479,13 +469,9 @@ class SharedDataFacade final : public BaseDataFacade
 
     std::vector<PhantomNodeWithDistance>
     NearestPhantomNodesInRange(const util::Coordinate input_coordinate,
-                               const float max_distance) override final
+                               const float max_distance) const override final
     {
-        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodesInRange(input_coordinate, max_distance);
     }
@@ -494,13 +480,9 @@ class SharedDataFacade final : public BaseDataFacade
     NearestPhantomNodesInRange(const util::Coordinate input_coordinate,
                                const float max_distance,
                                const int bearing,
-                               const int bearing_range) override final
+                               const int bearing_range) const override final
     {
-        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodesInRange(input_coordinate, max_distance,
                                                               bearing, bearing_range);
@@ -508,13 +490,9 @@ class SharedDataFacade final : public BaseDataFacade
 
     std::vector<PhantomNodeWithDistance>
     NearestPhantomNodes(const util::Coordinate input_coordinate,
-                        const unsigned max_results) override final
+                        const unsigned max_results) const override final
     {
-        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodes(input_coordinate, max_results);
     }
@@ -522,13 +500,9 @@ class SharedDataFacade final : public BaseDataFacade
     std::vector<PhantomNodeWithDistance>
     NearestPhantomNodes(const util::Coordinate input_coordinate,
                         const unsigned max_results,
-                        const double max_distance) override final
+                        const double max_distance) const override final
     {
-        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodes(input_coordinate, max_results, max_distance);
     }
@@ -537,13 +511,9 @@ class SharedDataFacade final : public BaseDataFacade
     NearestPhantomNodes(const util::Coordinate input_coordinate,
                         const unsigned max_results,
                         const int bearing,
-                        const int bearing_range) override final
+                        const int bearing_range) const override final
     {
-        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodes(input_coordinate, max_results, bearing,
                                                        bearing_range);
@@ -554,26 +524,18 @@ class SharedDataFacade final : public BaseDataFacade
                         const unsigned max_results,
                         const double max_distance,
                         const int bearing,
-                        const int bearing_range) override final
+                        const int bearing_range) const override final
     {
-        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodes(input_coordinate, max_results, max_distance,
                                                        bearing, bearing_range);
     }
 
     std::pair<PhantomNode, PhantomNode> NearestPhantomNodeWithAlternativeFromBigComponent(
-        const util::Coordinate input_coordinate) override final
+        const util::Coordinate input_coordinate) const override final
     {
-        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodeWithAlternativeFromBigComponent(
             input_coordinate);
@@ -581,13 +543,9 @@ class SharedDataFacade final : public BaseDataFacade
 
     std::pair<PhantomNode, PhantomNode>
     NearestPhantomNodeWithAlternativeFromBigComponent(const util::Coordinate input_coordinate,
-                                                      const double max_distance) override final
+                                                      const double max_distance) const override final
     {
-        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodeWithAlternativeFromBigComponent(
             input_coordinate, max_distance);
@@ -597,13 +555,9 @@ class SharedDataFacade final : public BaseDataFacade
     NearestPhantomNodeWithAlternativeFromBigComponent(const util::Coordinate input_coordinate,
                                                       const double max_distance,
                                                       const int bearing,
-                                                      const int bearing_range) override final
+                                                      const int bearing_range) const override final
     {
-        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodeWithAlternativeFromBigComponent(
             input_coordinate, max_distance, bearing, bearing_range);
@@ -612,13 +566,9 @@ class SharedDataFacade final : public BaseDataFacade
     std::pair<PhantomNode, PhantomNode>
     NearestPhantomNodeWithAlternativeFromBigComponent(const util::Coordinate input_coordinate,
                                                       const int bearing,
-                                                      const int bearing_range) override final
+                                                      const int bearing_range) const override final
     {
-        if (!m_static_rtree.get() || CURRENT_TIMESTAMP != m_static_rtree->first)
-        {
-            LoadRTree();
-            BOOST_ASSERT(m_geospatial_query.get());
-        }
+        BOOST_ASSERT(m_geospatial_query.get());
 
         return m_geospatial_query->NearestPhantomNodeWithAlternativeFromBigComponent(
             input_coordinate, bearing, bearing_range);
@@ -709,7 +659,10 @@ class SharedDataFacade final : public BaseDataFacade
 
     std::string GetTimestamp() const override final { return m_timestamp; }
 
-    bool GetContinueStraightDefault() const override final { return m_profile_properties->continue_straight_at_waypoint; }
+    bool GetContinueStraightDefault() const override final
+    {
+        return m_profile_properties->continue_straight_at_waypoint;
+    }
 };
 }
 }

include/engine/geospatial_query.hpp

@@ -22,7 +22,7 @@ namespace engine
 
 // Implements complex queries on top of an RTree and builds PhantomNodes from it.
 //
-// Only holds a weak reference on the RTree!
+// Only holds a weak reference on the RTree and coordinates!
 template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
 {
     using EdgeData = typename RTreeT::EdgeData;
@@ -31,9 +31,9 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
 
   public:
     GeospatialQuery(RTreeT &rtree_,
-                    std::shared_ptr<CoordinateList> coordinates_,
+                    const CoordinateList &coordinates_,
                     DataFacadeT &datafacade_)
-        : rtree(rtree_), coordinates(std::move(coordinates_)), datafacade(datafacade_)
+        : rtree(rtree_), coordinates(coordinates_), datafacade(datafacade_)
     {
     }
 
@@ -45,7 +45,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
     // Returns nearest PhantomNodes in the given bearing range within max_distance.
     // Does not filter by small/big component!
     std::vector<PhantomNodeWithDistance>
-    NearestPhantomNodesInRange(const util::Coordinate input_coordinate, const double max_distance)
+    NearestPhantomNodesInRange(const util::Coordinate input_coordinate, const double max_distance) const
     {
         auto results =
             rtree.Nearest(input_coordinate,
@@ -56,7 +56,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
                           [this, max_distance, input_coordinate](const std::size_t,
                                                                  const CandidateSegment &segment)
                           {
-                              return checkSegmentDistance(input_coordinate, segment, max_distance);
+                              return CheckSegmentDistance(input_coordinate, segment, max_distance);
                           });
 
         return MakePhantomNodes(input_coordinate, results);
@@ -68,18 +68,18 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
     NearestPhantomNodesInRange(const util::Coordinate input_coordinate,
                                const double max_distance,
                                const int bearing,
-                               const int bearing_range)
+                               const int bearing_range) const
     {
         auto results = rtree.Nearest(
             input_coordinate,
             [this, bearing, bearing_range, max_distance](const CandidateSegment &segment)
             {
-                return checkSegmentBearing(segment, bearing, bearing_range);
+                return CheckSegmentBearing(segment, bearing, bearing_range);
             },
             [this, max_distance, input_coordinate](const std::size_t,
                                                    const CandidateSegment &segment)
             {
-                return checkSegmentDistance(input_coordinate, segment, max_distance);
+                return CheckSegmentDistance(input_coordinate, segment, max_distance);
             });
 
         return MakePhantomNodes(input_coordinate, results);
@@ -91,13 +91,13 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
     NearestPhantomNodes(const util::Coordinate input_coordinate,
                         const unsigned max_results,
                         const int bearing,
-                        const int bearing_range)
+                        const int bearing_range) const
     {
         auto results =
             rtree.Nearest(input_coordinate,
                           [this, bearing, bearing_range](const CandidateSegment &segment)
                           {
-                              return checkSegmentBearing(segment, bearing, bearing_range);
+                              return CheckSegmentBearing(segment, bearing, bearing_range);
                           },
                           [max_results](const std::size_t num_results, const CandidateSegment &)
                           {
@@ -115,19 +115,19 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
                         const unsigned max_results,
                         const double max_distance,
                         const int bearing,
-                        const int bearing_range)
+                        const int bearing_range) const
     {
         auto results =
             rtree.Nearest(input_coordinate,
                           [this, bearing, bearing_range](const CandidateSegment &segment)
                           {
-                              return checkSegmentBearing(segment, bearing, bearing_range);
+                              return CheckSegmentBearing(segment, bearing, bearing_range);
                           },
                           [this, max_distance, max_results, input_coordinate](
                               const std::size_t num_results, const CandidateSegment &segment)
                           {
                               return num_results >= max_results ||
-                                     checkSegmentDistance(input_coordinate, segment, max_distance);
+                                     CheckSegmentDistance(input_coordinate, segment, max_distance);
                           });
 
         return MakePhantomNodes(input_coordinate, results);
@@ -136,7 +136,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
     // Returns max_results nearest PhantomNodes.
     // Does not filter by small/big component!
     std::vector<PhantomNodeWithDistance>
-    NearestPhantomNodes(const util::Coordinate input_coordinate, const unsigned max_results)
+    NearestPhantomNodes(const util::Coordinate input_coordinate, const unsigned max_results) const
     {
         auto results =
             rtree.Nearest(input_coordinate,
@@ -157,7 +157,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
     std::vector<PhantomNodeWithDistance>
     NearestPhantomNodes(const util::Coordinate input_coordinate,
                         const unsigned max_results,
-                        const double max_distance)
+                        const double max_distance) const
     {
         auto results =
             rtree.Nearest(input_coordinate,
@@ -169,7 +169,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
                               const std::size_t num_results, const CandidateSegment &segment)
                           {
                               return num_results >= max_results ||
-                                     checkSegmentDistance(input_coordinate, segment, max_distance);
+                                     CheckSegmentDistance(input_coordinate, segment, max_distance);
                           });
 
         return MakePhantomNodes(input_coordinate, results);
@@ -179,7 +179,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
     // a second phantom node is return that is the nearest coordinate in a big component.
     std::pair<PhantomNode, PhantomNode>
     NearestPhantomNodeWithAlternativeFromBigComponent(const util::Coordinate input_coordinate,
-                                                      const double max_distance)
+                                                      const double max_distance) const
     {
         bool has_small_component = false;
         bool has_big_component = false;
@@ -200,7 +200,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
              input_coordinate](const std::size_t num_results, const CandidateSegment &segment)
             {
                 return (num_results > 0 && has_big_component) ||
-                       checkSegmentDistance(input_coordinate, segment, max_distance);
+                       CheckSegmentDistance(input_coordinate, segment, max_distance);
             });
 
         if (results.size() == 0)
@@ -216,7 +216,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
     // Returns the nearest phantom node. If this phantom node is not from a big component
     // a second phantom node is return that is the nearest coordinate in a big component.
     std::pair<PhantomNode, PhantomNode>
-    NearestPhantomNodeWithAlternativeFromBigComponent(const util::Coordinate input_coordinate)
+    NearestPhantomNodeWithAlternativeFromBigComponent(const util::Coordinate input_coordinate) const
     {
         bool has_small_component = false;
         bool has_big_component = false;
@@ -251,7 +251,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
     // Returns the nearest phantom node. If this phantom node is not from a big component
     // a second phantom node is return that is the nearest coordinate in a big component.
     std::pair<PhantomNode, PhantomNode> NearestPhantomNodeWithAlternativeFromBigComponent(
-        const util::Coordinate input_coordinate, const int bearing, const int bearing_range)
+        const util::Coordinate input_coordinate, const int bearing, const int bearing_range) const
     {
         bool has_small_component = false;
         bool has_big_component = false;
@@ -266,7 +266,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
 
                 if (use_segment)
                 {
-                    use_directions = checkSegmentBearing(segment, bearing, bearing_range);
+                    use_directions = CheckSegmentBearing(segment, bearing, bearing_range);
                     if (use_directions.first || use_directions.second)
                     {
                         has_big_component = has_big_component || !segment.data.component.is_tiny;
@@ -297,7 +297,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
     NearestPhantomNodeWithAlternativeFromBigComponent(const util::Coordinate input_coordinate,
                                                       const double max_distance,
                                                       const int bearing,
-                                                      const int bearing_range)
+                                                      const int bearing_range) const
     {
         bool has_small_component = false;
         bool has_big_component = false;
@@ -312,7 +312,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
 
                 if (use_segment)
                 {
-                    use_directions = checkSegmentBearing(segment, bearing, bearing_range);
+                    use_directions = CheckSegmentBearing(segment, bearing, bearing_range);
                     if (use_directions.first || use_directions.second)
                     {
                         has_big_component = has_big_component || !segment.data.component.is_tiny;
@@ -326,7 +326,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
              input_coordinate](const std::size_t num_results, const CandidateSegment &segment)
             {
                 return (num_results > 0 && has_big_component) ||
-                       checkSegmentDistance(input_coordinate, segment, max_distance);
+                       CheckSegmentDistance(input_coordinate, segment, max_distance);
             });
 
         if (results.size() == 0)
@@ -360,7 +360,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
         double ratio;
         const auto current_perpendicular_distance =
             util::coordinate_calculation::perpendicularDistance(
-                coordinates->at(data.u), coordinates->at(data.v), input_coordinate,
+                coordinates[data.u], coordinates[data.v], input_coordinate,
                 point_on_segment, ratio);
 
         // Find the node-based-edge that this belongs to, and directly
@@ -416,9 +416,9 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
         return transformed;
     }
 
-    bool checkSegmentDistance(const Coordinate input_coordinate,
+    bool CheckSegmentDistance(const Coordinate input_coordinate,
                               const CandidateSegment &segment,
-                              const double max_distance)
+                              const double max_distance) const
     {
         BOOST_ASSERT(segment.data.forward_segment_id.id != SPECIAL_SEGMENTID ||
                      !segment.data.forward_segment_id.enabled);
@@ -432,9 +432,9 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
                max_distance;
     }
 
-    std::pair<bool, bool> checkSegmentBearing(const CandidateSegment &segment,
+    std::pair<bool, bool> CheckSegmentBearing(const CandidateSegment &segment,
                                               const int filter_bearing,
-                                              const int filter_bearing_range)
+                                              const int filter_bearing_range) const
     {
         BOOST_ASSERT(segment.data.forward_segment_id.id != SPECIAL_SEGMENTID ||
                      !segment.data.forward_segment_id.enabled);
@@ -442,7 +442,7 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
                      !segment.data.reverse_segment_id.enabled);
 
         const double forward_edge_bearing = util::coordinate_calculation::bearing(
-            coordinates->at(segment.data.u), coordinates->at(segment.data.v));
+            coordinates[segment.data.u], coordinates[segment.data.v]);
 
         const double backward_edge_bearing = (forward_edge_bearing + 180) > 360
                                                  ? (forward_edge_bearing - 180)
@@ -459,8 +459,8 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
         return std::make_pair(forward_bearing_valid, backward_bearing_valid);
     }
 
-    RTreeT &rtree;
-    const std::shared_ptr<CoordinateList> coordinates;
+    const RTreeT &rtree;
+    const CoordinateList &coordinates;
     DataFacadeT &datafacade;
 };
 }

include/engine/guidance/assemble_leg.hpp

@@ -34,6 +34,7 @@ struct NamedSegment
 };
 
 template <std::size_t SegmentNumber>
+
 std::array<std::uint32_t, SegmentNumber> summarizeRoute(const std::vector<PathData> &route_data)
 {
     // merges segments with same name id
@@ -41,7 +42,14 @@ std::array<std::uint32_t, SegmentNumber> summarizeRoute(const std::vector<PathDa
     {
         auto out = segments.begin();
         auto end = segments.end();
-        for (auto in = segments.begin(); in != end; ++in)
+
+        // Do nothing if we were given an empty array
+        if (out == end)
+        {
+            return end;
+        }
+
+        for (auto in = std::next(out); in != end; ++in)
         {
             if (in->name_id == out->name_id)
             {
@@ -54,7 +62,8 @@ std::array<std::uint32_t, SegmentNumber> summarizeRoute(const std::vector<PathDa
                 *out = *in;
             }
         }
-        return out;
+        BOOST_ASSERT(out != end);
+        return ++out;
     };
 
     std::vector<NamedSegment> segments(route_data.size());
@@ -72,10 +81,19 @@ std::array<std::uint32_t, SegmentNumber> summarizeRoute(const std::vector<PathDa
               });
     auto new_end = collapse_segments(segments);
     segments.resize(new_end - segments.begin());
+
+    // Filter out segments with an empty name (name_id == 0)
+    new_end = std::remove_if(segments.begin(), segments.end(), [](const NamedSegment &segment)
+              {
+                  return segment.name_id == 0;
+              });
+    segments.resize(new_end - segments.begin());
+
     // sort descending
     std::sort(segments.begin(), segments.end(), [](const NamedSegment &lhs, const NamedSegment &rhs)
               {
-                  return lhs.duration > rhs.duration;
+                  return lhs.duration > rhs.duration ||
+                         (lhs.duration == rhs.duration && lhs.position < rhs.position);
               });
 
     // make sure the segments are sorted by position

include/engine/guidance/assemble_steps.hpp

@@ -14,6 +14,7 @@
 #include "util/coordinate_calculation.hpp"
 
 #include <boost/optional.hpp>
+#include <cstddef>
 #include <vector>
 
 namespace osrm
@@ -75,20 +76,30 @@ std::vector<RouteStep> assembleSteps(const DataFacadeT &facade,
         // We need to skip the first segment because it is already covered by the
         // initial start of a route
         int segment_duration = 0;
-        for (const auto &path_point : leg_data)
+
+        // some name changes are not announced in our processing. For these, we have to keep the
+        // first name on the segment
+        auto step_name_id = source_node.name_id;
+        for (std::size_t leg_data_index = 0; leg_data_index < leg_data.size(); ++leg_data_index)
         {
+            const auto &path_point = leg_data[leg_data_index];
             segment_duration += path_point.duration_until_turn;
 
             // all changes to this check have to be matched with assemble_geometry
             if (path_point.turn_instruction.type != extractor::guidance::TurnType::NoTurn)
             {
                 BOOST_ASSERT(segment_duration >= 0);
-                const auto name = facade.GetNameForID(path_point.name_id);
+                const auto name = facade.GetNameForID(step_name_id);
                 const auto distance = leg_geometry.segment_distances[segment_index];
-                steps.push_back(RouteStep{path_point.name_id, name, NO_ROTARY_NAME,
+                steps.push_back(RouteStep{step_name_id, name, NO_ROTARY_NAME,
                                           segment_duration / 10.0, distance, path_point.travel_mode,
                                           maneuver, leg_geometry.FrontIndex(segment_index),
                                           leg_geometry.BackIndex(segment_index) + 1});
+                if (leg_data_index + 1 < leg_data.size()){
+                    step_name_id = leg_data[leg_data_index + 1].name_id;
+                } else {
+                    step_name_id = target_node.name_id;
+                }
                 maneuver = detail::stepManeuverFromGeometry(path_point.turn_instruction,
                                                             leg_geometry, segment_index);
                 segment_index++;
@@ -98,7 +109,7 @@ std::vector<RouteStep> assembleSteps(const DataFacadeT &facade,
         const auto distance = leg_geometry.segment_distances[segment_index];
         const int duration = segment_duration + target_duration;
         BOOST_ASSERT(duration >= 0);
-        steps.push_back(RouteStep{target_node.name_id, facade.GetNameForID(target_node.name_id),
+        steps.push_back(RouteStep{step_name_id, facade.GetNameForID(step_name_id),
                                   NO_ROTARY_NAME, duration / 10., distance, target_mode, maneuver,
                                   leg_geometry.FrontIndex(segment_index),
                                   leg_geometry.BackIndex(segment_index) + 1});
@@ -132,7 +143,7 @@ std::vector<RouteStep> assembleSteps(const DataFacadeT &facade,
     BOOST_ASSERT(!leg_geometry.locations.empty());
     steps.push_back(RouteStep{target_node.name_id, facade.GetNameForID(target_node.name_id),
                               NO_ROTARY_NAME, ZERO_DURATION, ZERO_DISTANCE, target_mode,
-                              final_maneuver, leg_geometry.locations.size()-1,
+                              final_maneuver, leg_geometry.locations.size() - 1,
                               leg_geometry.locations.size()});
 
     return steps;

include/engine/guidance/post_processing.hpp

@@ -17,6 +17,13 @@ namespace guidance
 // passed as none-reference to modify in-place and move out again
 std::vector<RouteStep> postProcess(std::vector<RouteStep> steps);
 
+// Multiple possible reasons can result in unnecessary/confusing instructions
+// A prime example would be a segregated intersection. Turning around at this
+// intersection would result in two instructions to turn left.
+// Collapsing such turns into a single turn instruction, we give a clearer
+// set of instructionst that is not cluttered by unnecessary turns/name changes.
+std::vector<RouteStep> collapseTurns(std::vector<RouteStep> steps);
+
 // trim initial/final segment of very short length.
 // This function uses in/out parameter passing to modify both steps and geometry in place.
 // We use this method since both steps and geometry are closely coupled logically but
@@ -30,6 +37,9 @@ std::vector<RouteStep> assignRelativeLocations(std::vector<RouteStep> steps,
                                                const PhantomNode &source_node,
                                                const PhantomNode &target_node);
 
+//remove steps invalidated by post-processing
+std::vector<RouteStep> removeNoTurnInstructions(std::vector<RouteStep> steps);
+
 // postProcess will break the connection between the leg geometry
 // for which a segment is supposed to represent exactly the coordinates
 // between routing maneuvers and the route steps itself.

include/engine/guidance/route_step.hpp

@@ -34,6 +34,11 @@ struct RouteStep
     std::size_t geometry_begin;
     std::size_t geometry_end;
 };
+
+inline RouteStep getInvalidRouteStep()
+{
+    return {0, "", "", 0, 0, TRAVEL_MODE_INACCESSIBLE, getInvalidStepManeuver(), 0, 0};
+}
 }
 }
 }

include/engine/guidance/step_maneuver.hpp

@@ -1,8 +1,8 @@
 #ifndef ENGINE_GUIDANCE_STEP_MANEUVER_HPP
 #define ENGINE_GUIDANCE_STEP_MANEUVER_HPP
 
-#include "util/coordinate.hpp"
 #include "extractor/guidance/turn_instruction.hpp"
+#include "util/coordinate.hpp"
 
 #include <cstdint>
 #include <vector>
@@ -21,7 +21,7 @@ enum class WaypointType : std::uint8_t
     Depart,
 };
 
-//A represenetation of intermediate intersections
+// A represenetation of intermediate intersections
 struct IntermediateIntersection
 {
     double duration;
@@ -39,6 +39,18 @@ struct StepManeuver
     unsigned exit;
     std::vector<IntermediateIntersection> intersections;
 };
+
+inline StepManeuver getInvalidStepManeuver()
+{
+    return {util::Coordinate{util::FloatLongitude{0.0}, util::FloatLatitude{0.0}},
+            0,
+            0,
+            extractor::guidance::TurnInstruction::NO_TURN(),
+            WaypointType::None,
+            0,
+            {}};
+}
+
 } // namespace guidance
 } // namespace engine
 } // namespace osrmn

include/engine/guidance/toolkit.hpp

@@ -1,9 +1,11 @@
-#ifndef OSRM_UTIL_GUIDANCE_TOOLKIT_HPP_
-#define OSRM_UTIL_GUIDANCE_TOOLKIT_HPP_
+#ifndef OSRM_ENGINE_GUIDANCE_TOOLKIT_HPP_
+#define OSRM_ENGINE_GUIDANCE_TOOLKIT_HPP_
 
 #include "extractor/guidance/turn_instruction.hpp"
 #include "util/bearing.hpp"
 
+#include <algorithm>
+
 namespace osrm
 {
 namespace engine
@@ -23,9 +25,12 @@ inline bool entersRoundabout(const extractor::guidance::TurnInstruction instruct
 {
     return (instruction.type == extractor::guidance::TurnType::EnterRoundabout ||
             instruction.type == extractor::guidance::TurnType::EnterRotary ||
+            instruction.type == extractor::guidance::TurnType::EnterRoundaboutIntersection ||
             instruction.type == extractor::guidance::TurnType::EnterRoundaboutAtExit ||
             instruction.type == extractor::guidance::TurnType::EnterRotaryAtExit ||
+            instruction.type == extractor::guidance::TurnType::EnterRoundaboutIntersectionAtExit ||
             instruction.type == extractor::guidance::TurnType::EnterAndExitRoundabout ||
+            instruction.type == extractor::guidance::TurnType::EnterAndExitRotary ||
             instruction.type == extractor::guidance::TurnType::EnterAndExitRotary);
 }
 
@@ -33,8 +38,10 @@ inline bool leavesRoundabout(const extractor::guidance::TurnInstruction instruct
 {
     return (instruction.type == extractor::guidance::TurnType::ExitRoundabout ||
             instruction.type == extractor::guidance::TurnType::ExitRotary ||
+            instruction.type == extractor::guidance::TurnType::ExitRoundaboutIntersection ||
             instruction.type == extractor::guidance::TurnType::EnterAndExitRoundabout ||
-            instruction.type == extractor::guidance::TurnType::EnterAndExitRotary);
+            instruction.type == extractor::guidance::TurnType::EnterAndExitRotary ||
+            instruction.type == extractor::guidance::TurnType::EnterAndExitRoundaboutIntersection);
 }
 
 inline bool staysOnRoundabout(const extractor::guidance::TurnInstruction instruction)
@@ -56,8 +63,14 @@ inline extractor::guidance::DirectionModifier angleToDirectionModifier(const dou
     return extractor::guidance::DirectionModifier::Left;
 }
 
+inline double angularDeviation(const double angle, const double from)
+{
+    const double deviation = std::abs(angle - from);
+    return std::min(360 - deviation, deviation);
+}
+
 } // namespace guidance
 } // namespace engine
 } // namespace osrm
 
-#endif /* OSRM_UTIL_GUIDANCE_TOOLKIT_HPP_ */
+#endif /* OSRM_ENGINE_GUIDANCE_TOOLKIT_HPP_ */

include/engine/hint.hpp

@@ -63,18 +63,9 @@ struct Hint
     friend std::ostream &operator<<(std::ostream &, const Hint &);
 };
 
-#ifndef _MSC_VER
 static_assert(sizeof(Hint) == 60 + 4, "Hint is bigger than expected");
 constexpr std::size_t ENCODED_HINT_SIZE = 88;
-static_assert(ENCODED_HINT_SIZE / 4 * 3 >= sizeof(Hint),
-              "ENCODED_HINT_SIZE does not match size of Hint");
-#else
-// PhantomNode is bigger under windows because MSVC does not support bit packing
-static_assert(sizeof(Hint) == 72 + 4, "Hint is bigger than expected");
-constexpr std::size_t ENCODED_HINT_SIZE = 104;
-static_assert(ENCODED_HINT_SIZE / 4 * 3 >= sizeof(Hint),
-              "ENCODED_HINT_SIZE does not match size of Hint");
-#endif
+static_assert(ENCODED_HINT_SIZE / 4 * 3 >= sizeof(Hint), "ENCODED_HINT_SIZE does not match size of Hint");
 }
 }
 

include/engine/map_matching/bayes_classifier.hpp

@@ -23,7 +23,7 @@ struct NormalDistribution
     }
 
     // FIXME implement log-probability version since it's faster
-    double density_function(const double val) const
+    double Density(const double val) const
     {
         using namespace boost::math::constants;
 
@@ -44,7 +44,7 @@ struct LaplaceDistribution
     }
 
     // FIXME implement log-probability version since it's faster
-    double density_function(const double val) const
+    double Density(const double val) const
     {
         const double x = std::abs(val - location);
         return 1.0 / (2. * scale) * std::exp(-x / scale);
@@ -79,9 +79,9 @@ class BayesClassifier
     ClassificationT classify(const ValueT &v) const
     {
         const double positive_postpriori =
-            positive_apriori_probability * positive_distribution.density_function(v);
+            positive_apriori_probability * positive_distribution.Density(v);
         const double negative_postpriori =
-            negative_apriori_probability * negative_distribution.density_function(v);
+            negative_apriori_probability * negative_distribution.Density(v);
         const double norm = positive_postpriori + negative_postpriori;
 
         if (positive_postpriori > negative_postpriori)

include/engine/map_matching/hidden_markov_model.hpp

@@ -82,10 +82,10 @@ template <class CandidateLists> struct HiddenMarkovModel
             }
         }
 
-        clear(0);
+        Clear(0);
     }
 
-    void clear(std::size_t initial_timestamp)
+    void Clear(std::size_t initial_timestamp)
     {
         BOOST_ASSERT(viterbi.size() == parents.size() && parents.size() == path_distances.size() &&
                      path_distances.size() == pruned.size() && pruned.size() == breakage.size());

include/engine/phantom_node.hpp

@@ -149,13 +149,11 @@ struct PhantomNode
     unsigned reverse_packed_geometry_id;
     struct ComponentType
     {
-        uint32_t id : 31;
-        bool is_tiny : 1;
+        std::uint32_t id         : 31;
+        std::uint32_t is_tiny    : 1;
     } component;
-// bit-fields are broken on Windows
-#ifndef _MSC_VER
     static_assert(sizeof(ComponentType) == 4, "ComponentType needs to be 4 bytes big");
-#endif
+
     util::Coordinate location;
     util::Coordinate input_location;
     unsigned short fwd_segment_position;
@@ -165,11 +163,7 @@ struct PhantomNode
     extractor::TravelMode backward_travel_mode;
 };
 
-#ifndef _MSC_VER
 static_assert(sizeof(PhantomNode) == 60, "PhantomNode has more padding then expected");
-#else
-static_assert(sizeof(PhantomNode) == 72, "PhantomNode has more padding then expected");
-#endif
 
 using PhantomNodePair = std::pair<PhantomNode, PhantomNode>;
 

include/engine/plugins/trip.hpp

@@ -35,7 +35,6 @@ class TripPlugin final : public BasePlugin
     int max_locations_trip;
 
     InternalRouteResult ComputeRoute(const std::vector<PhantomNode> &phantom_node_list,
-                                     const api::TripParameters &parameters,
                                      const std::vector<NodeID> &trip);
 
   public:

include/engine/routing_algorithms/map_matching.hpp

@@ -206,7 +206,7 @@ class MapMatching final : public BasicRoutingInterface<DataFacadeT, MapMatching<
                 split_points.push_back(split_index);
 
                 // note: this preserves everything before split_index
-                model.clear(split_index);
+                model.Clear(split_index);
                 std::size_t new_start = model.initialize(split_index);
                 // no new start was found -> stop viterbi calculation
                 if (new_start == map_matching::INVALID_STATE)

include/engine/routing_algorithms/routing_base.hpp

@@ -301,8 +301,6 @@ template <class DataFacadeT, class Derived> class BasicRoutingInterface
                 auto total_weight = std::accumulate(weight_vector.begin(), weight_vector.end(), 0);
 
                 BOOST_ASSERT(weight_vector.size() == id_vector.size());
-                // ed.distance should be total_weight + penalties (turn, stop, etc)
-                BOOST_ASSERT(ed.distance >= total_weight);
                 const bool is_first_segment = unpacked_path.empty();
 
                 const std::size_t start_index =
@@ -350,7 +348,8 @@ template <class DataFacadeT, class Derived> class BasicRoutingInterface
                 start_index =
                     id_vector.size() - phantom_node_pair.source_phantom.fwd_segment_position - 1;
             }
-            end_index = id_vector.size() - phantom_node_pair.target_phantom.fwd_segment_position - 1;
+            end_index =
+                id_vector.size() - phantom_node_pair.target_phantom.fwd_segment_position - 1;
         }
         else
         {
@@ -373,8 +372,7 @@ template <class DataFacadeT, class Derived> class BasicRoutingInterface
         // t: fwd_segment 3
         // -> (U, v), (v, w), (w, x)
         // note that (x, t) is _not_ included but needs to be added later.
-        BOOST_ASSERT(start_index <= end_index);
-        for (std::size_t i = start_index; i != end_index; ++i)
+        for (std::size_t i = start_index; i != end_index; (start_index < end_index ? ++i : --i))
         {
             BOOST_ASSERT(i < id_vector.size());
             BOOST_ASSERT(phantom_node_pair.target_phantom.forward_travel_mode > 0);
@@ -397,8 +395,17 @@ template <class DataFacadeT, class Derived> class BasicRoutingInterface
             // However the first segment duration needs to be adjusted to the fact that the source
             // phantom is in the middle of the segment. We do this by subtracting v--s from the
             // duration.
-            BOOST_ASSERT(unpacked_path.front().duration_until_turn >= source_weight);
-            unpacked_path.front().duration_until_turn -= source_weight;
+
+            // Since it's possible duration_until_turn can be less than source_weight here if
+            // a negative enough turn penalty is used to modify this edge weight during
+            // osrm-contract, we clamp to 0 here so as not to return a negative duration
+            // for this segment.
+
+            // TODO this creates a scenario where it's possible the duration from a phantom
+            // node to the first turn would be the same as from end to end of a segment,
+            // which is obviously incorrect and not ideal...
+            unpacked_path.front().duration_until_turn =
+                std::max(unpacked_path.front().duration_until_turn - source_weight, 0);
         }
 
         // there is no equivalent to a node-based node in an edge-expanded graph.
@@ -559,9 +566,7 @@ template <class DataFacadeT, class Derived> class BasicRoutingInterface
         // make sure to correctly unpack loops
         if (distance != forward_heap.GetKey(middle) + reverse_heap.GetKey(middle))
         {
-            // self loop
-            BOOST_ASSERT(forward_heap.GetData(middle).parent == middle &&
-                         reverse_heap.GetData(middle).parent == middle);
+            // self loop makes up the full path
             packed_leg.push_back(middle);
             packed_leg.push_back(middle);
         }
@@ -774,18 +779,50 @@ template <class DataFacadeT, class Derived> class BasicRoutingInterface
         nodes.target_phantom = target_phantom;
         UnpackPath(packed_path.begin(), packed_path.end(), nodes, unpacked_path);
 
-        util::Coordinate previous_coordinate = source_phantom.location;
-        util::Coordinate current_coordinate;
+        using util::coordinate_calculation::detail::DEGREE_TO_RAD;
+        using util::coordinate_calculation::detail::EARTH_RADIUS;
+
         double distance = 0;
+        double prev_lat =
+            static_cast<double>(toFloating(source_phantom.location.lat)) * DEGREE_TO_RAD;
+        double prev_lon =
+            static_cast<double>(toFloating(source_phantom.location.lon)) * DEGREE_TO_RAD;
+        double prev_cos = std::cos(prev_lat);
         for (const auto &p : unpacked_path)
         {
-            current_coordinate = facade->GetCoordinateOfNode(p.turn_via_node);
-            distance += util::coordinate_calculation::haversineDistance(previous_coordinate,
-                                                                        current_coordinate);
-            previous_coordinate = current_coordinate;
+            const auto current_coordinate = facade->GetCoordinateOfNode(p.turn_via_node);
+
+            const double current_lat =
+                static_cast<double>(toFloating(current_coordinate.lat)) * DEGREE_TO_RAD;
+            const double current_lon =
+                static_cast<double>(toFloating(current_coordinate.lon)) * DEGREE_TO_RAD;
+            const double current_cos = std::cos(current_lat);
+
+            const double sin_dlon = std::sin((prev_lon - current_lon) / 2.0);
+            const double sin_dlat = std::sin((prev_lat - current_lat) / 2.0);
+
+            const double aharv = sin_dlat * sin_dlat + prev_cos * current_cos * sin_dlon * sin_dlon;
+            const double charv = 2. * std::atan2(std::sqrt(aharv), std::sqrt(1.0 - aharv));
+            distance += EARTH_RADIUS * charv;
+
+            prev_lat = current_lat;
+            prev_lon = current_lon;
+            prev_cos = current_cos;
         }
-        distance += util::coordinate_calculation::haversineDistance(previous_coordinate,
-                                                                    target_phantom.location);
+
+        const double current_lat =
+            static_cast<double>(toFloating(target_phantom.location.lat)) * DEGREE_TO_RAD;
+        const double current_lon =
+            static_cast<double>(toFloating(target_phantom.location.lon)) * DEGREE_TO_RAD;
+        const double current_cos = std::cos(current_lat);
+
+        const double sin_dlon = std::sin((prev_lon - current_lon) / 2.0);
+        const double sin_dlat = std::sin((prev_lat - current_lat) / 2.0);
+
+        const double aharv = sin_dlat * sin_dlat + prev_cos * current_cos * sin_dlon * sin_dlon;
+        const double charv = 2. * std::atan2(std::sqrt(aharv), std::sqrt(1.0 - aharv));
+        distance += EARTH_RADIUS * charv;
+
         return distance;
     }
 

include/engine/routing_algorithms/shortest_path.hpp

@@ -57,15 +57,13 @@ class ShortestPathRouting final
         if (search_from_forward_node)
         {
             forward_heap.Insert(source_phantom.forward_segment_id.id,
-                                total_distance_to_forward -
-                                    source_phantom.GetForwardWeightPlusOffset(),
+                                    -source_phantom.GetForwardWeightPlusOffset(),
                                 source_phantom.forward_segment_id.id);
         }
         if (search_from_reverse_node)
         {
             forward_heap.Insert(source_phantom.reverse_segment_id.id,
-                                total_distance_to_reverse -
-                                    source_phantom.GetReverseWeightPlusOffset(),
+                                    -source_phantom.GetReverseWeightPlusOffset(),
                                 source_phantom.reverse_segment_id.id);
         }
         if (search_to_forward_node)
@@ -107,6 +105,7 @@ class ShortestPathRouting final
             super::Search(forward_heap, reverse_heap, new_total_distance, leg_packed_path,
                           needs_loop_forwad, needs_loop_backwards);
         }
+        new_total_distance += std::min(total_distance_to_forward,total_distance_to_reverse);
     }
 
     // searches shortest path between:

include/engine/trip/trip_tabu_search.hpp

@@ -1,41 +0,0 @@
-#ifndef TRIP_BRUTE_FORCE_HPP
-#define TRIP_BRUTE_FORCE_HPP
-
-#include "engine/search_engine.hpp"
-#include "util/simple_logger.hpp"
-
-#include "osrm/json_container.hpp"
-
-#include <cstdlib>
-#include <algorithm>
-#include <string>
-#include <vector>
-#include <limits>
-
-namespace osrm
-{
-namespace engine
-{
-namespace trip
-{
-
-// todo: yet to be implemented
-void TabuSearchTrip(std::vector<unsigned> &location,
-                    const PhantomNodeArray &phantom_node_vector,
-                    const std::vector<EdgeWeight> &dist_table,
-                    InternalRouteResult &min_route,
-                    std::vector<int> &min_loc_permutation)
-{
-}
-
-void TabuSearchTrip(const PhantomNodeArray &phantom_node_vector,
-                    const std::vector<EdgeWeight> &dist_table,
-                    InternalRouteResult &min_route,
-                    std::vector<int> &min_loc_permutation)
-{
-}
-}
-}
-}
-
-#endif // TRIP_BRUTE_FORCE_HPP

include/extractor/compressed_edge_container.hpp

@@ -40,7 +40,9 @@ class CompressedEdgeContainer
     void SerializeInternalVector(const std::string &path) const;
     unsigned GetPositionForID(const EdgeID edge_id) const;
     const EdgeBucket &GetBucketReference(const EdgeID edge_id) const;
+    bool IsTrivial(const EdgeID edge_id) const;
     NodeID GetFirstEdgeTargetID(const EdgeID edge_id) const;
+    NodeID GetLastEdgeTargetID(const EdgeID edge_id) const;
     NodeID GetLastEdgeSourceID(const EdgeID edge_id) const;
 
   private:

include/extractor/guidance/constants.hpp

@@ -16,12 +16,13 @@ const double constexpr STRAIGHT_ANGLE = 180.;
 const double constexpr MAXIMAL_ALLOWED_NO_TURN_DEVIATION = 3.;
 // angle that lies between two nearly indistinguishable roads
 const double constexpr NARROW_TURN_ANGLE = 40.;
-const double constexpr GROUP_ANGLE = 90;
+const double constexpr GROUP_ANGLE = 60;
 // angle difference that can be classified as straight, if its the only narrow turn
-const double constexpr FUZZY_ANGLE_DIFFERENCE = 15.;
+const double constexpr FUZZY_ANGLE_DIFFERENCE = 20.;
 const double constexpr DISTINCTION_RATIO = 2;
 const unsigned constexpr INVALID_NAME_ID = 0;
 
+const double constexpr MAX_ROUNDABOUT_INTERSECTION_RADIUS =  5;
 const double constexpr MAX_ROUNDABOUT_RADIUS = 15; // 30 m diameter as final distinction
 const double constexpr INCREASES_BY_FOURTY_PERCENT = 1.4;
 

include/extractor/guidance/intersection_handler.hpp

@@ -3,6 +3,7 @@
 
 #include "extractor/guidance/intersection.hpp"
 #include "extractor/query_node.hpp"
+#include "extractor/suffix_table.hpp"
 
 #include "util/name_table.hpp"
 #include "util/node_based_graph.hpp"
@@ -26,7 +27,8 @@ class IntersectionHandler
   public:
     IntersectionHandler(const util::NodeBasedDynamicGraph &node_based_graph,
                         const std::vector<QueryNode> &node_info_list,
-                        const util::NameTable &name_table);
+                        const util::NameTable &name_table,
+                        const SuffixTable &street_name_suffix_table);
     virtual ~IntersectionHandler();
 
     // check whether the handler can actually handle the intersection
@@ -41,6 +43,7 @@ class IntersectionHandler
     const util::NodeBasedDynamicGraph &node_based_graph;
     const std::vector<QueryNode> &node_info_list;
     const util::NameTable &name_table;
+    const SuffixTable &street_name_suffix_table;
 
     // counts the number on allowed entry roads
     std::size_t countValid(const Intersection &intersection) const;
@@ -61,6 +64,12 @@ class IntersectionHandler
                     ConnectedRoad &center,
                     ConnectedRoad &right) const;
 
+    // Trivial Turns use findBasicTurnType and getTurnDirection as only criteria
+    void assignTrivialTurns(const EdgeID via_eid,
+                            Intersection &intersection,
+                            const std::size_t begin,
+                            const std::size_t end) const;
+
     bool isThroughStreet(const std::size_t index, const Intersection &intersection) const;
 };
 

include/extractor/guidance/intersection_scenario_three_way.hpp

@@ -0,0 +1,27 @@
+#ifndef OSRM_EXTRACTOR_GUIDANCE_INTERSECTION_SCENARIO_THREE_WAY_HPP_
+#define OSRM_EXTRACTOR_GUIDANCE_INTERSECTION_SCENARIO_THREE_WAY_HPP_
+
+#include "extractor/guidance/intersection.hpp"
+
+namespace osrm
+{
+namespace extractor
+{
+namespace guidance
+{
+
+// possible fork
+bool isFork(const ConnectedRoad &uturn,
+            const ConnectedRoad &possible_right_fork,
+            const ConnectedRoad &possible_left_fork);
+
+// Ending in a T-Intersection
+bool isEndOfRoad(const ConnectedRoad &uturn,
+                 const ConnectedRoad &possible_right_turn,
+                 const ConnectedRoad &possible_left_turn);
+
+} // namespace guidance
+} // namespace extractor
+} // namespace osrm
+
+#endif /*OSRM_EXTRACTOR_GUIDANCE_INTERSECTION_SCENARIO_THREE_WAY_HPP_*/

include/extractor/guidance/motorway_handler.hpp

@@ -1,8 +1,8 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_MOTORWAY_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_MOTORWAY_HANDLER_HPP_
 
-#include "extractor/guidance/intersection_handler.hpp"
 #include "extractor/guidance/intersection.hpp"
+#include "extractor/guidance/intersection_handler.hpp"
 #include "extractor/query_node.hpp"
 
 #include "util/name_table.hpp"
@@ -24,7 +24,8 @@ class MotorwayHandler : public IntersectionHandler
   public:
     MotorwayHandler(const util::NodeBasedDynamicGraph &node_based_graph,
                     const std::vector<QueryNode> &node_info_list,
-                    const util::NameTable &name_table);
+                    const util::NameTable &name_table,
+                    const SuffixTable &street_name_suffix_table);
     ~MotorwayHandler() override final;
 
     // check whether the handler can actually handle the intersection

include/extractor/guidance/roundabout_handler.hpp

@@ -1,14 +1,17 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_ROUNDABOUT_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_ROUNDABOUT_HANDLER_HPP_
 
+#include "extractor/compressed_edge_container.hpp"
 #include "extractor/guidance/intersection.hpp"
 #include "extractor/guidance/intersection_handler.hpp"
+#include "extractor/guidance/roundabout_type.hpp"
 #include "extractor/query_node.hpp"
 
 #include "util/name_table.hpp"
 #include "util/node_based_graph.hpp"
 #include "util/typedefs.hpp"
 
+#include <set>
 #include <utility>
 #include <vector>
 
@@ -37,31 +40,47 @@ class RoundaboutHandler : public IntersectionHandler
   public:
     RoundaboutHandler(const util::NodeBasedDynamicGraph &node_based_graph,
                       const std::vector<QueryNode> &node_info_list,
-                      const util::NameTable &name_table);
+                      const CompressedEdgeContainer &compressed_edge_container,
+                      const util::NameTable &name_table,
+                      const SuffixTable &street_name_suffix_table);
 
     ~RoundaboutHandler() override final;
 
     // check whether the handler can actually handle the intersection
-    bool canProcess(const NodeID from_nid, const EdgeID via_eid, const Intersection &intersection) const override final;
+    bool canProcess(const NodeID from_nid,
+                    const EdgeID via_eid,
+                    const Intersection &intersection) const override final;
 
     // process the intersection
-    Intersection operator()(const NodeID from_nid, const EdgeID via_eid, Intersection intersection) const override final;
+    Intersection operator()(const NodeID from_nid,
+                            const EdgeID via_eid,
+                            Intersection intersection) const override final;
 
   private:
-    detail::RoundaboutFlags getRoundaboutFlags(const NodeID from_nid, const EdgeID via_eid, const Intersection &intersection) const;
+    detail::RoundaboutFlags getRoundaboutFlags(const NodeID from_nid,
+                                               const EdgeID via_eid,
+                                               const Intersection &intersection) const;
+
+    void invalidateExitAgainstDirection(const NodeID from_nid,
+                                        const EdgeID via_eid,
+                                        Intersection &intersection) const;
 
     // decide whether we lookk at a roundabout or a rotary
-    bool isRotary(const NodeID nid) const;
+    RoundaboutType getRoundaboutType(const NodeID nid) const;
 
     // TODO handle bike/walk cases that allow crossing a roundabout!
     // Processing of roundabouts
     // Produces instructions to enter/exit a roundabout or to stay on it.
     // Performs the distinction between roundabout and rotaries.
-    Intersection handleRoundabouts(const bool is_rotary,
+    Intersection handleRoundabouts(const RoundaboutType roundabout_type,
                                    const EdgeID via_edge,
                                    const bool on_roundabout,
                                    const bool can_exit_roundabout,
                                    Intersection intersection) const;
+
+    bool qualifiesAsRoundaboutIntersection(const std::set<NodeID> &roundabout_nodes) const;
+
+    const CompressedEdgeContainer &compressed_edge_container;
 };
 
 } // namespace guidance

include/extractor/guidance/roundabout_type.hpp

@@ -0,0 +1,21 @@
+#ifndef OSRM_EXTRACTOR_GUIDANCE_ROUNDABOUT_TYPES_HPP_
+#define OSRM_EXTRACTOR_GUIDANCE_ROUNDABOUT_TYPES_HPP_
+
+namespace osrm
+{
+namespace extractor
+{
+namespace guidance
+{
+enum class RoundaboutType
+{
+    None,                   // not a roundabout
+    Roundabout,             // standard roundabout
+    Rotary,                 // traffic circle (large roundabout) with dedicated name
+    RoundaboutIntersection  // small roundabout with distinct turns, handled as intersection
+};
+} /* namespace guidance */
+} /* namespace extractor */
+} /* namespace osrm */
+
+#endif /* OSRM_EXTRACTOR_GUIDANCE_ROUNDABOUT_TYPES_HPP_ */

include/extractor/guidance/toolkit.hpp

@@ -4,12 +4,15 @@
 #include "util/bearing.hpp"
 #include "util/coordinate.hpp"
 #include "util/coordinate_calculation.hpp"
+#include "util/guidance/toolkit.hpp"
 
 #include "extractor/compressed_edge_container.hpp"
 #include "extractor/query_node.hpp"
+#include "extractor/suffix_table.hpp"
 
 #include "extractor/guidance/classification_data.hpp"
 #include "extractor/guidance/discrete_angle.hpp"
+#include "extractor/guidance/intersection.hpp"
 #include "extractor/guidance/turn_instruction.hpp"
 
 #include <algorithm>
@@ -17,6 +20,10 @@
 #include <cstdint>
 #include <map>
 #include <string>
+#include <utility>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/predicate.hpp>
 
 namespace osrm
 {
@@ -25,6 +32,8 @@ namespace extractor
 namespace guidance
 {
 
+using util::guidance::angularDeviation;
+
 namespace detail
 {
 const constexpr double DESIRED_SEGMENT_LENGTH = 10.0;
@@ -94,7 +103,7 @@ getCoordinateFromCompressedRange(util::Coordinate current_coordinate,
 }
 } // namespace detail
 
-// Finds a (potentially inteprolated) coordinate that is DESIRED_SEGMENT_LENGTH away
+// Finds a (potentially interpolated) coordinate that is DESIRED_SEGMENT_LENGTH away
 // from the start of an edge
 inline util::Coordinate
 getRepresentativeCoordinate(const NodeID from_node,
@@ -245,12 +254,6 @@ inline double angleFromDiscreteAngle(const DiscreteAngle angle)
     return static_cast<double>(angle) * detail::discrete_angle_step_size;
 }
 
-inline double angularDeviation(const double angle, const double from)
-{
-    const double deviation = std::abs(angle - from);
-    return std::min(360 - deviation, deviation);
-}
-
 inline double getAngularPenalty(const double angle, DirectionModifier modifier)
 {
     // these are not aligned with getTurnDirection but represent an ideal center
@@ -271,30 +274,6 @@ inline double getTurnConfidence(const double angle, TurnInstruction instruction)
     return 1.0 - (difference / max_deviation) * (difference / max_deviation);
 }
 
-// Translates between angles and their human-friendly directional representation
-inline DirectionModifier getTurnDirection(const double angle)
-{
-    // An angle of zero is a u-turn
-    // 180 goes perfectly straight
-    // 0-180 are right turns
-    // 180-360 are left turns
-    if (angle > 0 && angle < 60)
-        return DirectionModifier::SharpRight;
-    if (angle >= 60 && angle < 140)
-        return DirectionModifier::Right;
-    if (angle >= 140 && angle < 170)
-        return DirectionModifier::SlightRight;
-    if (angle >= 165 && angle <= 195)
-        return DirectionModifier::Straight;
-    if (angle > 190 && angle <= 220)
-        return DirectionModifier::SlightLeft;
-    if (angle > 220 && angle <= 300)
-        return DirectionModifier::Left;
-    if (angle > 300 && angle < 360)
-        return DirectionModifier::SharpLeft;
-    return DirectionModifier::UTurn;
-}
-
 // swaps left <-> right modifier types
 inline DirectionModifier mirrorDirectionModifier(const DirectionModifier modifier)
 {
@@ -329,8 +308,27 @@ inline bool isDistinct(const DirectionModifier first, const DirectionModifier se
     return true;
 }
 
-inline bool requiresNameAnnounced(const std::string &from, const std::string &to)
+inline std::pair<std::string, std::string> getPrefixAndSuffix(const std::string &data)
 {
+    const auto suffix_pos = data.find_last_of(' ');
+    if (suffix_pos == std::string::npos)
+        return {};
+
+    const auto prefix_pos = data.find_first_of(' ');
+    auto result = std::make_pair(data.substr(0, prefix_pos), data.substr(suffix_pos + 1));
+    boost::to_lower(result.first);
+    boost::to_lower(result.second);
+    return result;
+}
+
+inline bool requiresNameAnnounced(const std::string &from,
+                                  const std::string &to,
+                                  const SuffixTable &suffix_table)
+{
+    //first is empty and the second is not
+    if(from.empty() && !to.empty())
+        return true;
+
     // FIXME, handle in profile to begin with?
     // this uses the encoding of references in the profile, which is very BAD
     // Input for this function should be a struct separating streetname, suffix (e.g. road,
@@ -361,7 +359,43 @@ inline bool requiresNameAnnounced(const std::string &from, const std::string &to
 
     // check similarity of names
     const auto names_are_empty = from_name.empty() && to_name.empty();
-    const auto names_are_equal = from_name == to_name;
+    const auto name_is_contained =
+        boost::starts_with(from_name, to_name) || boost::starts_with(to_name, from_name);
+
+    const auto checkForPrefixOrSuffixChange =
+        [](const std::string &first, const std::string &second, const SuffixTable &suffix_table) {
+
+            const auto first_prefix_and_suffixes = getPrefixAndSuffix(first);
+            const auto second_prefix_and_suffixes = getPrefixAndSuffix(second);
+            // reverse strings, get suffices and reverse them to get prefixes
+            const auto checkTable = [&](const std::string str) {
+                return str.empty() || suffix_table.isSuffix(str);
+            };
+
+            const bool is_prefix_change = [&]() -> bool {
+                if (!checkTable(first_prefix_and_suffixes.first))
+                    return false;
+                if (!checkTable(first_prefix_and_suffixes.first))
+                    return false;
+                return !first.compare(first_prefix_and_suffixes.first.length(), std::string::npos,
+                                     second, second_prefix_and_suffixes.first.length(),
+                                     std::string::npos);
+            }();
+
+            const bool is_suffix_change = [&]() -> bool {
+                if (!checkTable(first_prefix_and_suffixes.second))
+                    return false;
+                if (!checkTable(first_prefix_and_suffixes.second))
+                    return false;
+                return !first.compare(0, first.length() - first_prefix_and_suffixes.second.length(),
+                                     second, 0, second.length() - second_prefix_and_suffixes.second.length());
+            }();
+
+            return is_prefix_change || is_suffix_change;
+        };
+
+    const auto is_suffix_change = checkForPrefixOrSuffixChange(from_name, to_name, suffix_table);
+    const auto names_are_equal = from_name == to_name || name_is_contained || is_suffix_change;
     const auto name_is_removed = !from_name.empty() && to_name.empty();
     // references are contained in one another
     const auto refs_are_empty = from_ref.empty() && to_ref.empty();
@@ -370,9 +404,10 @@ inline bool requiresNameAnnounced(const std::string &from, const std::string &to
         (from_ref.find(to_ref) != std::string::npos || to_ref.find(from_ref) != std::string::npos);
     const auto ref_is_removed = !from_ref.empty() && to_ref.empty();
 
-    const auto obvious_change =
-        (names_are_empty && refs_are_empty) || (names_are_equal && ref_is_contained) ||
-        (names_are_equal && refs_are_empty) || name_is_removed || ref_is_removed;
+    const auto obvious_change = (names_are_empty && refs_are_empty) ||
+                                (names_are_equal && ref_is_contained) ||
+                                (names_are_equal && refs_are_empty) || name_is_removed ||
+                                ref_is_removed || is_suffix_change;
 
     return !obvious_change;
 }
@@ -397,6 +432,25 @@ inline bool canBeSeenAsFork(const FunctionalRoadClass first, const FunctionalRoa
     return std::abs(getPriority(first) - getPriority(second)) <= 1;
 }
 
+// To simplify handling of Left/Right hand turns, we can mirror turns and write an intersection
+// handler only for one side. The mirror function turns a left-hand turn in a equivalent right-hand
+// turn and vice versa.
+inline ConnectedRoad mirror(ConnectedRoad road)
+{
+    const constexpr DirectionModifier mirrored_modifiers[] = {
+        DirectionModifier::UTurn,      DirectionModifier::SharpLeft, DirectionModifier::Left,
+        DirectionModifier::SlightLeft, DirectionModifier::Straight,  DirectionModifier::SlightRight,
+        DirectionModifier::Right,      DirectionModifier::SharpRight};
+
+    if (angularDeviation(road.turn.angle, 0) > std::numeric_limits<double>::epsilon())
+    {
+        road.turn.angle = 360 - road.turn.angle;
+        road.turn.instruction.direction_modifier =
+            mirrored_modifiers[road.turn.instruction.direction_modifier];
+    }
+    return road;
+}
+
 } // namespace guidance
 } // namespace extractor
 } // namespace osrm

include/extractor/guidance/turn_analysis.hpp

@@ -4,13 +4,14 @@
 #include "extractor/compressed_edge_container.hpp"
 #include "extractor/guidance/intersection.hpp"
 #include "extractor/guidance/intersection_generator.hpp"
+#include "extractor/guidance/motorway_handler.hpp"
+#include "extractor/guidance/roundabout_handler.hpp"
 #include "extractor/guidance/toolkit.hpp"
 #include "extractor/guidance/turn_classification.hpp"
-#include "extractor/guidance/roundabout_handler.hpp"
-#include "extractor/guidance/motorway_handler.hpp"
 #include "extractor/guidance/turn_handler.hpp"
 #include "extractor/query_node.hpp"
 #include "extractor/restriction_map.hpp"
+#include "extractor/suffix_table.hpp"
 
 #include "util/name_table.hpp"
 #include "util/node_based_graph.hpp"
@@ -39,7 +40,8 @@ class TurnAnalysis
                  const RestrictionMap &restriction_map,
                  const std::unordered_set<NodeID> &barrier_nodes,
                  const CompressedEdgeContainer &compressed_edge_container,
-                 const util::NameTable &name_table);
+                 const util::NameTable &name_table,
+                 const SuffixTable &street_name_suffix_table);
 
     // the entry into the turn analysis
     std::vector<TurnOperation> getTurns(const NodeID from_node, const EdgeID via_eid) const;

include/extractor/guidance/turn_classification.hpp

@@ -3,9 +3,9 @@
 
 #include "extractor/guidance/toolkit.hpp"
 
-#include "util/typedefs.hpp"
 #include "util/coordinate.hpp"
 #include "util/node_based_graph.hpp"
+#include "util/typedefs.hpp"
 
 #include "extractor/compressed_edge_container.hpp"
 #include "extractor/query_node.hpp"
@@ -84,8 +84,7 @@ classifyIntersection(NodeID nid,
     }
 
     std::sort(turns.begin(), turns.end(),
-              [](const TurnPossibility left, const TurnPossibility right)
-              {
+              [](const TurnPossibility left, const TurnPossibility right) {
                   return left.angle < right.angle;
               });
 

include/extractor/guidance/turn_handler.hpp

@@ -1,16 +1,16 @@
 #ifndef OSRM_EXTRACTOR_GUIDANCE_TURN_HANDLER_HPP_
 #define OSRM_EXTRACTOR_GUIDANCE_TURN_HANDLER_HPP_
 
-#include "extractor/guidance/intersection_handler.hpp"
 #include "extractor/guidance/intersection.hpp"
+#include "extractor/guidance/intersection_handler.hpp"
 #include "extractor/query_node.hpp"
 
 #include "util/name_table.hpp"
 #include "util/node_based_graph.hpp"
 
 #include <cstddef>
-#include <vector>
 #include <utility>
+#include <vector>
 
 namespace osrm
 {
@@ -26,7 +26,8 @@ class TurnHandler : public IntersectionHandler
   public:
     TurnHandler(const util::NodeBasedDynamicGraph &node_based_graph,
                 const std::vector<QueryNode> &node_info_list,
-                const util::NameTable &name_table);
+                const util::NameTable &name_table,
+                const SuffixTable &street_name_suffix_table);
     ~TurnHandler() override final;
 
     // check whether the handler can actually handle the intersection

include/extractor/guidance/turn_instruction.hpp

@@ -5,6 +5,8 @@
 
 #include <boost/assert.hpp>
 
+#include "extractor/guidance/roundabout_type.hpp"
+
 namespace osrm
 {
 namespace extractor
@@ -36,35 +38,31 @@ enum DirectionModifier
 // enum class TurnType : unsigned char
 enum TurnType // at the moment we can support 32 turn types, without increasing memory consumption
 {
-    Invalid,                // no valid turn instruction
-    NoTurn,                 // end of segment without turn/middle of a segment
-    Suppressed,             // location that suppresses a turn
-    NewName,                // no turn, but name changes
-    Continue,               // remain on a street
-    Turn,                   // basic turn
-    FirstTurn,              // First of x turns
-    SecondTurn,             // Second of x turns
-    ThirdTurn,              // Third of x turns
-    FourthTurn,             // Fourth of x turns
-    Merge,                  // merge onto a street
-    Ramp,                   // special turn (highway ramp exits)
-    FirstRamp,              // first turn onto a ramp
-    SecondRamp,             // second turn onto a ramp
-    ThirdRamp,              // third turn onto a ramp
-    FourthRamp,             // fourth turn onto a ramp
-    Fork,                   // fork road splitting up
-    EndOfRoad,              // T intersection
-    EnterRoundabout,        // Entering a small Roundabout
-    EnterRoundaboutAtExit,  // Entering a small Roundabout at a countable exit
-    EnterAndExitRoundabout, // Touching a roundabout
-    ExitRoundabout,         // Exiting a small Roundabout
-    EnterRotary,            // Enter a rotary
-    EnterRotaryAtExit,      // Enter A Rotary at a countable exit
-    EnterAndExitRotary,     // Touching a rotary
-    ExitRotary,             // Exit a rotary
-    StayOnRoundabout,       // Continue on Either a small or a large Roundabout
-    Restriction,            // Cross a Barrier, requires barrier penalties instead of full block
-    Notification            // Travel Mode Changes`
+    Invalid,                            // no valid turn instruction
+    NewName,                            // no turn, but name changes
+    Continue,                           // remain on a street
+    Turn,                               // basic turn
+    Merge,                              // merge onto a street
+    OnRamp,                             // special turn (highway ramp on-ramps)
+    OffRamp,                            // special turn, highway exit
+    Fork,                               // fork road splitting up
+    EndOfRoad,                          // T intersection
+    Notification,                       // Travel Mode Changes, Restrictions apply...
+    EnterRoundabout,                    // Entering a small Roundabout
+    EnterAndExitRoundabout,             // Touching a roundabout
+    EnterRotary,                        // Enter a rotary
+    EnterAndExitRotary,                 // Touching a rotary
+    EnterRoundaboutIntersection,        // Entering a small Roundabout
+    EnterAndExitRoundaboutIntersection, // Touching a roundabout
+    NoTurn,                             // end of segment without turn/middle of a segment
+    Suppressed,                         // location that suppresses a turn
+    EnterRoundaboutAtExit,              // Entering a small Roundabout at a countable exit
+    ExitRoundabout,                     // Exiting a small Roundabout
+    EnterRotaryAtExit,                  // Enter A Rotary at a countable exit
+    ExitRotary,                         // Exit a rotary
+    EnterRoundaboutIntersectionAtExit,  // Entering a small Roundabout at a countable exit
+    ExitRoundaboutIntersection,         // Exiting a small Roundabout
+    StayOnRoundabout                    // Continue on Either a small or a large Roundabout
 };
 
 // turn angle in 1.40625 degree -> 128 == 180 degree
@@ -89,27 +87,45 @@ struct TurnInstruction
         return TurnInstruction(TurnType::NoTurn, DirectionModifier::UTurn);
     }
 
-    static TurnInstruction REMAIN_ROUNDABOUT(bool is_rotary, const DirectionModifier modifier)
+    static TurnInstruction REMAIN_ROUNDABOUT(const RoundaboutType, const DirectionModifier modifier)
     {
-        (void)is_rotary; // staying does not require a different instruction at the moment
         return TurnInstruction(TurnType::StayOnRoundabout, modifier);
     }
 
-    static TurnInstruction ENTER_ROUNDABOUT(bool is_rotary, const DirectionModifier modifier)
+    static TurnInstruction ENTER_ROUNDABOUT(const RoundaboutType roundabout_type,
+                                            const DirectionModifier modifier)
     {
-        return {is_rotary ? TurnType::EnterRotary : TurnType::EnterRoundabout, modifier};
+        const constexpr TurnType enter_instruction[] = {
+            TurnType::Invalid, TurnType::EnterRoundabout, TurnType::EnterRotary,
+            TurnType::EnterRoundaboutIntersection};
+        return {enter_instruction[static_cast<int>(roundabout_type)], modifier};
     }
 
-    static TurnInstruction EXIT_ROUNDABOUT(bool is_rotary, const DirectionModifier modifier)
+    static TurnInstruction EXIT_ROUNDABOUT(const RoundaboutType roundabout_type,
+                                           const DirectionModifier modifier)
     {
-        return {is_rotary ? TurnType::ExitRotary : TurnType::ExitRoundabout, modifier};
+        const constexpr TurnType exit_instruction[] = {TurnType::Invalid, TurnType::ExitRoundabout,
+                                                       TurnType::ExitRotary,
+                                                       TurnType::ExitRoundaboutIntersection};
+        return {exit_instruction[static_cast<int>(roundabout_type)], modifier};
     }
 
-    static TurnInstruction ENTER_AND_EXIT_ROUNDABOUT(bool is_rotary,
+    static TurnInstruction ENTER_AND_EXIT_ROUNDABOUT(const RoundaboutType roundabout_type,
                                                      const DirectionModifier modifier)
     {
-        return {is_rotary ? TurnType::EnterAndExitRotary : TurnType::EnterAndExitRoundabout,
-                modifier};
+        const constexpr TurnType exit_instruction[] = {
+            TurnType::Invalid, TurnType::EnterAndExitRoundabout, TurnType::EnterAndExitRotary,
+            TurnType::EnterAndExitRoundaboutIntersection};
+        return {exit_instruction[static_cast<int>(roundabout_type)], modifier};
+    }
+
+    static TurnInstruction ENTER_ROUNDABOUT_AT_EXIT(const RoundaboutType roundabout_type,
+                                                    const DirectionModifier modifier)
+    {
+        const constexpr TurnType enter_instruction[] = {
+            TurnType::Invalid, TurnType::EnterRoundaboutAtExit, TurnType::EnterRotaryAtExit,
+            TurnType::EnterRoundaboutIntersectionAtExit};
+        return {enter_instruction[static_cast<int>(roundabout_type)], modifier};
     }
 
     static TurnInstruction SUPPRESSED(const DirectionModifier modifier)

include/extractor/raster_source.hpp

@@ -104,7 +104,7 @@ class RasterSource
     const float xstep;
     const float ystep;
 
-    float calcSize(int min, int max, std::size_t count) const;
+    float CalcSize(int min, int max, std::size_t count) const;
 
   public:
     RasterGrid raster_data;
@@ -116,9 +116,9 @@ class RasterSource
     const int ymin;
     const int ymax;
 
-    RasterDatum getRasterData(const int lon, const int lat) const;
+    RasterDatum GetRasterData(const int lon, const int lat) const;
 
-    RasterDatum getRasterInterpolate(const int lon, const int lat) const;
+    RasterDatum GetRasterInterpolate(const int lon, const int lat) const;
 
     RasterSource(RasterGrid _raster_data,
                  std::size_t width,
@@ -134,7 +134,7 @@ class SourceContainer
   public:
     SourceContainer() = default;
 
-    int loadRasterSource(const std::string &path_string,
+    int LoadRasterSource(const std::string &path_string,
                          double xmin,
                          double xmax,
                          double ymin,
@@ -142,9 +142,9 @@ class SourceContainer
                          std::size_t nrows,
                          std::size_t ncols);
 
-    RasterDatum getRasterDataFromSource(unsigned int source_id, double lon, double lat);
+    RasterDatum GetRasterDataFromSource(unsigned int source_id, double lon, double lat);
 
-    RasterDatum getRasterInterpolateFromSource(unsigned int source_id, double lon, double lat);
+    RasterDatum GetRasterInterpolateFromSource(unsigned int source_id, double lon, double lat);
 
   private:
     std::vector<RasterSource> LoadedSources;

include/extractor/suffix_table.hpp

@@ -0,0 +1,30 @@
+#ifndef OSRM_EXTRACTOR_SUFFIX_LIST_HPP_
+#define OSRM_EXTRACTOR_SUFFIX_LIST_HPP_
+
+#include <string>
+#include <unordered_set>
+
+struct lua_State;
+
+namespace osrm
+{
+namespace extractor
+{
+// A table containing suffixes.
+// At the moment, it is only a front for an unordered set. At some point we might want to make it
+// country dependent and have it behave accordingly
+class SuffixTable final
+{
+  public:
+    SuffixTable(lua_State *lua_state);
+
+    // check whether a string is part of the know suffix list
+    bool isSuffix(const std::string &possible_suffix) const;
+
+  private:
+    std::unordered_set<std::string> suffix_set;
+};
+} /* namespace extractor */
+} /* namespace osrm */
+
+#endif /* OSRM_EXTRACTOR_SUFFIX_LIST_HPP_ */

include/extractor/tarjan_scc.hpp

@@ -57,7 +57,7 @@ template <typename GraphT> class TarjanSCC
         BOOST_ASSERT(m_graph->GetNumberOfNodes() > 0);
     }
 
-    void run()
+    void Run()
     {
         TIMER_START(SCC_RUN);
         const NodeID max_node_id = m_graph->GetNumberOfNodes();
@@ -167,16 +167,16 @@ template <typename GraphT> class TarjanSCC
                                          });
     }
 
-    std::size_t get_number_of_components() const { return component_size_vector.size(); }
+    std::size_t GetNumberOfComponents() const { return component_size_vector.size(); }
 
-    std::size_t get_size_one_count() const { return size_one_counter; }
+    std::size_t GetSizeOneCount() const { return size_one_counter; }
 
-    unsigned get_component_size(const unsigned component_id) const
+    unsigned GetComponentSize(const unsigned component_id) const
     {
         return component_size_vector[component_id];
     }
 
-    unsigned get_component_id(const NodeID node) const { return components_index[node]; }
+    unsigned GetComponentID(const NodeID node) const { return components_index[node]; }
 };
 }
 }

include/server/api/base_parameters_grammar.hpp

@@ -8,7 +8,7 @@
 #include "engine/polyline_compressor.hpp"
 
 #include <boost/optional.hpp>
-//#define BOOST_SPIRIT_DEBUG
+#include <boost/spirit/include/phoenix.hpp>
 #include <boost/spirit/include/qi.hpp>
 
 #include <limits>
@@ -21,7 +21,11 @@ namespace server
 namespace api
 {
 
+namespace
+{
+namespace ph = boost::phoenix;
 namespace qi = boost::spirit::qi;
+}
 
 template <typename T, char... Fmt> struct no_trailing_dot_policy : qi::real_policies<T>
 {
@@ -63,76 +67,104 @@ template <typename T, char... Fmt> struct no_trailing_dot_policy : qi::real_poli
     }
 };
 
-struct BaseParametersGrammar : boost::spirit::qi::grammar<std::string::iterator>
+template <typename Iterator, typename Signature>
+struct BaseParametersGrammar : boost::spirit::qi::grammar<Iterator, Signature>
 {
-    using Iterator = std::string::iterator;
-    using RadiusesT = std::vector<boost::optional<double>>;
     using json_policy = no_trailing_dot_policy<double, 'j', 's', 'o', 'n'>;
 
-    BaseParametersGrammar(qi::rule<Iterator> &root_rule_, engine::api::BaseParameters &parameters_)
-        : BaseParametersGrammar::base_type(root_rule_), base_parameters(parameters_)
+    BaseParametersGrammar(qi::rule<Iterator, Signature> &root_rule)
+        : BaseParametersGrammar::base_type(root_rule)
     {
-        const auto add_bearing =
-            [this](boost::optional<boost::fusion::vector2<short, short>> bearing_range) {
-                boost::optional<engine::Bearing> bearing;
-                if (bearing_range)
-                {
-                    bearing = engine::Bearing{boost::fusion::at_c<0>(*bearing_range),
-                                              boost::fusion::at_c<1>(*bearing_range)};
-                }
-                base_parameters.bearings.push_back(std::move(bearing));
-            };
-        const auto set_radiuses = [this](RadiusesT radiuses) {
-            base_parameters.radiuses = std::move(radiuses);
-        };
-        const auto add_hint = [this](const std::string &hint_string) {
-            if (hint_string.size() > 0)
+        const auto add_hint = [](engine::api::BaseParameters &base_parameters, const boost::optional<std::string> &hint_string)
+        {
+            if (hint_string)
             {
-                base_parameters.hints.push_back(engine::Hint::FromBase64(hint_string));
+                base_parameters.hints.emplace_back(engine::Hint::FromBase64(hint_string.get()));
+            }
+            else
+            {
+                base_parameters.hints.emplace_back(boost::none);
             }
         };
-        const auto add_coordinate = [this](const boost::fusion::vector<double, double> &lonLat) {
-            base_parameters.coordinates.emplace_back(util::Coordinate(
-                util::FixedLongitude(boost::fusion::at_c<0>(lonLat) * COORDINATE_PRECISION),
-                util::FixedLatitude(boost::fusion::at_c<1>(lonLat) * COORDINATE_PRECISION)));
-        };
-        const auto polyline_to_coordinates = [this](const std::string &polyline) {
-            base_parameters.coordinates = engine::decodePolyline(polyline);
+
+        const auto add_bearing = [](engine::api::BaseParameters &base_parameters,
+                                    boost::optional<boost::fusion::vector2<short, short>> bearing_range)
+        {
+            boost::optional<engine::Bearing> bearing;
+            if (bearing_range)
+            {
+                bearing = engine::Bearing{boost::fusion::at_c<0>(*bearing_range),
+                                          boost::fusion::at_c<1>(*bearing_range)};
+            }
+            base_parameters.bearings.push_back(std::move(bearing));
         };
 
-        alpha_numeral = +qi::char_("a-zA-Z0-9");
         polyline_chars = qi::char_("a-zA-Z0-9_.--[]{}@?|\\%~`^");
         base64_char = qi::char_("a-zA-Z0-9--_=");
+        unlimited_rule = qi::lit("unlimited")[qi::_val = std::numeric_limits<double>::infinity()];
 
-        unlimited.add("unlimited", std::numeric_limits<double>::infinity());
+        bearing_rule
+            = (qi::short_ > ',' > qi::short_)
+              [qi::_val = ph::bind([](short bearing, short range) {
+                  return osrm::engine::Bearing{bearing, range};
+              }, qi::_1, qi::_2)]
+            ;
 
-        radiuses_rule = qi::lit("radiuses=") > -(unlimited | qi::double_) % ";";
-        hints_rule =
-            qi::lit("hints=") >
-            qi::as_string[qi::repeat(engine::ENCODED_HINT_SIZE)[base64_char]][add_hint] % ";";
-        bearings_rule =
-            qi::lit("bearings=") > (-(qi::short_ > ',' > qi::short_))[add_bearing] % ";";
-        polyline_rule = qi::as_string[qi::lit("polyline(") > +polyline_chars > qi::lit(")")]
-                                     [polyline_to_coordinates];
-        location_rule = (double_ > qi::lit(',') > double_)[add_coordinate];
-        query_rule = (location_rule % ';') | polyline_rule;
+        location_rule
+            = (double_ > qi::lit(',') > double_)
+              [qi::_val = ph::bind([](double lon, double lat) {
+                  return util::Coordinate(util::FixedLongitude(lon * COORDINATE_PRECISION),
+                                          util::FixedLatitude(lat * COORDINATE_PRECISION));
+              }, qi::_1, qi::_2)]
+            ;
 
-        base_rule = bearings_rule | radiuses_rule[set_radiuses] | hints_rule;
+        polyline_rule
+            = qi::as_string[qi::lit("polyline(") > +polyline_chars > ')']
+              [qi::_val = ph::bind([](const std::string &polyline) {
+                  return engine::decodePolyline(polyline);
+              }, qi::_1)]
+            ;
+
+        query_rule
+            = ((location_rule % ';') | polyline_rule)
+              [ph::bind(&engine::api::BaseParameters::coordinates, qi::_r1) = qi::_1]
+            ;
+
+        radiuses_rule
+            = qi::lit("radiuses=")
+            > (-(qi::double_ | unlimited_rule) % ';')
+              [ph::bind(&engine::api::BaseParameters::radiuses, qi::_r1) = qi::_1]
+            ;
+
+        hints_rule
+            = qi::lit("hints=")
+            > (-qi::as_string[qi::repeat(engine::ENCODED_HINT_SIZE)[base64_char]])[ph::bind(add_hint, qi::_r1, qi::_1)] % ';'
+            ;
+
+        bearings_rule
+            = qi::lit("bearings=") >
+            (-(qi::short_ > ',' > qi::short_))[ph::bind(add_bearing, qi::_r1, qi::_1)] % ';'
+            ;
+
+        base_rule = radiuses_rule(qi::_r1) | hints_rule(qi::_r1) | bearings_rule(qi::_r1);
     }
 
   protected:
-    qi::rule<Iterator> base_rule;
-    qi::rule<Iterator> query_rule;
+    qi::rule<Iterator, Signature> base_rule;
+    qi::rule<Iterator, Signature> query_rule;
 
   private:
-    engine::api::BaseParameters &base_parameters;
-    qi::rule<Iterator> bearings_rule;
-    qi::rule<Iterator> hints_rule;
-    qi::rule<Iterator> polyline_rule, location_rule;
-    qi::symbols<char, double> unlimited;
-    qi::rule<Iterator, RadiusesT()> radiuses_rule;
+    qi::rule<Iterator, Signature> bearings_rule;
+    qi::rule<Iterator, Signature> radiuses_rule;
+    qi::rule<Iterator, Signature> hints_rule;
+
+    qi::rule<Iterator, osrm::engine::Bearing()> bearing_rule;
+    qi::rule<Iterator, osrm::util::Coordinate()> location_rule;
+    qi::rule<Iterator, std::vector<osrm::util::Coordinate>()> polyline_rule;
+
     qi::rule<Iterator, unsigned char()> base64_char;
-    qi::rule<Iterator, std::string()> alpha_numeral, polyline_chars;
+    qi::rule<Iterator, std::string()> polyline_chars;
+    qi::rule<Iterator, double()> unlimited_rule;
     qi::real_parser<double, json_policy> double_;
 };
 }

include/server/api/match_parameter_grammar.hpp

@@ -2,9 +2,9 @@
 #define MATCH_PARAMETERS_GRAMMAR_HPP
 
 #include "engine/api/match_parameters.hpp"
-#include "server/api/base_parameters_grammar.hpp"
+#include "server/api/route_parameters_grammar.hpp"
 
-//#define BOOST_SPIRIT_DEBUG
+#include <boost/spirit/include/phoenix.hpp>
 #include <boost/spirit/include/qi.hpp>
 
 namespace osrm
@@ -14,58 +14,34 @@ namespace server
 namespace api
 {
 
-namespace qi = boost::spirit::qi;
-
-struct MatchParametersGrammar final : public BaseParametersGrammar
+namespace
 {
-    using Iterator = std::string::iterator;
-    using StepsT = bool;
-    using TimestampsT = std::vector<unsigned>;
-    using GeometriesT = engine::api::RouteParameters::GeometriesType;
-    using OverviewT = engine::api::RouteParameters::OverviewType;
+namespace ph = boost::phoenix;
+namespace qi = boost::spirit::qi;
+}
 
-    MatchParametersGrammar() : BaseParametersGrammar(root_rule, parameters)
+template <typename Iterator = std::string::iterator,
+          typename Signature = void(engine::api::MatchParameters &)>
+struct MatchParametersGrammar final : public RouteParametersGrammar<Iterator, Signature>
+{
+    using BaseGrammar = RouteParametersGrammar<Iterator, Signature>;
+
+    MatchParametersGrammar() : BaseGrammar(root_rule)
     {
-        const auto set_geojson_type = [this] {
-            parameters.geometries = engine::api::RouteParameters::GeometriesType::GeoJSON;
-        };
-        const auto set_polyline_type = [this] {
-            parameters.geometries = engine::api::RouteParameters::GeometriesType::Polyline;
-        };
+        timestamps_rule
+            = qi::lit("timestamps=")
+            > (qi::uint_ % ';')[ph::bind(&engine::api::MatchParameters::timestamps, qi::_r1) = qi::_1]
+            ;
 
-        const auto set_simplified_type = [this] {
-            parameters.overview = engine::api::RouteParameters::OverviewType::Simplified;
-        };
-        const auto set_full_type = [this] {
-            parameters.overview = engine::api::RouteParameters::OverviewType::Full;
-        };
-        const auto set_false_type = [this] {
-            parameters.overview = engine::api::RouteParameters::OverviewType::False;
-        };
-        const auto set_steps = [this](const StepsT steps) { parameters.steps = steps; };
-        const auto set_timestamps = [this](TimestampsT timestamps) {
-            parameters.timestamps = std::move(timestamps);
-        };
-
-        steps_rule = qi::lit("steps=") > qi::bool_;
-        geometries_rule = qi::lit("geometries=geojson")[set_geojson_type] |
-                          qi::lit("geometries=polyline")[set_polyline_type];
-        overview_rule = qi::lit("overview=simplified")[set_simplified_type] |
-                        qi::lit("overview=full")[set_full_type] |
-                        qi::lit("overview=false")[set_false_type];
-        timestamps_rule = qi::lit("timestamps=") > qi::uint_ % ";";
-        match_rule = steps_rule[set_steps] | geometries_rule | overview_rule |
-                     timestamps_rule[set_timestamps];
-        root_rule =
-            query_rule > -qi::lit(".json") > -(qi::lit("?") > (match_rule | base_rule) % '&');
+        root_rule
+            = BaseGrammar::query_rule(qi::_r1) > -qi::lit(".json")
+            > -('?' > (timestamps_rule(qi::_r1) | BaseGrammar::base_rule(qi::_r1)) % '&')
+            ;
     }
 
-    engine::api::MatchParameters parameters;
-
   private:
-    qi::rule<Iterator> root_rule, match_rule, geometries_rule, overview_rule;
-    qi::rule<Iterator, TimestampsT()> timestamps_rule;
-    qi::rule<Iterator, StepsT()> steps_rule;
+    qi::rule<Iterator, Signature> root_rule;
+    qi::rule<Iterator, Signature> timestamps_rule;
 };
 }
 }

include/server/api/nearest_parameter_grammar.hpp

@@ -4,7 +4,7 @@
 #include "engine/api/nearest_parameters.hpp"
 #include "server/api/base_parameters_grammar.hpp"
 
-//#define BOOST_SPIRIT_DEBUG
+#include <boost/spirit/include/phoenix.hpp>
 #include <boost/spirit/include/qi.hpp>
 
 namespace osrm
@@ -14,27 +14,34 @@ namespace server
 namespace api
 {
 
-namespace qi = boost::spirit::qi;
-
-struct NearestParametersGrammar final : public BaseParametersGrammar
+namespace
 {
-    using Iterator = std::string::iterator;
+namespace ph = boost::phoenix;
+namespace qi = boost::spirit::qi;
+}
 
-    NearestParametersGrammar() : BaseParametersGrammar(root_rule, parameters)
+template <typename Iterator = std::string::iterator,
+          typename Signature = void(engine::api::NearestParameters &)>
+struct NearestParametersGrammar final : public BaseParametersGrammar<Iterator, Signature>
+{
+    using BaseGrammar = BaseParametersGrammar<Iterator, Signature>;
+
+    NearestParametersGrammar() : BaseGrammar(root_rule)
     {
-        const auto set_number = [this](const unsigned number) {
-            parameters.number_of_results = number;
-        };
-        nearest_rule = (qi::lit("number=") > qi::uint_)[set_number];
-        root_rule =
-            query_rule > -qi::lit(".json") > -(qi::lit("?") > (nearest_rule | base_rule) % '&');
+        nearest_rule
+            = (qi::lit("number=") > qi::uint_)
+              [ph::bind(&engine::api::NearestParameters::number_of_results, qi::_r1) = qi::_1]
+            ;
+
+        root_rule
+            = BaseGrammar::query_rule(qi::_r1) > -qi::lit(".json")
+            > -('?' > (nearest_rule(qi::_r1) | BaseGrammar::base_rule(qi::_r1)) % '&')
+            ;
     }
 
-    engine::api::NearestParameters parameters;
-
   private:
-    qi::rule<Iterator> root_rule;
-    qi::rule<Iterator> nearest_rule;
+    qi::rule<Iterator, Signature> root_rule;
+    qi::rule<Iterator, Signature> nearest_rule;
 };
 }
 }

include/server/api/parameters_parser.hpp

@@ -30,7 +30,8 @@ using is_parameter_t =
 // Starts parsing and iter and modifies it until iter == end or parsing failed
 template <typename ParameterT,
           typename std::enable_if<detail::is_parameter_t<ParameterT>::value, int>::type = 0>
-boost::optional<ParameterT> parseParameters(std::string::iterator &iter, const std::string::iterator end);
+boost::optional<ParameterT> parseParameters(std::string::iterator &iter,
+                                            const std::string::iterator end);
 
 // Copy on purpose because we need mutability
 template <typename ParameterT,

include/server/api/parsed_url.hpp

@@ -3,8 +3,6 @@
 
 #include "util/coordinate.hpp"
 
-#include <boost/fusion/include/adapt_struct.hpp>
-
 #include <string>
 #include <vector>
 
@@ -21,17 +19,11 @@ struct ParsedURL final
     unsigned version;
     std::string profile;
     std::string query;
+    std::size_t prefix_length;
 };
 
 } // api
 } // server
 } // osrm
 
-BOOST_FUSION_ADAPT_STRUCT(osrm::server::api::ParsedURL,
-    (std::string, service)
-    (unsigned, version)
-    (std::string, profile)
-    (std::string, query)
-)
-
 #endif

include/server/api/route_parameters_grammar.hpp

@@ -4,7 +4,7 @@
 #include "engine/api/route_parameters.hpp"
 #include "server/api/base_parameters_grammar.hpp"
 
-//#define BOOST_SPIRIT_DEBUG
+#include <boost/spirit/include/phoenix.hpp>
 #include <boost/spirit/include/qi.hpp>
 
 namespace osrm
@@ -14,64 +14,66 @@ namespace server
 namespace api
 {
 
-namespace qi = boost::spirit::qi;
-
-struct RouteParametersGrammar : public BaseParametersGrammar
+namespace
 {
-    using Iterator = std::string::iterator;
-    using StepsT = bool;
-    using AlternativeT = bool;
-    using GeometriesT = engine::api::RouteParameters::GeometriesType;
-    using OverviewT = engine::api::RouteParameters::OverviewType;
-    using UturnsT = bool;
+namespace ph = boost::phoenix;
+namespace qi = boost::spirit::qi;
+}
 
-    RouteParametersGrammar() : BaseParametersGrammar(root_rule, parameters)
+template <typename Iterator = std::string::iterator,
+          typename Signature = void(engine::api::RouteParameters &)>
+struct RouteParametersGrammar : public BaseParametersGrammar<Iterator, Signature>
+{
+    using BaseGrammar = BaseParametersGrammar<Iterator, Signature>;
+
+    RouteParametersGrammar() : RouteParametersGrammar(root_rule)
     {
-        const auto set_geojson_type = [this] {
-            parameters.geometries = engine::api::RouteParameters::GeometriesType::GeoJSON;
-        };
-        const auto set_polyline_type = [this] {
-            parameters.geometries = engine::api::RouteParameters::GeometriesType::Polyline;
-        };
+        route_rule
+            = (qi::lit("alternatives=") > qi::bool_[ph::bind(&engine::api::RouteParameters::alternatives, qi::_r1) = qi::_1])
+            | (qi::lit("continue_straight=")
+               > (qi::lit("default")
+                 | qi::bool_[ph::bind(&engine::api::RouteParameters::continue_straight, qi::_r1) = qi::_1]))
+            ;
 
-        const auto set_simplified_type = [this] {
-            parameters.overview = engine::api::RouteParameters::OverviewType::Simplified;
-        };
-        const auto set_full_type = [this] {
-            parameters.overview = engine::api::RouteParameters::OverviewType::Full;
-        };
-        const auto set_false_type = [this] {
-            parameters.overview = engine::api::RouteParameters::OverviewType::False;
-        };
-        const auto set_steps = [this](const StepsT steps) { parameters.steps = steps; };
-        const auto set_alternatives = [this](const AlternativeT alternatives) {
-            parameters.alternatives = alternatives;
-        };
-        const auto set_continue_straight = [this](UturnsT continue_straight) { parameters.continue_straight = std::move(continue_straight); };
-
-        alternatives_rule = qi::lit("alternatives=") > qi::bool_;
-        steps_rule = qi::lit("steps=") > qi::bool_;
-        geometries_rule = qi::lit("geometries=geojson")[set_geojson_type] |
-                          qi::lit("geometries=polyline")[set_polyline_type];
-        overview_rule = qi::lit("overview=simplified")[set_simplified_type] |
-                        qi::lit("overview=full")[set_full_type] |
-                        qi::lit("overview=false")[set_false_type];
-        continue_straight_rule = qi::lit("continue_straight=default") | (qi::lit("continue_straight=") > qi::bool_)[set_continue_straight];
-        route_rule = steps_rule[set_steps] | alternatives_rule[set_alternatives] | geometries_rule |
-                     overview_rule | continue_straight_rule;
-
-        root_rule =
-            query_rule > -qi::lit(".json") > -(qi::lit("?") > (route_rule | base_rule) % '&');
+        root_rule
+            = query_rule(qi::_r1) > -qi::lit(".json")
+            > -('?' > (route_rule(qi::_r1) | base_rule(qi::_r1)) % '&')
+            ;
     }
 
-    engine::api::RouteParameters parameters;
+    RouteParametersGrammar(qi::rule<Iterator, Signature> &root_rule_) : BaseGrammar(root_rule_)
+    {
+        geometries_type.add
+            ("geojson", engine::api::RouteParameters::GeometriesType::GeoJSON)
+            ("polyline", engine::api::RouteParameters::GeometriesType::Polyline)
+            ;
+
+        overview_type.add
+            ("simplified", engine::api::RouteParameters::OverviewType::Simplified)
+            ("full", engine::api::RouteParameters::OverviewType::Full)
+            ("false", engine::api::RouteParameters::OverviewType::False)
+            ;
+
+        base_rule =
+            BaseGrammar::base_rule(qi::_r1)
+            | (qi::lit("steps=") > qi::bool_[ph::bind(&engine::api::RouteParameters::steps, qi::_r1) = qi::_1])
+            | (qi::lit("geometries=") > geometries_type[ph::bind(&engine::api::RouteParameters::geometries, qi::_r1) = qi::_1])
+            | (qi::lit("overview=") > overview_type[ph::bind(&engine::api::RouteParameters::overview, qi::_r1) = qi::_1])
+            ;
+
+        query_rule = BaseGrammar::query_rule(qi::_r1);
+    }
+
+  protected:
+    qi::rule<Iterator, Signature> base_rule;
+    qi::rule<Iterator, Signature> query_rule;
 
   private:
-    qi::rule<Iterator> root_rule;
-    qi::rule<Iterator> route_rule, geometries_rule, overview_rule;
-    qi::rule<Iterator, UturnsT()> continue_straight_rule;
-    qi::rule<Iterator, StepsT()> steps_rule;
-    qi::rule<Iterator, AlternativeT()> alternatives_rule;
+    qi::rule<Iterator, Signature> root_rule;
+    qi::rule<Iterator, Signature> route_rule;
+
+    qi::symbols<char, engine::api::RouteParameters::GeometriesType> geometries_type;
+    qi::symbols<char, engine::api::RouteParameters::OverviewType> overview_type;
 };
 }
 }

include/server/api/table_parameter_grammar.hpp

@@ -4,7 +4,7 @@
 #include "engine/api/table_parameters.hpp"
 #include "server/api/base_parameters_grammar.hpp"
 
-//#define BOOST_SPIRIT_DEBUG
+#include <boost/spirit/include/phoenix.hpp>
 #include <boost/spirit/include/qi.hpp>
 
 namespace osrm
@@ -14,43 +14,53 @@ namespace server
 namespace api
 {
 
-namespace qi = boost::spirit::qi;
-
-struct TableParametersGrammar final : public BaseParametersGrammar
+namespace
 {
-    using Iterator = std::string::iterator;
-    using SourcesT = std::vector<std::size_t>;
-    using DestinationsT = std::vector<std::size_t>;
+namespace ph = boost::phoenix;
+namespace qi = boost::spirit::qi;
+}
 
-    TableParametersGrammar() : BaseParametersGrammar(root_rule, parameters)
+template <typename Iterator = std::string::iterator,
+          typename Signature = void(engine::api::TableParameters &)>
+struct TableParametersGrammar final : public BaseParametersGrammar<Iterator, Signature>
+{
+    using BaseGrammar = BaseParametersGrammar<Iterator, Signature>;
+
+    TableParametersGrammar() : BaseGrammar(root_rule)
     {
-        const auto set_destiantions = [this](DestinationsT dests) {
-            parameters.destinations = std::move(dests);
-        };
-        const auto set_sources = [this](SourcesT sources) {
-            parameters.sources = std::move(sources);
-        };
-// TODO: ulonglong -> size_t not only on Windows but on all 32 bit platforms; unsupported anyway as of now
-#ifdef WIN32
-        destinations_rule = qi::lit("destinations=all") | (qi::lit("destinations=") > (qi::ulong_long % ";")[set_destiantions]);
-        sources_rule = qi::lit("sources=all") | (qi::lit("sources=") > (qi::ulong_long % ";")[set_sources]);
+#ifdef BOOST_HAS_LONG_LONG
+        if (std::is_same<std::size_t, unsigned long long>::value)
+            size_t_ = qi::ulong_long;
+        else
+            size_t_ = qi::ulong_;
 #else
-        destinations_rule = qi::lit("destinations=all") | (qi::lit("destinations=") > (qi::ulong_ % ";")[set_destiantions]);
-        sources_rule = qi::lit("sources=all") | (qi::lit("sources=") > (qi::ulong_ % ";")[set_sources]);
+        size_t_ = qi::ulong_;
 #endif
-        table_rule = destinations_rule | sources_rule;
 
-        root_rule =
-            query_rule > -qi::lit(".json") > -(qi::lit("?") > (table_rule | base_rule) % '&');
+        destinations_rule
+            = qi::lit("destinations=")
+            > (qi::lit("all") | (size_t_ % ';')[ph::bind(&engine::api::TableParameters::destinations, qi::_r1) = qi::_1])
+            ;
+
+        sources_rule
+            = qi::lit("sources=")
+            > (qi::lit("all") | (size_t_ % ';')[ph::bind(&engine::api::TableParameters::sources, qi::_r1) = qi::_1])
+            ;
+
+        table_rule = destinations_rule(qi::_r1) | sources_rule(qi::_r1);
+
+        root_rule
+            = BaseGrammar::query_rule(qi::_r1) > -qi::lit(".json")
+            > -('?' > (table_rule(qi::_r1) | BaseGrammar::base_rule(qi::_r1)) % '&')
+            ;
     }
 
-    engine::api::TableParameters parameters;
-
   private:
-    qi::rule<Iterator> root_rule;
-    qi::rule<Iterator> table_rule;
-    qi::rule<Iterator> sources_rule;
-    qi::rule<Iterator> destinations_rule;
+    qi::rule<Iterator, Signature> root_rule;
+    qi::rule<Iterator, Signature> table_rule;
+    qi::rule<Iterator, Signature> sources_rule;
+    qi::rule<Iterator, Signature> destinations_rule;
+    qi::rule<Iterator, std::size_t()> size_t_;
 };
 }
 }

include/server/api/tile_parameter_grammar.hpp

@@ -6,7 +6,7 @@
 #include "engine/hint.hpp"
 #include "engine/polyline_compressor.hpp"
 
-//#define BOOST_SPIRIT_DEBUG
+#include <boost/spirit/include/phoenix.hpp>
 #include <boost/spirit/include/qi.hpp>
 
 #include <string>
@@ -18,28 +18,29 @@ namespace server
 namespace api
 {
 
-namespace qi = boost::spirit::qi;
-struct TileParametersGrammar final : boost::spirit::qi::grammar<std::string::iterator>
+namespace
 {
-    using Iterator = std::string::iterator;
+namespace ph = boost::phoenix;
+namespace qi = boost::spirit::qi;
+}
 
+template <typename Iterator = std::string::iterator,
+          typename Signature = void(engine::api::TileParameters &)>
+struct TileParametersGrammar final : boost::spirit::qi::grammar<Iterator, Signature>
+{
     TileParametersGrammar() : TileParametersGrammar::base_type(root_rule)
     {
-        const auto set_x = [this](const unsigned x_) { parameters.x = x_; };
-        const auto set_y = [this](const unsigned y_) { parameters.y = y_; };
-        const auto set_z = [this](const unsigned z_) { parameters.z = z_; };
-
-        query_rule = qi::lit("tile(") > qi::uint_[set_x]             //
-                     > qi::lit(",") > qi::uint_[set_y] >             //
-                     qi::lit(",") > qi::uint_[set_z] > qi::lit(")"); //
-
-        root_rule = query_rule > qi::lit(".mvt");
+        root_rule
+            = qi::lit("tile(")
+            > qi::uint_[ph::bind(&engine::api::TileParameters::x, qi::_r1) = qi::_1] > ','
+            > qi::uint_[ph::bind(&engine::api::TileParameters::y, qi::_r1) = qi::_1] > ','
+            > qi::uint_[ph::bind(&engine::api::TileParameters::z, qi::_r1) = qi::_1]
+            > qi::lit(").mvt")
+            ;
     }
-    engine::api::TileParameters parameters;
 
   private:
-    qi::rule<Iterator> root_rule;
-    qi::rule<Iterator> query_rule;
+    qi::rule<Iterator, Signature> root_rule;
 };
 }
 }

include/server/api/trip_parameter_grammar.hpp

@@ -2,9 +2,8 @@
 #define TRIP_PARAMETERS_GRAMMAR_HPP
 
 #include "engine/api/trip_parameters.hpp"
-#include "server/api/base_parameters_grammar.hpp"
+#include "server/api/route_parameters_grammar.hpp"
 
-//#define BOOST_SPIRIT_DEBUG
 #include <boost/spirit/include/qi.hpp>
 
 namespace osrm
@@ -14,52 +13,27 @@ namespace server
 namespace api
 {
 
-namespace qi = boost::spirit::qi;
-
-struct TripParametersGrammar final : public BaseParametersGrammar
+namespace
 {
-    using Iterator = std::string::iterator;
-    using StepsT = bool;
-    using GeometriesT = engine::api::RouteParameters::GeometriesType;
-    using OverviewT = engine::api::RouteParameters::OverviewType;
+namespace qi = boost::spirit::qi;
+}
 
-    TripParametersGrammar() : BaseParametersGrammar(root_rule, parameters)
+template <typename Iterator = std::string::iterator,
+          typename Signature = void(engine::api::TripParameters &)>
+struct TripParametersGrammar final : public RouteParametersGrammar<Iterator, Signature>
+{
+    using BaseGrammar = RouteParametersGrammar<Iterator, Signature>;
+
+    TripParametersGrammar() : BaseGrammar(root_rule)
     {
-        const auto set_geojson_type = [this] {
-            parameters.geometries = engine::api::RouteParameters::GeometriesType::GeoJSON;
-        };
-        const auto set_polyline_type = [this] {
-            parameters.geometries = engine::api::RouteParameters::GeometriesType::Polyline;
-        };
-
-        const auto set_simplified_type = [this] {
-            parameters.overview = engine::api::RouteParameters::OverviewType::Simplified;
-        };
-        const auto set_full_type = [this] {
-            parameters.overview = engine::api::RouteParameters::OverviewType::Full;
-        };
-        const auto set_false_type = [this] {
-            parameters.overview = engine::api::RouteParameters::OverviewType::False;
-        };
-        const auto set_steps = [this](const StepsT steps) { parameters.steps = steps; };
-
-        steps_rule = qi::lit("steps=") > qi::bool_;
-        geometries_rule = qi::lit("geometries=geojson")[set_geojson_type] |
-                          qi::lit("geometries=polyline")[set_polyline_type];
-        overview_rule = qi::lit("overview=simplified")[set_simplified_type] |
-                        qi::lit("overview=full")[set_full_type] |
-                        qi::lit("overview=false")[set_false_type];
-        trip_rule = steps_rule[set_steps] | geometries_rule | overview_rule;
-
-        root_rule =
-            query_rule > -qi::lit(".json") > -(qi::lit("?") > (trip_rule | base_rule) % '&');
+        root_rule
+            = BaseGrammar::query_rule(qi::_r1) > -qi::lit(".json")
+            > -('?' > (BaseGrammar::base_rule(qi::_r1)) % '&')
+            ;
     }
 
-    engine::api::TripParameters parameters;
-
   private:
-    qi::rule<Iterator> root_rule, trip_rule, geometries_rule, overview_rule;
-    qi::rule<Iterator, StepsT()> steps_rule;
+    qi::rule<Iterator, Signature> root_rule;
 };
 }
 }

include/server/service/base_service.hpp

@@ -25,7 +25,7 @@ class BaseService
     BaseService(OSRM &routing_machine) : routing_machine(routing_machine) {}
     virtual ~BaseService() = default;
 
-    virtual engine::Status RunQuery(std::string &query, ResultT &result) = 0;
+    virtual engine::Status RunQuery(std::size_t prefix_length, std::string &query, ResultT &result) = 0;
 
     virtual unsigned GetVersion() = 0;